Sonar fixes

Hidden fields, `o.s.i.a*` through `o.s.i.j*`.

Author: garyrussell

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AbstractAmqpOutboundEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -486,19 +486,19 @@ protected CorrelationData generateCorrelationData(Message<?> requestMessage) {
 	}
 
 	protected String generateExchangeName(Message<?> requestMessage) {
-		String exchangeName = this.exchangeName;
+		String exchange = this.exchangeName;
 		if (this.exchangeNameGenerator != null) {
-			exchangeName = this.exchangeNameGenerator.processMessage(requestMessage);
+			exchange = this.exchangeNameGenerator.processMessage(requestMessage);
 		}
-		return exchangeName;
+		return exchange;
 	}
 
 	protected String generateRoutingKey(Message<?> requestMessage) {
-		String routingKey = this.routingKey;
+		String key = this.routingKey;
 		if (this.routingKeyGenerator != null) {
-			routingKey = this.routingKeyGenerator.processMessage(requestMessage);
+			key = this.routingKeyGenerator.processMessage(requestMessage);
 		}
-		return routingKey;
+		return key;
 	}
 
 	protected void addDelayProperty(Message<?> message, org.springframework.amqp.core.Message amqpMessage) {

spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java

@@ -425,10 +425,10 @@ public boolean send(Message<?> messageArg, long timeout) {
 		Deque<ChannelInterceptor> interceptorStack = null;
 		boolean sent = false;
 		boolean metricsProcessed = false;
-		MetricsContext metrics = null;
-		boolean countsEnabled = this.countsEnabled;
-		ChannelInterceptorList interceptors = this.interceptors;
-		AbstractMessageChannelMetrics channelMetrics = this.channelMetrics;
+		MetricsContext metricsContext = null;
+		boolean countsAreEnabled = this.countsEnabled;
+		ChannelInterceptorList interceptorList = this.interceptors;
+		AbstractMessageChannelMetrics metrics = this.channelMetrics;
 		SampleFacade sample = null;
 		try {
 			if (this.datatypes.length > 0) {
@@ -438,23 +438,23 @@ public boolean send(Message<?> messageArg, long timeout) {
 			if (debugEnabled) {
 				logger.debug("preSend on channel '" + this + "', message: " + message);
 			}
-			if (interceptors.getSize() > 0) {
+			if (interceptorList.getSize() > 0) {
 				interceptorStack = new ArrayDeque<>();
-				message = interceptors.preSend(message, this, interceptorStack);
+				message = interceptorList.preSend(message, this, interceptorStack);
 				if (message == null) {
 					return false;
 				}
 			}
-			if (countsEnabled) {
-				metrics = channelMetrics.beforeSend();
+			if (countsAreEnabled) {
+				metricsContext = metrics.beforeSend();
 				if (this.metricsCaptor != null) {
 					sample = this.metricsCaptor.start();
 				}
 				sent = doSend(message, timeout);
 				if (sample != null) {
 					sample.stop(sendTimer(sent));
 				}
-				channelMetrics.afterSend(metrics, sent);
+				metrics.afterSend(metricsContext, sent);
 				metricsProcessed = true;
 			}
 			else {
@@ -465,20 +465,20 @@ public boolean send(Message<?> messageArg, long timeout) {
 				logger.debug("postSend (sent=" + sent + ") on channel '" + this + "', message: " + message);
 			}
 			if (interceptorStack != null) {
-				interceptors.postSend(message, this, sent);
-				interceptors.afterSendCompletion(message, this, sent, null, interceptorStack);
+				interceptorList.postSend(message, this, sent);
+				interceptorList.afterSendCompletion(message, this, sent, null, interceptorStack);
 			}
 			return sent;
 		}
 		catch (Exception e) {
-			if (countsEnabled && !metricsProcessed) {
+			if (countsAreEnabled && !metricsProcessed) {
 				if (sample != null) {
 					sample.stop(buildSendTimer(false, e.getClass().getSimpleName()));
 				}
-				channelMetrics.afterSend(metrics, false);
+				metrics.afterSend(metricsContext, false);
 			}
 			if (interceptorStack != null) {
-				interceptors.afterSendCompletion(message, this, sent, e, interceptorStack);
+				interceptorList.afterSendCompletion(message, this, sent, e, interceptorStack);
 			}
 			throw IntegrationUtils.wrapInDeliveryExceptionIfNecessary(message,
 					() -> "failed to send Message to channel '" + this.getComponentName() + "'", e);

spring-integration-core/src/main/java/org/springframework/integration/channel/DirectChannel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,8 +85,9 @@ protected UnicastingDispatcher getDispatcher() {
 	protected void onInit() {
 		super.onInit();
 		if (this.maxSubscribers == null) {
-			Integer maxSubscribers = this.getIntegrationProperty(IntegrationProperties.CHANNELS_MAX_UNICAST_SUBSCRIBERS, Integer.class);
-			this.setMaxSubscribers(maxSubscribers);
+			Integer max = this.getIntegrationProperty(IntegrationProperties.CHANNELS_MAX_UNICAST_SUBSCRIBERS,
+					Integer.class);
+			this.setMaxSubscribers(max);
 		}
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -316,17 +316,17 @@ else if (channel instanceof PollableChannel) {
 			if (this.autoStartup != null) {
 				this.endpoint.setAutoStartup(this.autoStartup);
 			}
-			int phase = this.phase;
+			int phaseToSet = this.phase;
 			if (!this.isPhaseSet) {
 				if (this.endpoint instanceof PollingConsumer) {
-					phase = Integer.MAX_VALUE / 2;
+					phaseToSet = Integer.MAX_VALUE / 2;
 				}
 				else {
-					phase = Integer.MIN_VALUE;
+					phaseToSet = Integer.MIN_VALUE;
 				}
 			}
 
-			this.endpoint.setPhase(phase);
+			this.endpoint.setPhase(phaseToSet);
 			this.endpoint.setRole(this.role);
 			if (this.taskScheduler != null) {
 				this.endpoint.setTaskScheduler(this.taskScheduler);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,24 +117,20 @@ public AbstractMethodAnnotationPostProcessor(ConfigurableListableBeanFactory bea
 		Assert.notNull(beanFactory, "'beanFactory' must not be null");
 		this.messageHandlerAttributes.add(SEND_TIMEOUT_ATTRIBUTE);
 		this.beanFactory = beanFactory;
-		ConversionService conversionService = this.beanFactory.getConversionService();
-		if (conversionService != null) {
-			this.conversionService = conversionService;
-		}
-		else {
-			this.conversionService = DefaultConversionService.getSharedInstance();
-		}
+		this.conversionService = this.beanFactory.getConversionService() != null
+				? this.beanFactory.getConversionService()
+				: DefaultConversionService.getSharedInstance();
 		this.channelResolver = new BeanFactoryChannelResolver(beanFactory);
 		this.annotationType = (Class<T>) GenericTypeResolver.resolveTypeArgument(this.getClass(),
 				MethodAnnotationPostProcessor.class);
-		Disposables disposables = null;
+		Disposables disposablesBean = null;
 		try {
-			disposables = beanFactory.getBean(Disposables.class);
+			disposablesBean = beanFactory.getBean(Disposables.class);
 		}
 		catch (Exception e) {
 			// NOSONAR - only for test cases
 		}
-		this.disposables = disposables;
+		this.disposables = disposablesBean;
 	}
 
 

spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,9 +88,9 @@ public S poller(Function<PollerFactory, PollerSpec> pollers) {
 	 * @see PollerSpec
 	 */
 	public S poller(PollerSpec pollerMetadataSpec) {
-		Map<Object, String> componentsToRegister = pollerMetadataSpec.getComponentsToRegister();
-		if (componentsToRegister != null) {
-			this.componentsToRegister.putAll(componentsToRegister);
+		Map<Object, String> components = pollerMetadataSpec.getComponentsToRegister();
+		if (components != null) {
+			this.componentsToRegister.putAll(components);
 		}
 		return poller(pollerMetadataSpec.get());
 	}

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java

@@ -3095,14 +3095,14 @@ else if (this.currentComponent instanceof SourcePollingChannelAdapterSpec) {
 
 	private boolean isOutputChannelRequired() {
 		if (this.currentComponent != null) {
-			Object currentComponent = this.currentComponent;
+			Object currentElement = this.currentComponent;
 
-			if (AopUtils.isAopProxy(currentComponent)) {
-				currentComponent = extractProxyTarget(currentComponent);
+			if (AopUtils.isAopProxy(currentElement)) {
+				currentElement = extractProxyTarget(currentElement);
 			}
 
-			return currentComponent instanceof AbstractMessageProducingHandler
-					|| currentComponent instanceof SourcePollingChannelAdapterSpec;
+			return currentElement instanceof AbstractMessageProducingHandler
+					|| currentElement instanceof SourcePollingChannelAdapterSpec;
 		}
 		return false;
 	}

spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -250,23 +250,23 @@ private Callable<Message<?>> createPollingTask() {
 					.collect(Collectors.toList());
 		}
 
-		Callable<Message<?>> pollingTask = this::doPoll;
+		Callable<Message<?>> task = this::doPoll;
 
-		List<Advice> adviceChain = this.adviceChain;
-		if (!CollectionUtils.isEmpty(adviceChain)) {
-			ProxyFactory proxyFactory = new ProxyFactory(pollingTask);
-			if (!CollectionUtils.isEmpty(adviceChain)) {
-				adviceChain.stream()
+		List<Advice> advices = this.adviceChain;
+		if (!CollectionUtils.isEmpty(advices)) {
+			ProxyFactory proxyFactory = new ProxyFactory(task);
+			if (!CollectionUtils.isEmpty(advices)) {
+				advices.stream()
 						.filter(advice -> !isReceiveOnlyAdvice(advice))
 						.forEach(proxyFactory::addAdvice);
 			}
-			pollingTask = (Callable<Message<?>>) proxyFactory.getProxy(this.beanClassLoader);
+			task = (Callable<Message<?>>) proxyFactory.getProxy(this.beanClassLoader);
 		}
 		if (!CollectionUtils.isEmpty(receiveOnlyAdviceChain)) {
 			applyReceiveOnlyAdviceChain(receiveOnlyAdviceChain);
 		}
 
-		return pollingTask;
+		return task;
 	}
 
 	private Runnable createPoller() {

spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java

@@ -219,9 +219,9 @@ protected void sendMessage(Message<?> messageArg) {
 	 * @since 4.3.10
 	 */
 	protected final boolean sendErrorMessageIfNecessary(Message<?> message, RuntimeException exception) {
-		MessageChannel errorChannel = getErrorChannel();
-		if (errorChannel != null) {
-			this.messagingTemplate.send(errorChannel, buildErrorMessage(message, exception));
+		MessageChannel channel = getErrorChannel();
+		if (channel != null) {
+			this.messagingTemplate.send(channel, buildErrorMessage(message, exception));
 			return true;
 		}
 		return false;

spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java

@@ -145,17 +145,13 @@ protected boolean isReceiveOnlyAdvice(Advice advice) {
 	protected void applyReceiveOnlyAdviceChain(Collection<Advice> chain) {
 		if (!CollectionUtils.isEmpty(chain)) {
 			if (AopUtils.isAopProxy(this.source)) {
-				Advised source = (Advised) this.source;
-				this.appliedAdvices.forEach(source::removeAdvice);
-				for (Advice advice : chain) {
-					source.addAdvisor(adviceToReceiveAdvisor(advice));
-				}
+				Advised advised = (Advised) this.source;
+				this.appliedAdvices.forEach(advised::removeAdvice);
+				chain.stream().forEach(advice -> advised.addAdvisor(adviceToReceiveAdvisor(advice)));
 			}
 			else {
 				ProxyFactory proxyFactory = new ProxyFactory(this.source);
-				for (Advice advice : chain) {
-					proxyFactory.addAdvisor(adviceToReceiveAdvisor(advice));
-				}
+				chain.stream().forEach(advice -> proxyFactory.addAdvisor(adviceToReceiveAdvisor(advice)));
 				this.source = (MessageSource<?>) proxyFactory.getProxy(getBeanClassLoader());
 			}
 			this.appliedAdvices.clear();

spring-integration-core/src/main/java/org/springframework/integration/expression/ExpressionEvalMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -282,16 +282,21 @@ public ExpressionEvalMapComponentsBuilder withReturnType(Class<?> returnType) {
 
 		private class ExpressionEvalMapFinalBuilderImpl implements ExpressionEvalMapFinalBuilder {
 
+			ExpressionEvalMapFinalBuilderImpl() {
+				super();
+			}
+
 			@Override
 			public ExpressionEvalMap build() {
 				if (ExpressionEvalMapBuilder.this.evaluationCallback != null) {
 					return new ExpressionEvalMap(ExpressionEvalMapBuilder.this.expressions,
 							ExpressionEvalMapBuilder.this.evaluationCallback);
 				}
-				ComponentsEvaluationCallback evaluationCallback =
-						new ComponentsEvaluationCallback(ExpressionEvalMapBuilder.this.context,
-								ExpressionEvalMapBuilder.this.root, ExpressionEvalMapBuilder.this.returnType);
-				return new ExpressionEvalMap(ExpressionEvalMapBuilder.this.expressions, evaluationCallback);
+				else {
+					return new ExpressionEvalMap(ExpressionEvalMapBuilder.this.expressions,
+							new ComponentsEvaluationCallback(ExpressionEvalMapBuilder.this.context,
+									ExpressionEvalMapBuilder.this.root, ExpressionEvalMapBuilder.this.returnType));
+				}
 			}
 
 		}
@@ -300,6 +305,10 @@ public ExpressionEvalMap build() {
 		private class ExpressionEvalMapComponentsBuilderImpl extends ExpressionEvalMapFinalBuilderImpl
 				implements ExpressionEvalMapComponentsBuilder {
 
+			ExpressionEvalMapComponentsBuilderImpl() {
+				super();
+			}
+
 			@Override
 			public ExpressionEvalMapComponentsBuilder usingEvaluationContext(EvaluationContext context) {
 				return ExpressionEvalMapBuilder.this.usingEvaluationContext(context);

spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -173,9 +173,9 @@ protected Object doHandleRequestMessage(Message<?> message) {
 	@Override
 	public Object postProcess(Message<?> message, Object result) {
 		if (result == null) {
-			MessageChannel discardChannel = getDiscardChannel();
-			if (discardChannel != null) {
-				this.messagingTemplate.send(discardChannel, message);
+			MessageChannel channel = getDiscardChannel();
+			if (channel != null) {
+				this.messagingTemplate.send(channel, message);
 			}
 			if (this.throwExceptionOnRejection) {
 				throw new MessageRejectedException(message, "MessageFilter '" + this.getComponentName()