Upgrade to Spring Data Moore RC3; fix sonar smells

Author: artembilan

build.gradle

@@ -53,7 +53,7 @@ ext {
 	rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.7.3'
 	rabbitmqHttpClientVersion = '3.2.0.RELEASE'
 	reactorVersion = '3.3.0.RC1'
-	springDataCommonsVersion = '2.2.0.BUILD-SNAPSHOT'
+	springDataCommonsVersion = '2.2.0.RC3'
 	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.RC2'
 	springRetryVersion = '1.2.4.RELEASE'
 }

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java

@@ -217,14 +217,14 @@ public void setConcurrency(String concurrency) {
 		try {
 			int separatorIndex = concurrency.indexOf('-');
 			if (separatorIndex != -1) {
-				int concurrentConsumers = Integer.parseInt(concurrency.substring(0, separatorIndex));
-				int maxConcurrentConsumers = Integer.parseInt(concurrency.substring(separatorIndex + 1));
-				Assert.isTrue(maxConcurrentConsumers >= concurrentConsumers,
+				int consumers = Integer.parseInt(concurrency.substring(0, separatorIndex));
+				int maxConsumers = Integer.parseInt(concurrency.substring(separatorIndex + 1));
+				Assert.isTrue(maxConsumers >= consumers,
 						"'maxConcurrentConsumers' value must be at least 'concurrentConsumers'");
 				this.concurrentConsumers = 1;
 				this.maxConcurrentConsumers = null;
-				setConcurrentConsumers(concurrentConsumers);
-				setMaxConcurrentConsumers(maxConcurrentConsumers);
+				setConcurrentConsumers(consumers);
+				setMaxConcurrentConsumers(maxConsumers);
 			}
 			else {
 				setConcurrentConsumers(Integer.parseInt(concurrency));