From 66c3eff2ba8663968fd6d744a69405bef5b8a383 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Tue, 29 Oct 2019 08:11:31 -0400
Subject: [PATCH] Fix new Sonar smells

---
 .../dsl/BaseIntegrationFlowDefinition.java    | 13 +++++----
 .../dsl/IntegrationFlowDefinition.java        | 28 +++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java
index 9d02599603..789c72faa1 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java
@@ -470,11 +470,12 @@ public abstract class BaseIntegrationFlowDefinition<B extends BaseIntegrationFlo
 		WireTap interceptor = wireTapSpec.get();
 		MessageChannel currentChannel = getCurrentMessageChannel();
 		if (!(currentChannel instanceof InterceptableChannel)) {
-			channel(new DirectChannel());
+			currentChannel = new DirectChannel();
+			channel(currentChannel);
 			setImplicitChannel(true);
 		}
 		addComponent(wireTapSpec);
-		((InterceptableChannel) getCurrentMessageChannel()).addInterceptor(interceptor);
+		((InterceptableChannel) currentChannel).addInterceptor(interceptor);
 		return _this();
 	}
 
@@ -2807,11 +2808,13 @@ public abstract class BaseIntegrationFlowDefinition<B extends BaseIntegrationFlo
 	 */
 	@SuppressWarnings(UNCHECKED)
 	public <I, O> B fluxTransform(Function<? super Flux<Message<I>>, ? extends Publisher<O>> fluxFunction) {
-		if (!(getCurrentMessageChannel() instanceof FluxMessageChannel)) {
-			channel(new FluxMessageChannel());
+		MessageChannel currentChannel = getCurrentMessageChannel();
+		if (!(currentChannel instanceof FluxMessageChannel)) {
+			currentChannel = new FluxMessageChannel();
+			channel(currentChannel);
 		}
 
-		Publisher<Message<I>> upstream = (Publisher<Message<I>>) getCurrentMessageChannel();
+		Publisher<Message<I>> upstream = (Publisher<Message<I>>) currentChannel;
 
 		Flux<Message<O>> result = Transformers.transformWithFunction(upstream, fluxFunction);
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
index 0e3ffacb26..2d9f9f266a 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
@@ -25,11 +25,8 @@ import org.reactivestreams.Publisher;
 
 import org.springframework.expression.Expression;
 import org.springframework.integration.core.GenericSelector;
-import org.springframework.integration.filter.MessageFilter;
-import org.springframework.integration.filter.MethodInvokingSelector;
 import org.springframework.integration.handler.BridgeHandler;
 import org.springframework.integration.handler.GenericHandler;
-import org.springframework.integration.handler.LambdaMessageProcessor;
 import org.springframework.integration.handler.LoggingHandler;
 import org.springframework.integration.handler.MessageTriggerAction;
 import org.springframework.integration.handler.ServiceActivatingHandler;
@@ -46,7 +43,6 @@ import org.springframework.integration.support.MapBuilder;
 import org.springframework.integration.transformer.GenericTransformer;
 import org.springframework.integration.transformer.HeaderFilter;
 import org.springframework.integration.transformer.MessageTransformingHandler;
-import org.springframework.integration.transformer.MethodInvokingTransformer;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
@@ -80,8 +76,8 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	 * @param <S> the source type - 'transform from'.
 	 * @param <T> the target type - 'transform to'.
 	 * @return the current {@link IntegrationFlowDefinition}.
-	 * @see MethodInvokingTransformer
-	 * @see LambdaMessageProcessor
+	 * @see org.springframework.integration.transformer.MethodInvokingTransformer
+	 * @see org.springframework.integration.handler.LambdaMessageProcessor
 	 */
 	public <S, T> B transform(GenericTransformer<S, T> genericTransformer) {
 		return transform(null, genericTransformer);
@@ -100,8 +96,8 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	 * @param <S> the source type - 'transform from'.
 	 * @param <T> the target type - 'transform to'.
 	 * @return the current {@link IntegrationFlowDefinition}.
-	 * @see MethodInvokingTransformer
-	 * @see LambdaMessageProcessor
+	 * @see org.springframework.integration.transformer.MethodInvokingTransformer
+	 * @see org.springframework.integration.handler.LambdaMessageProcessor
 	 * @see GenericEndpointSpec
 	 */
 	public <S, T> B transform(GenericTransformer<S, T> genericTransformer,
@@ -111,7 +107,8 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate a {@link MessageFilter} with {@link MethodInvokingSelector}
+	 * Populate a {@link org.springframework.integration.filter.MessageFilter}
+	 * with {@link org.springframework.integration.filter.MethodInvokingSelector}
 	 * for the provided {@link GenericSelector}.
 	 * Typically used with a Java 8 Lambda expression:
 	 * <pre class="code">
@@ -130,7 +127,8 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate a {@link MessageFilter} with {@link MethodInvokingSelector}
+	 * Populate a {@link org.springframework.integration.filter.MessageFilter}
+	 * with {@link org.springframework.integration.filter.MethodInvokingSelector}
 	 * for the provided {@link GenericSelector}.
 	 * In addition accept options for the integration endpoint using {@link FilterEndpointSpec}.
 	 * Typically used with a Java 8 Lambda expression:
@@ -166,7 +164,7 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	 * @param handler the handler to invoke.
 	 * @param <P> the payload type to expect.
 	 * @return the current {@link IntegrationFlowDefinition}.
-	 * @see LambdaMessageProcessor
+	 * @see org.springframework.integration.handler.LambdaMessageProcessor
 	 */
 	public <P> B handle(GenericHandler<P> handler) {
 		return handle(null, handler);
@@ -189,7 +187,7 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	 * @param endpointConfigurer the {@link Consumer} to provide integration endpoint options.
 	 * @param <P> the payload type to expect.
 	 * @return the current {@link IntegrationFlowDefinition}.
-	 * @see LambdaMessageProcessor
+	 * @see org.springframework.integration.handler.LambdaMessageProcessor
 	 * @see GenericEndpointSpec
 	 */
 	public <P> B handle(GenericHandler<P> handler,
@@ -218,7 +216,7 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	 * @param endpointConfigurer the {@link Consumer} to provide integration endpoint options.
 	 * @param <P> the payload type.
 	 * @return the current {@link IntegrationFlowDefinition}.
-	 * @see LambdaMessageProcessor
+	 * @see org.springframework.integration.handler.LambdaMessageProcessor
 	 * @see SplitterEndpointSpec
 	 */
 	public <P> B split(Function<P, ?> splitter,
@@ -825,8 +823,8 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	@Override
-	public B routeByException(Consumer<RouterSpec<Class<? extends Throwable>,
-			ErrorMessageExceptionTypeRouter>> routerConfigurer) { // NOSONAR - byte code backward compatibility
+	public B routeByException(Consumer<RouterSpec<Class<? extends Throwable>,  // NOSONAR - byte code backward compatibility
+			ErrorMessageExceptionTypeRouter>> routerConfigurer) {
 
 		return super.routeByException(routerConfigurer);
 	}