From 433ef4c4aac4a8ff2ef86b8b3d32018ce1aae330 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 8 Nov 2018 12:29:22 -0500 Subject: [PATCH] Address Sonar reports for recent commits --- .../http/inbound/HttpRequestHandlingEndpointSupport.java | 3 ++- .../mongodb/outbound/MongoDbOutboundGateway.java | 6 +++--- .../redis/outbound/RedisPublishingMessageHandler.java | 5 +++-- .../redis/outbound/RedisQueueOutboundChannelAdapter.java | 5 +++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java index 95a7e22505..dec1ffba73 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java @@ -497,7 +497,8 @@ public abstract class HttpRequestHandlingEndpointSupport extends BaseHttpInbound } 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 + "]"); } } diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGateway.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGateway.java index 22b7e763a0..485e0da6f9 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGateway.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGateway.java @@ -148,7 +148,7 @@ public class MongoDbOutboundGateway extends AbstractReplyProducingMessageHandler 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 @@ public class MongoDbOutboundGateway extends AbstractReplyProducingMessageHandler 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 } } diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java index 70e355f66b..cd4bcd8e4e 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java @@ -102,12 +102,13 @@ public class RedisPublishingMessageHandler extends AbstractMessageHandler { 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) this.serializer).serialize(value)); + this.template.convertAndSend(topic, ((RedisSerializer) this.serializer).serialize(value)); // NOSONAR } } diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapter.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapter.java index 8c1a282158..d9b84fbd93 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapter.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapter.java @@ -125,11 +125,12 @@ public class RedisQueueOutboundChannelAdapter extends AbstractMessageHandler { } 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 } }