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 dec1ffba73..87c43e86b8 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 @@ -490,12 +490,18 @@ public abstract class HttpRequestHandlingEndpointSupport extends BaseHttpInbound expectedType = requestPayloadType.resolve(); } + /* + * TODO: resolve() can return null, which is not valid for canRead(). + * Perhaps we should coerce to String/byte[] instead of attempting + * to convert. However this might be a breaking change - 5.2? + * Hence NOSONAR below. + */ for (HttpMessageConverter converter : this.messageConverters) { if (converter.canRead(expectedType, contentType)) { return converter.read((Class) expectedType, request); } } - throw new MessagingException( + throw new MessagingException( // NOSONAR might be null; see comment above. "Could not convert request: no suitable HttpMessageConverter found for expected type [" + 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 485e0da6f9..af53b2a649 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 @@ -152,7 +152,7 @@ public class MongoDbOutboundGateway extends AbstractReplyProducingMessageHandler Object result; if (this.collectionCallback != null) { - result = this.mongoTemplate.execute(collectionName, this.collectionCallback); + result = this.mongoTemplate.execute(collectionName, this.collectionCallback); // NOSONAR } else { Query query = buildQuery(requestMessage);