Fix new classes and packages tangles (#3898)

* Fix new classes and packages tangles

* Move `MessagingAnnotationPostProcessor` and `MethodAnnotationPostProcessor` impls
out of the `config.annotation` package due to usage of the `FactoryBean` configs
* Move `GenericHandler` and `GenericTransformer` to the `core` package to break
a tangle with a `LambdaMessageProcessor`
* Clean up affected tests and docs

* * Fix Checkstyle violation for imports order

Author: artembilan

spring-integration-core/src/main/java/org/springframework/integration/aot/CoreRuntimeHints.java

@@ -39,14 +39,15 @@
 import org.springframework.integration.aggregator.MessageGroupProcessor;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.context.IntegrationProperties;
+import org.springframework.integration.core.GenericHandler;
 import org.springframework.integration.core.GenericSelector;
+import org.springframework.integration.core.GenericTransformer;
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.integration.gateway.MethodArgsHolder;
 import org.springframework.integration.gateway.RequestReplyExchanger;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.handler.DelayHandler;
-import org.springframework.integration.handler.GenericHandler;
 import org.springframework.integration.history.MessageHistory;
 import org.springframework.integration.json.JsonPathUtils;
 import org.springframework.integration.message.AdviceMessage;
@@ -56,7 +57,6 @@
 import org.springframework.integration.store.MessageMetadata;
 import org.springframework.integration.support.MutableMessage;
 import org.springframework.integration.support.MutableMessageHeaders;
-import org.springframework.integration.transformer.GenericTransformer;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.PollableChannel;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -73,10 +73,7 @@
 import org.springframework.integration.annotation.Role;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.MessagePublishingErrorHandler;
-import org.springframework.integration.config.AbstractSimpleMessageHandlerFactoryBean;
-import org.springframework.integration.config.ConsumerEndpointFactoryBean;
-import org.springframework.integration.config.IntegrationConfigUtils;
-import org.springframework.integration.config.RouterFactoryBean;
+import org.springframework.integration.config.annotation.MethodAnnotationPostProcessor;
 import org.springframework.integration.context.IntegrationObjectSupport;
 import org.springframework.integration.context.Orderable;
 import org.springframework.integration.endpoint.AbstractEndpoint;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AggregatorAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/BridgeFromAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/BridgeFromAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/BridgeToAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/BridgeToAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -30,7 +30,6 @@
 import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.integration.annotation.BridgeFrom;
 import org.springframework.integration.annotation.BridgeTo;
-import org.springframework.integration.config.ConsumerEndpointFactoryBean;
 import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.handler.BridgeHandler;
 import org.springframework.integration.util.MessagingAnnotationUtils;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/FilterAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/FilterAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -28,7 +28,6 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.core.ResolvableType;
 import org.springframework.integration.annotation.Filter;
-import org.springframework.integration.config.FilterFactoryBean;
 import org.springframework.integration.core.MessageSelector;
 import org.springframework.integration.filter.MessageFilter;
 import org.springframework.integration.filter.MethodInvokingSelector;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/InboundChannelAdapterAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/InboundChannelAdapterAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -31,8 +31,6 @@
 import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.integration.annotation.InboundChannelAdapter;
 import org.springframework.integration.annotation.Poller;
-import org.springframework.integration.config.IntegrationConfigUtils;
-import org.springframework.integration.config.SourcePollingChannelAdapterFactoryBean;
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.endpoint.MethodInvokingMessageSource;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;

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

@@ -22,7 +22,6 @@
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/MessagingAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -60,6 +60,7 @@
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.annotation.Splitter;
 import org.springframework.integration.annotation.Transformer;
+import org.springframework.integration.config.annotation.MethodAnnotationPostProcessor;
 import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.util.MessagingAnnotationUtils;
 import org.springframework.util.Assert;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/RouterAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -33,7 +33,6 @@
 import org.springframework.core.ResolvableType;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.integration.annotation.Router;
-import org.springframework.integration.config.RouterFactoryBean;
 import org.springframework.integration.router.AbstractMessageRouter;
 import org.springframework.integration.router.MethodInvokingRouter;
 import org.springframework.integration.util.MessagingAnnotationUtils;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -28,7 +28,6 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.core.ResolvableType;
 import org.springframework.integration.annotation.ServiceActivator;
-import org.springframework.integration.config.ServiceActivatorFactoryBean;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.integration.util.MessagingAnnotationUtils;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/SplitterAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -28,7 +28,6 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.core.ResolvableType;
 import org.springframework.integration.annotation.Splitter;
-import org.springframework.integration.config.SplitterFactoryBean;
 import org.springframework.integration.splitter.AbstractMessageSplitter;
 import org.springframework.integration.splitter.MethodInvokingSplitter;
 import org.springframework.integration.util.MessagingAnnotationUtils;

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java renamed to spring-integration-core/src/main/java/org/springframework/integration/config/TransformerAnnotationPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config.annotation;
+package org.springframework.integration.config;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -27,7 +27,6 @@
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.core.ResolvableType;
-import org.springframework.integration.config.TransformerFactoryBean;
 import org.springframework.integration.transformer.MessageTransformingHandler;
 import org.springframework.integration.transformer.MethodInvokingTransformer;
 import org.springframework.integration.transformer.Transformer;

spring-integration-core/src/main/java/org/springframework/integration/handler/GenericHandler.java renamed to spring-integration-core/src/main/java/org/springframework/integration/core/GenericHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler;
+package org.springframework.integration.core;
 
 import org.springframework.messaging.MessageHeaders;
 

spring-integration-core/src/main/java/org/springframework/integration/transformer/GenericTransformer.java renamed to spring-integration-core/src/main/java/org/springframework/integration/core/GenericTransformer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.transformer;
+package org.springframework.integration.core;
 
 /**
  * Generic (lambda) strategy interface for transformer.

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

@@ -43,7 +43,9 @@
 import org.springframework.integration.config.ConsumerEndpointFactoryBean;
 import org.springframework.integration.config.SourcePollingChannelAdapterFactoryBean;
 import org.springframework.integration.context.IntegrationContextUtils;
+import org.springframework.integration.core.GenericHandler;
 import org.springframework.integration.core.GenericSelector;
+import org.springframework.integration.core.GenericTransformer;
 import org.springframework.integration.core.MessageProducer;
 import org.springframework.integration.core.MessageSelector;
 import org.springframework.integration.dsl.support.FixedSubscriberChannelPrototype;
@@ -58,7 +60,6 @@
 import org.springframework.integration.handler.BridgeHandler;
 import org.springframework.integration.handler.DelayHandler;
 import org.springframework.integration.handler.ExpressionCommandMessageProcessor;
-import org.springframework.integration.handler.GenericHandler;
 import org.springframework.integration.handler.LambdaMessageProcessor;
 import org.springframework.integration.handler.LoggingHandler;
 import org.springframework.integration.handler.MessageProcessor;
@@ -79,7 +80,6 @@
 import org.springframework.integration.transformer.ClaimCheckInTransformer;
 import org.springframework.integration.transformer.ClaimCheckOutTransformer;
 import org.springframework.integration.transformer.ExpressionEvaluatingTransformer;
-import org.springframework.integration.transformer.GenericTransformer;
 import org.springframework.integration.transformer.HeaderFilter;
 import org.springframework.integration.transformer.MessageTransformingHandler;
 import org.springframework.integration.transformer.MethodInvokingTransformer;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -19,12 +19,12 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import org.springframework.integration.core.GenericHandler;
 import org.springframework.integration.core.GenericSelector;
-import org.springframework.integration.handler.GenericHandler;
+import org.springframework.integration.core.GenericTransformer;
 import org.springframework.integration.handler.ServiceActivatingHandler;
 import org.springframework.integration.router.MethodInvokingRouter;
 import org.springframework.integration.splitter.MethodInvokingSplitter;
-import org.springframework.integration.transformer.GenericTransformer;
 import org.springframework.integration.transformer.MessageTransformingHandler;
 
 /**

spring-integration-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java

@@ -32,8 +32,9 @@
 import org.springframework.core.MethodIntrospector;
 import org.springframework.core.log.LogMessage;
 import org.springframework.integration.context.IntegrationContextUtils;
+import org.springframework.integration.core.GenericHandler;
 import org.springframework.integration.core.GenericSelector;
-import org.springframework.integration.transformer.GenericTransformer;
+import org.springframework.integration.core.GenericTransformer;
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;

spring-integration-core/src/main/java/org/springframework/integration/transformer/Transformer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -16,6 +16,7 @@
 
 package org.springframework.integration.transformer;
 
+import org.springframework.integration.core.GenericTransformer;
 import org.springframework.messaging.Message;
 
 /**

spring-integration-core/src/main/java/org/springframework/integration/util/ClassUtils.java

@@ -60,12 +60,12 @@ public abstract class ClassUtils {
 	public static final Method SELECTOR_ACCEPT_METHOD;
 
 	/**
-	 * The {@code org.springframework.integration.transformer.GenericTransformer#transform(Object)} method object.
+	 * The {@code org.springframework.integration.core.GenericTransformer#transform(Object)} method object.
 	 */
 	public static final Method TRANSFORMER_TRANSFORM_METHOD;
 
 	/**
-	 * The {@code org.springframework.integration.handler.GenericHandler#handle(Object, Map)} method object.
+	 * The {@code org.springframework.integration.core.GenericHandler#handle(Object, Map)} method object.
 	 */
 	public static final Method HANDLER_HANDLE_METHOD;
 
@@ -117,7 +117,7 @@ public abstract class ClassUtils {
 		try {
 			genericTransformerClass =
 					org.springframework.util.ClassUtils.forName(
-							"org.springframework.integration.transformer.GenericTransformer", defaultClassLoader);
+							"org.springframework.integration.core.GenericTransformer", defaultClassLoader);
 		}
 		catch (ClassNotFoundException e) {
 			ReflectionUtils.rethrowRuntimeException(e);
@@ -130,7 +130,7 @@ public abstract class ClassUtils {
 		try {
 			genericHandlerClass =
 					org.springframework.util.ClassUtils.forName(
-							"org.springframework.integration.handler.GenericHandler", defaultClassLoader);
+							"org.springframework.integration.core.GenericHandler", defaultClassLoader);
 		}
 		catch (ClassNotFoundException e) {
 			ReflectionUtils.rethrowRuntimeException(e);

spring-integration-core/src/main/kotlin/org/springframework/integration/dsl/KotlinIntegrationFlowDefinition.kt

@@ -28,7 +28,7 @@ import org.springframework.integration.filter.MessageFilter
 import org.springframework.integration.filter.MethodInvokingSelector
 import org.springframework.integration.handler.BridgeHandler
 import org.springframework.integration.handler.DelayHandler
-import org.springframework.integration.handler.GenericHandler
+import org.springframework.integration.core.GenericHandler
 import org.springframework.integration.handler.LoggingHandler
 import org.springframework.integration.handler.MessageProcessor
 import org.springframework.integration.handler.MessageTriggerAction

spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java

@@ -28,7 +28,7 @@
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor;
+import org.springframework.integration.config.MessagingAnnotationPostProcessor;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;