Fix new Sonar smells; revert to BUILD-SNAPSHOTs

Author: artembilan

build.gradle

@@ -139,21 +139,21 @@ subprojects { subproject ->
 		mysqlVersion = '8.0.16'
 		pahoMqttClientVersion = '1.2.0'
 		postgresVersion = '42.2.5'
-		reactorNettyVersion = '0.9.0.M2'
-		reactorVersion = '3.3.0.M2'
+		reactorNettyVersion = '0.9.0.BUILD-SNAPSHOT'
+		reactorVersion = '3.3.0.BUILD-SNAPSHOT'
 		resilience4jVersion = '0.14.1'
 		romeToolsVersion = '1.12.0'
-		rsocketVersion = '0.12.2-RC4'
+		rsocketVersion = '1.0.0-RC1-SNAPSHOT'
 		servletApiVersion = '4.0.1'
 		smackVersion = '4.3.3'
-		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.0.M3'
-		springDataJpaVersion = '2.2.0.RC1'
-		springDataMongoVersion = '2.2.0.RC1'
-		springDataRedisVersion = '2.2.0.RC1'
-		springGemfireVersion = '2.2.0.RC1'
-		springSecurityVersion = '5.2.0.M3'
+		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.0.BUILD-SNAPSHOT'
+		springDataJpaVersion = '2.2.0.BUILD-SNAPSHOT'
+		springDataMongoVersion = '2.2.0.BUILD-SNAPSHOT'
+		springDataRedisVersion = '2.2.0.BUILD-SNAPSHOT'
+		springGemfireVersion = '2.2.0.BUILD-SNAPSHOT'
+		springSecurityVersion = '5.2.0.BUILD-SNAPSHOT'
 		springRetryVersion = '1.2.4.RELEASE'
-		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.M3'
+		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT'
 		springWsVersion = '3.0.7.RELEASE'
 		tomcatVersion = "9.0.19"
 		xstreamVersion = '1.4.11.1'

spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java

@@ -175,23 +175,22 @@ private void registerMessagePublishingErrorHandler() {
 	private void registerNullChannel() {
 		if (this.beanFactory.containsBean(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)) {
 			BeanDefinition nullChannelDefinition = null;
-			BeanFactory beanFactory = this.beanFactory;
+			BeanFactory beanFactoryToUse = this.beanFactory;
 			do {
-				if (beanFactory instanceof ConfigurableListableBeanFactory) {
-					ConfigurableListableBeanFactory listable = (ConfigurableListableBeanFactory) beanFactory;
+				if (beanFactoryToUse instanceof ConfigurableListableBeanFactory) {
+					ConfigurableListableBeanFactory listable = (ConfigurableListableBeanFactory) beanFactoryToUse;
 					if (listable.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)) {
 						nullChannelDefinition = listable
 								.getBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME);
 					}
 				}
-				if (beanFactory instanceof HierarchicalBeanFactory) {
-					beanFactory = ((HierarchicalBeanFactory) beanFactory).getParentBeanFactory();
+				if (beanFactoryToUse instanceof HierarchicalBeanFactory) {
+					beanFactoryToUse = ((HierarchicalBeanFactory) beanFactoryToUse).getParentBeanFactory();
 				}
 			}
 			while (nullChannelDefinition == null);
 
-			if (nullChannelDefinition != null &&
-					!NullChannel.class.getName().equals(nullChannelDefinition.getBeanClassName())) {
+			if (!NullChannel.class.getName().equals(nullChannelDefinition.getBeanClassName())) {
 				throw new IllegalStateException("The bean name '" + IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME
 						+ "' is reserved.");
 			}

spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java

@@ -43,6 +43,7 @@
 import org.springframework.integration.expression.FunctionExpression;
 import org.springframework.integration.rsocket.ClientRSocketConnector;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandlingException;
@@ -528,6 +529,7 @@ public MessageHandlerAcceptor clientAcceptor() {
 		}
 
 		@Bean(destroyMethod = "dispose")
+		@Nullable
 		public RSocket rsocketForServerRequests() {
 			return RSocketFactory.connect()
 					.setupPayload(DefaultPayload.create("", "clientConnect"))