From fd082db245fe09b8127ed58e8afd08fb9884f48d Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Thu, 12 Jan 2017 09:21:59 -0500
Subject: [PATCH] Minor Polishing

Unused imports etc.
---
 .../channel/MessageChannelReactiveUtils.java  |  4 +-
 .../dsl/IntegrationFlowDefinition.java        | 63 +++++++++++--------
 .../integration/dsl/IntegrationFlows.java     | 14 ++---
 3 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannelReactiveUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannelReactiveUtils.java
index ec84af7adf..506c64bfa7 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannelReactiveUtils.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannelReactiveUtils.java
@@ -70,7 +70,7 @@ public final class MessageChannelReactiveUtils {
 	}
 
 
-	private final static class SubscribableChannelPublisherAdapter<T> implements Publisher<Message<T>> {
+	private static final class SubscribableChannelPublisherAdapter<T> implements Publisher<Message<T>> {
 
 		private final SubscribableChannel channel;
 
@@ -93,7 +93,7 @@ public final class MessageChannelReactiveUtils {
 
 	}
 
-	private final static class PollableChannelPublisherAdapter<T> implements Publisher<Message<T>> {
+	private static final class PollableChannelPublisherAdapter<T> implements Publisher<Message<T>> {
 
 		private final PollableChannel channel;
 
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 5ff401a4a5..0ae2b5b519 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
@@ -34,7 +34,6 @@ import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.integration.aggregator.AggregatingMessageHandler;
 import org.springframework.integration.aggregator.BarrierMessageHandler;
-import org.springframework.integration.aggregator.ResequencingMessageHandler;
 import org.springframework.integration.channel.ChannelInterceptorAware;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.FixedSubscriberChannel;
@@ -54,7 +53,6 @@ import org.springframework.integration.expression.FunctionExpression;
 import org.springframework.integration.filter.ExpressionEvaluatingSelector;
 import org.springframework.integration.filter.MessageFilter;
 import org.springframework.integration.filter.MethodInvokingSelector;
-import org.springframework.integration.gateway.GatewayMessageHandler;
 import org.springframework.integration.handler.AbstractMessageProducingHandler;
 import org.springframework.integration.handler.BeanNameMessageProcessor;
 import org.springframework.integration.handler.BridgeHandler;
@@ -1725,7 +1723,9 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate the {@link ResequencingMessageHandler} with default options.
+	 * Populate the
+	 * {@link org.springframework.integration.aggregator.ResequencingMessageHandler} with
+	 * default options.
 	 * @return the current {@link IntegrationFlowDefinition}.
 	 */
 	public B resequence() {
@@ -1733,7 +1733,9 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate the {@link ResequencingMessageHandler} with provided options from {@link ResequencerSpec}.
+	 * Populate the
+	 * {@link org.springframework.integration.aggregator.ResequencingMessageHandler} with
+	 * provided options from {@link ResequencerSpec}.
 	 * In addition accept options for the integration endpoint using {@link GenericEndpointSpec}.
 	 * Typically used with a Java 8 Lambda expression:
 	 * <pre class="code">
@@ -1743,7 +1745,8 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	 *                    .phase(100))
 	 * }
 	 * </pre>
-	 * @param resequencer the {@link Consumer} to provide {@link ResequencingMessageHandler} options.
+	 * @param resequencer the {@link Consumer} to provide
+	 * {@link org.springframework.integration.aggregator.ResequencingMessageHandler} options.
 	 * @return the current {@link IntegrationFlowDefinition}.
 	 * @see ResequencerSpec
 	 */
@@ -2254,8 +2257,9 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate the "artificial" {@link GatewayMessageHandler} for the provided
-	 * {@code requestChannel} to send a request with default options.
+	 * Populate the "artificial"
+	 * {@link org.springframework.integration.gateway.GatewayMessageHandler} for the
+	 * provided {@code requestChannel} to send a request with default options.
 	 * Uses {@link org.springframework.integration.gateway.RequestReplyExchanger} Proxy
 	 * on the background.
 	 * @param requestChannel the {@link MessageChannel} bean name.
@@ -2266,12 +2270,15 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate the "artificial" {@link GatewayMessageHandler} for the provided
-	 * {@code requestChannel} to send a request with options from {@link GatewayEndpointSpec}.
-	 * Uses {@link org.springframework.integration.gateway.RequestReplyExchanger} Proxy
-	 * on the background.
+	 * Populate the "artificial"
+	 * {@link org.springframework.integration.gateway.GatewayMessageHandler} for the
+	 * provided {@code requestChannel} to send a request with options from
+	 * {@link GatewayEndpointSpec}. Uses
+	 * {@link org.springframework.integration.gateway.RequestReplyExchanger} Proxy on the
+	 * background.
 	 * @param requestChannel the {@link MessageChannel} bean name.
-	 * @param endpointConfigurer the {@link Consumer} to provide integration endpoint options.
+	 * @param endpointConfigurer the {@link Consumer} to provide integration endpoint
+	 * options.
 	 * @return the current {@link IntegrationFlowDefinition}.
 	 */
 	public B gateway(String requestChannel, Consumer<GatewayEndpointSpec> endpointConfigurer) {
@@ -2279,10 +2286,11 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate the "artificial" {@link GatewayMessageHandler} for the provided
-	 * {@code requestChannel} to send a request with default options.
-	 * Uses {@link org.springframework.integration.gateway.RequestReplyExchanger} Proxy
-	 * on the background.
+	 * Populate the "artificial"
+	 * {@link org.springframework.integration.gateway.GatewayMessageHandlerGatewayMessageHandler}
+	 * for the provided {@code requestChannel} to send a request with default options.
+	 * Uses {@link org.springframework.integration.gateway.RequestReplyExchanger} Proxy on
+	 * the background.
 	 * @param requestChannel the {@link MessageChannel} to use.
 	 * @return the current {@link IntegrationFlowDefinition}.
 	 */
@@ -2291,12 +2299,15 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate the "artificial" {@link GatewayMessageHandler} for the provided
-	 * {@code requestChannel} to send a request with options from {@link GatewayEndpointSpec}.
-	 * Uses {@link org.springframework.integration.gateway.RequestReplyExchanger} Proxy
-	 * on the background.
+	 * Populate the "artificial"
+	 * {@link org.springframework.integration.gateway.GatewayMessageHandler} for the
+	 * provided {@code requestChannel} to send a request with options from
+	 * {@link GatewayEndpointSpec}. Uses
+	 * {@link org.springframework.integration.gateway.RequestReplyExchanger} Proxy on the
+	 * background.
 	 * @param requestChannel the {@link MessageChannel} to use.
-	 * @param endpointConfigurer the {@link Consumer} to provide integration endpoint options.
+	 * @param endpointConfigurer the {@link Consumer} to provide integration endpoint
+	 * options.
 	 * @return the current {@link IntegrationFlowDefinition}.
 	 */
 	public B gateway(MessageChannel requestChannel, Consumer<GatewayEndpointSpec> endpointConfigurer) {
@@ -2304,8 +2315,9 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate the "artificial" {@link GatewayMessageHandler} for the provided
-	 * {@code subflow}.
+	 * Populate the "artificial"
+	 * {@link org.springframework.integration.gateway.GatewayMessageHandler} for the
+	 * provided {@code subflow}.
 	 * Typically used with a Java 8 Lambda expression:
 	 * <pre class="code">
 	 * {@code
@@ -2320,8 +2332,9 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	/**
-	 * Populate the "artificial" {@link GatewayMessageHandler} for the provided
-	 * {@code subflow} with options from {@link GatewayEndpointSpec}.
+	 * Populate the "artificial"
+	 * {@link org.springframework.integration.gateway.GatewayMessageHandler} for the
+	 * provided {@code subflow} with options from {@link GatewayEndpointSpec}.
 	 * Typically used with a Java 8 Lambda expression:
 	 * <pre class="code">
 	 * {@code
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java
index 4cef221276..ab4dc76c2a 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java
@@ -20,7 +20,6 @@ import java.util.function.Consumer;
 
 import org.reactivestreams.Publisher;
 
-import org.springframework.integration.annotation.MessagingGateway;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.ReactiveChannel;
 import org.springframework.integration.core.MessageSource;
@@ -269,12 +268,13 @@ public final class IntegrationFlows {
 	}
 
 	/**
-	 * Populate the {@link MessageChannel} to the new {@link IntegrationFlowBuilder} chain,
-	 * which becomes as a {@code requestChannel} for the Messaging Gateway(s) built on the provided
-	 * service interface.
-	 * <p> A gateway proxy bean for provided service interface is registered
-	 * under a name of the {@link IntegrationFlow} bean plus {@code .gateway} suffix.
-	 * @param serviceInterface the class with a {@link MessagingGateway} annotation.
+	 * Populate the {@link MessageChannel} to the new {@link IntegrationFlowBuilder}
+	 * chain, which becomes as a {@code requestChannel} for the Messaging Gateway(s) built
+	 * on the provided service interface.
+	 * <p>A gateway proxy bean for provided service interface is registered under a name of
+	 * the {@link IntegrationFlow} bean plus {@code .gateway} suffix.
+	 * @param serviceInterface the class with a
+	 * {@link org.springframework.integration.annotation.MessagingGateway} annotation.
 	 * @return new {@link IntegrationFlowBuilder}.
 	 */
 	public static IntegrationFlowBuilder from(Class<?> serviceInterface) {