Address Sonar reports for recent commits

Author: garyrussell

spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java

@@ -497,7 +497,8 @@ protected Object extractRequestBody(ServletServerHttpRequest request) throws IOE
 		}
 		throw new MessagingException(
 				"Could not convert request: no suitable HttpMessageConverter found for expected type ["
-						+ expectedType.getName() + "] and content type [" + contentType + "]");
+						+ expectedType != null ? expectedType.getName() : "null"
+						+ "] and content type [" + contentType + "]");
 	}
 
 }

spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGateway.java

@@ -148,7 +148,7 @@ protected void doInit() {
 	protected Object handleRequestMessage(Message<?> requestMessage) {
 		String collectionName =
 				this.collectionNameExpression.getValue(this.evaluationContext, requestMessage, String.class);
-
+		// TODO: 5.2 assert not null
 		Object result;
 
 		if (this.collectionCallback != null) {
@@ -158,10 +158,10 @@ protected Object handleRequestMessage(Message<?> requestMessage) {
 			Query query = buildQuery(requestMessage);
 
 			if (this.expectSingleResult) {
-				result = this.mongoTemplate.findOne(query, this.entityClass, collectionName);
+				result = this.mongoTemplate.findOne(query, this.entityClass, collectionName); // NOSONAR
 			}
 			else {
-				result = this.mongoTemplate.find(query, this.entityClass, collectionName);
+				result = this.mongoTemplate.find(query, this.entityClass, collectionName); // NOSONAR
 			}
 		}
 

spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java

@@ -102,12 +102,13 @@ protected void onInit() {
 	protected void handleMessageInternal(Message<?> message) {
 		String topic = this.topicExpression.getValue(this.evaluationContext, message, String.class);
 		Object value = this.messageConverter.fromMessage(message, Object.class);
+		// TODO: 5.2 assert both not null
 
 		if (value instanceof byte[]) {
-			this.template.convertAndSend(topic, value);
+			this.template.convertAndSend(topic, value); // NOSONAR
 		}
 		else {
-			this.template.convertAndSend(topic, ((RedisSerializer<Object>) this.serializer).serialize(value));
+			this.template.convertAndSend(topic, ((RedisSerializer<Object>) this.serializer).serialize(value)); // NOSONAR
 		}
 	}
 

spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapter.java

@@ -125,11 +125,12 @@ protected void handleMessageInternal(Message<?> message) throws Exception {
 		}
 
 		String queueName = this.queueNameExpression.getValue(this.evaluationContext, message, String.class);
+		// TODO: 5.2 assert both not null
 		if (this.leftPush) {
-			this.template.boundListOps(queueName).leftPush(value);
+			this.template.boundListOps(queueName).leftPush(value); // NOSONAR
 		}
 		else {
-			this.template.boundListOps(queueName).rightPush(value);
+			this.template.boundListOps(queueName).rightPush(value); // NOSONAR
 		}
 	}