From 8de73d341776037265680e96faf79805c002b866 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Thu, 25 Jul 2019 09:52:50 -0400
Subject: [PATCH] Sonar Fixes

`getRouteMatcher()` is only `@Nullable` before initialization.
---
 .../integration/rsocket/IntegrationRSocketMessageHandler.java  | 2 +-
 .../integration/rsocket/ServerRSocketConnector.java            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java
index 797f1466c3..91f6b57244 100644
--- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java
+++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java
@@ -71,7 +71,7 @@ class IntegrationRSocketMessageHandler extends RSocketMessageHandler {
 		registerHandlerMethod(endpoint, HANDLE_MESSAGE_METHOD,
 				new CompositeMessageCondition(
 						RSocketFrameTypeMessageCondition.REQUEST_CONDITION,
-						new DestinationPatternsMessageCondition(endpoint.getPath(), getRouteMatcher())));
+						new DestinationPatternsMessageCondition(endpoint.getPath(), getRouteMatcher()))); // NOSONAR
 	}
 
 	@Override
diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java
index 6f1e56cb3a..ca049cad84 100644
--- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java
+++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java
@@ -189,9 +189,10 @@ public class ServerRSocketConnector extends AbstractRSocketConnector
 			registerHandlerMethod(this, HANDLE_CONNECTION_SETUP_METHOD,
 					new CompositeMessageCondition(
 							RSocketFrameTypeMessageCondition.CONNECT_CONDITION,
-							new DestinationPatternsMessageCondition(new String[] { "*" }, getRouteMatcher())));
+							new DestinationPatternsMessageCondition(new String[] { "*" }, getRouteMatcher()))); // NOSONAR
 		}
 
+		@SuppressWarnings("unused")
 		private void handleConnectionSetup(Message<DataBuffer> connectMessage) {
 			DataBuffer dataBuffer = connectMessage.getPayload();
 			MessageHeaders messageHeaders = connectMessage.getHeaders();