From 0735ddb0ed09dff90a8b2506369228c89d2fdc31 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Tue, 19 Jun 2018 17:45:00 -0400
Subject: [PATCH] INT-4390: Fix tangle betweewn dsl and dsl.context

JIRA: https://jira.spring.io/browse/INT-4390

Move IFBPP and lifecycle advice to `....dsl.context`.
---
 .../integration/dsl/IntegrationFlowDefinition.java   |  4 ++--
 .../integration/dsl/IntegrationFlows.java            |  2 +-
 .../integration/dsl/StandardIntegrationFlow.java     |  2 +-
 .../DslIntegrationConfigurationInitializer.java      |  1 -
 .../IntegrationFlowBeanPostProcessor.java            | 12 ++++++++++--
 .../IntegrationFlowLifecycleAdvice.java              |  4 +++-
 .../dsl/support/FixedSubscriberChannelPrototype.java |  2 +-
 .../dsl/support/MessageChannelReference.java         |  2 +-
 8 files changed, 19 insertions(+), 10 deletions(-)
 rename spring-integration-core/src/main/java/org/springframework/integration/dsl/{ => context}/IntegrationFlowBeanPostProcessor.java (95%)
 rename spring-integration-core/src/main/java/org/springframework/integration/dsl/{ => context}/IntegrationFlowLifecycleAdvice.java (95%)

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 dc23403135..414ed2a482 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
@@ -110,7 +110,7 @@ import reactor.util.function.Tuple2;
  *
  * @since 5.0
  *
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  */
 public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinition<B>> {
 
@@ -200,7 +200,7 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	 * Populate the provided {@link MessageChannel} instance
 	 * at the current {@link IntegrationFlow} chain position.
 	 * The {@code messageChannel} can be an existing bean, or fresh instance, in which case
-	 * the {@link org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor}
+	 * the {@link org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor}
 	 * will populate it as a bean with a generated name.
 	 * @param messageChannel the {@link MessageChannel} to populate.
 	 * @return the current {@link IntegrationFlowDefinition}.
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 099b35a58e..0ce3a3e992 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
@@ -45,7 +45,7 @@ import org.springframework.util.Assert;
  *
  * @since 5.0
  *
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  */
 public final class IntegrationFlows {
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/StandardIntegrationFlow.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/StandardIntegrationFlow.java
index 74658ac914..bbf53396ea 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/StandardIntegrationFlow.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/StandardIntegrationFlow.java
@@ -61,7 +61,7 @@ import org.springframework.messaging.MessageChannel;
  * @since 5.0
  *
  * @see IntegrationFlows
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  * @see org.springframework.integration.dsl.context.IntegrationFlowContext
  */
 public class StandardIntegrationFlow implements IntegrationFlow, SmartLifecycle {
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/DslIntegrationConfigurationInitializer.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/DslIntegrationConfigurationInitializer.java
index 160e58702c..109d01e6e6 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/DslIntegrationConfigurationInitializer.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/DslIntegrationConfigurationInitializer.java
@@ -24,7 +24,6 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.integration.config.IntegrationConfigurationInitializer;
 import org.springframework.integration.dsl.IntegrationComponentSpec;
-import org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowBeanPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java
similarity index 95%
rename from spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowBeanPostProcessor.java
rename to spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java
index 2d1bce3cde..2e1b5bd57d 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowBeanPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowBeanPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dsl;
+package org.springframework.integration.dsl.context;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -44,7 +44,15 @@ import org.springframework.integration.config.ConsumerEndpointFactoryBean;
 import org.springframework.integration.config.IntegrationConfigUtils;
 import org.springframework.integration.config.SourcePollingChannelAdapterFactoryBean;
 import org.springframework.integration.core.MessageSource;
-import org.springframework.integration.dsl.context.IntegrationFlowContext;
+import org.springframework.integration.dsl.ComponentsRegistration;
+import org.springframework.integration.dsl.ConsumerEndpointSpec;
+import org.springframework.integration.dsl.IntegrationComponentSpec;
+import org.springframework.integration.dsl.IntegrationFlow;
+import org.springframework.integration.dsl.IntegrationFlowAdapter;
+import org.springframework.integration.dsl.IntegrationFlowBuilder;
+import org.springframework.integration.dsl.IntegrationFlows;
+import org.springframework.integration.dsl.SourcePollingChannelAdapterSpec;
+import org.springframework.integration.dsl.StandardIntegrationFlow;
 import org.springframework.integration.dsl.support.MessageChannelReference;
 import org.springframework.integration.gateway.AnnotationGatewayProxyFactoryBean;
 import org.springframework.integration.support.context.NamedComponent;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowLifecycleAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowLifecycleAdvice.java
similarity index 95%
rename from spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowLifecycleAdvice.java
rename to spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowLifecycleAdvice.java
index 4a075e919f..698f661e76 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowLifecycleAdvice.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowLifecycleAdvice.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dsl;
+package org.springframework.integration.dsl.context;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
 import org.springframework.context.SmartLifecycle;
+import org.springframework.integration.dsl.IntegrationFlow;
+import org.springframework.integration.dsl.StandardIntegrationFlow;
 import org.springframework.util.ObjectUtils;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/support/FixedSubscriberChannelPrototype.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/support/FixedSubscriberChannelPrototype.java
index 617cba4f79..b3aaae5956 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/support/FixedSubscriberChannelPrototype.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/support/FixedSubscriberChannelPrototype.java
@@ -28,7 +28,7 @@ import org.springframework.messaging.MessageChannel;
  * @author Artem Bilan
  * @since 5.0
  *
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  */
 public class FixedSubscriberChannelPrototype implements MessageChannel {
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/support/MessageChannelReference.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/support/MessageChannelReference.java
index 5c45a9fac1..37effa062c 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/support/MessageChannelReference.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/support/MessageChannelReference.java
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  *
  * @since 5.0
  *
- * @see org.springframework.integration.dsl.IntegrationFlowBeanPostProcessor
+ * @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
  */
 public class MessageChannelReference implements MessageChannel {