diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java index c50c672a2d..e5759eeb68 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java @@ -29,6 +29,7 @@ import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.amqp.support.converter.SimpleMessageConverter; import org.springframework.core.AttributeAccessor; import org.springframework.integration.IntegrationMessageHeaderAccessor; +import org.springframework.integration.StaticMessageHeaderAccessor; import org.springframework.integration.amqp.support.AmqpHeaderMapper; import org.springframework.integration.amqp.support.AmqpMessageHeaderErrorMessageStrategy; import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper; @@ -36,7 +37,6 @@ import org.springframework.integration.context.OrderlyShutdownCapable; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.support.ErrorMessageStrategy; import org.springframework.integration.support.ErrorMessageUtils; -import org.springframework.integration.support.StaticMessageHeaderAccessor; import org.springframework.retry.RecoveryCallback; import org.springframework.retry.RetryCallback; import org.springframework.retry.RetryContext; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java index 2a958d93fd..629f538c83 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java @@ -34,13 +34,13 @@ import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.amqp.support.converter.SimpleMessageConverter; import org.springframework.core.AttributeAccessor; import org.springframework.integration.IntegrationMessageHeaderAccessor; +import org.springframework.integration.StaticMessageHeaderAccessor; import org.springframework.integration.amqp.support.AmqpHeaderMapper; import org.springframework.integration.amqp.support.AmqpMessageHeaderErrorMessageStrategy; import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper; import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.support.ErrorMessageStrategy; import org.springframework.integration.support.ErrorMessageUtils; -import org.springframework.integration.support.StaticMessageHeaderAccessor; import org.springframework.retry.RecoveryCallback; import org.springframework.retry.RetryCallback; import org.springframework.retry.RetryContext; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java index 5401652416..1085ca0f68 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java @@ -31,13 +31,13 @@ import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.amqp.support.converter.SimpleMessageConverter; import org.springframework.context.MessageSource; import org.springframework.integration.IntegrationMessageHeaderAccessor; +import org.springframework.integration.acks.AcknowledgmentCallback; +import org.springframework.integration.acks.AcknowledgmentCallbackFactory; import org.springframework.integration.amqp.support.AmqpHeaderMapper; import org.springframework.integration.amqp.support.AmqpMessageHeaderErrorMessageStrategy; import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper; import org.springframework.integration.endpoint.AbstractMessageSource; import org.springframework.integration.support.AbstractIntegrationMessageBuilder; -import org.springframework.integration.support.AcknowledgmentCallback; -import org.springframework.integration.support.AcknowledgmentCallbackFactory; import org.springframework.util.Assert; import com.rabbitmq.client.Channel; diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceIntegrationTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceIntegrationTests.java index 94d9c51f0e..0be9d5f22b 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceIntegrationTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceIntegrationTests.java @@ -49,6 +49,8 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.IntegrationMessageHeaderAccessor; +import org.springframework.integration.acks.AcknowledgmentCallback; +import org.springframework.integration.acks.AcknowledgmentCallback.Status; import org.springframework.integration.amqp.dsl.Amqp; import org.springframework.integration.annotation.InboundChannelAdapter; import org.springframework.integration.annotation.Poller; @@ -58,8 +60,6 @@ import org.springframework.integration.core.MessageSource; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.Pollers; -import org.springframework.integration.support.AcknowledgmentCallback; -import org.springframework.integration.support.AcknowledgmentCallback.Status; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.annotation.DirtiesContext; diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java index 54cdd0f98a..a479bf659c 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java @@ -34,9 +34,9 @@ import org.junit.Test; import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.support.AmqpHeaders; +import org.springframework.integration.StaticMessageHeaderAccessor; +import org.springframework.integration.acks.AcknowledgmentCallback.Status; import org.springframework.integration.amqp.support.AmqpMessageHeaderErrorMessageStrategy; -import org.springframework.integration.support.AcknowledgmentCallback.Status; -import org.springframework.integration.support.StaticMessageHeaderAccessor; import org.springframework.messaging.Message; import com.rabbitmq.client.AMQP.BasicProperties; diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java index 639fe22a4f..e09d249a52 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java @@ -58,6 +58,7 @@ import org.springframework.amqp.support.converter.MessageConversionException; import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.amqp.support.converter.SimpleMessageConverter; import org.springframework.beans.factory.BeanFactory; +import org.springframework.integration.StaticMessageHeaderAccessor; import org.springframework.integration.amqp.support.AmqpMessageHeaderErrorMessageStrategy; import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper; import org.springframework.integration.channel.DirectChannel; @@ -67,7 +68,6 @@ import org.springframework.integration.json.JsonToObjectTransformer; import org.springframework.integration.json.ObjectToJsonTransformer; import org.springframework.integration.mapping.support.JsonHeaders; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.StaticMessageHeaderAccessor; import org.springframework.integration.transformer.MessageTransformingHandler; import org.springframework.integration.transformer.Transformer; import org.springframework.messaging.Message; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/IntegrationMessageHeaderAccessor.java b/spring-integration-core/src/main/java/org/springframework/integration/IntegrationMessageHeaderAccessor.java index d45da96eb2..a585d1dcaa 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/IntegrationMessageHeaderAccessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/IntegrationMessageHeaderAccessor.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.support.AcknowledgmentCallback; +import org.springframework.integration.acks.AcknowledgmentCallback; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/StaticMessageHeaderAccessor.java b/spring-integration-core/src/main/java/org/springframework/integration/StaticMessageHeaderAccessor.java similarity index 96% rename from spring-integration-core/src/main/java/org/springframework/integration/support/StaticMessageHeaderAccessor.java rename to spring-integration-core/src/main/java/org/springframework/integration/StaticMessageHeaderAccessor.java index bed27ab8a2..b6704d4d4a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/StaticMessageHeaderAccessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/StaticMessageHeaderAccessor.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration; import java.io.Closeable; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.IntegrationMessageHeaderAccessor; +import org.springframework.integration.acks.AcknowledgmentCallback; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/AckUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/acks/AckUtils.java similarity index 88% rename from spring-integration-core/src/main/java/org/springframework/integration/support/AckUtils.java rename to spring-integration-core/src/main/java/org/springframework/integration/acks/AckUtils.java index dbf6e705da..6b1cc22e61 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/AckUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/acks/AckUtils.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.acks; -import org.springframework.integration.support.AcknowledgmentCallback.Status; +import org.springframework.integration.acks.AcknowledgmentCallback.Status; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; @@ -37,10 +37,12 @@ public final class AckUtils { * Return the {@link AcknowledgmentCallback} header (if present). * @param message the message. * @return the callback, or null. + * @deprecated use StaticMessageHeaderAccessor.getAcknowledgmentCallback(message). */ + @Deprecated @Nullable public static AcknowledgmentCallback getAckCallback(Message message) { - return StaticMessageHeaderAccessor.getAcknowledgmentCallback(message); + throw new UnsupportedOperationException("Use StaticMessageHeaderAccessor.getAcknowledgmentCallback(message)"); } /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/AcknowledgmentCallback.java b/spring-integration-core/src/main/java/org/springframework/integration/acks/AcknowledgmentCallback.java similarity index 97% rename from spring-integration-core/src/main/java/org/springframework/integration/support/AcknowledgmentCallback.java rename to spring-integration-core/src/main/java/org/springframework/integration/acks/AcknowledgmentCallback.java index 87330d6ffd..9d75638e4f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/AcknowledgmentCallback.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/acks/AcknowledgmentCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.acks; /** * A general abstraction over acknowledgments. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/AcknowledgmentCallbackFactory.java b/spring-integration-core/src/main/java/org/springframework/integration/acks/AcknowledgmentCallbackFactory.java similarity index 95% rename from spring-integration-core/src/main/java/org/springframework/integration/support/AcknowledgmentCallbackFactory.java rename to spring-integration-core/src/main/java/org/springframework/integration/acks/AcknowledgmentCallbackFactory.java index df92df6625..72a2d69973 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/AcknowledgmentCallbackFactory.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/acks/AcknowledgmentCallbackFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.acks; /** * A factory for creating {@link AcknowledgmentCallback}s. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/acks/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/acks/package-info.java new file mode 100644 index 0000000000..4ce1b22684 --- /dev/null +++ b/spring-integration-core/src/main/java/org/springframework/integration/acks/package-info.java @@ -0,0 +1,4 @@ +/** + * Provides classes related to message acknowledgment. + */ +package org.springframework.integration.acks; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageListProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageListProcessor.java index 1716c8d774..4c894225b0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageListProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageListProcessor.java @@ -23,8 +23,8 @@ import java.util.Map; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.Lifecycle; +import org.springframework.integration.handler.support.MessagingMethodInvokerHelper; import org.springframework.integration.util.AbstractExpressionEvaluator; -import org.springframework.integration.util.MessagingMethodInvokerHelper; import org.springframework.messaging.Message; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java index 9b9d049af8..86976fc562 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java @@ -17,7 +17,7 @@ package org.springframework.integration.channel; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.support.ErrorMessagePublisher; +import org.springframework.integration.core.ErrorMessagePublisher; import org.springframework.integration.support.ErrorMessageStrategy; import org.springframework.integration.support.MessagingExceptionWrapper; import org.springframework.messaging.Message; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptor.java index a483320b04..b87daeaef7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptor.java @@ -49,7 +49,7 @@ public @interface GlobalChannelInterceptor { * A leading '!' negates the pattern match. * Default is "*" (all channels). * @return The pattern. - * @see org.springframework.integration.util.PatternMatchUtils#smartMatch(String, String...) + * @see org.springframework.integration.support.utils.PatternMatchUtils#smartMatch(String, String...) */ String[] patterns() default "*"; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptorProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptorProcessor.java index 70089f3d07..321672f1e2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptorProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptorProcessor.java @@ -41,7 +41,7 @@ import org.springframework.integration.channel.interceptor.GlobalChannelIntercep import org.springframework.integration.channel.interceptor.VetoCapableInterceptor; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.context.IntegrationProperties; -import org.springframework.integration.util.PatternMatchUtils; +import org.springframework.integration.support.utils.PatternMatchUtils; import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java index 9e9179c7a2..6e5267939e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java @@ -49,6 +49,7 @@ import org.springframework.integration.config.annotation.MessagingAnnotationPost import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.context.IntegrationProperties; import org.springframework.integration.handler.support.CollectionArgumentResolver; +import org.springframework.integration.handler.support.HandlerMethodArgumentResolversHolder; import org.springframework.integration.handler.support.MapArgumentResolver; import org.springframework.integration.handler.support.PayloadExpressionArgumentResolver; import org.springframework.integration.handler.support.PayloadsArgumentResolver; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/ErrorMessagePublisher.java b/spring-integration-core/src/main/java/org/springframework/integration/core/ErrorMessagePublisher.java similarity index 96% rename from spring-integration-core/src/main/java/org/springframework/integration/support/ErrorMessagePublisher.java rename to spring-integration-core/src/main/java/org/springframework/integration/core/ErrorMessagePublisher.java index cd4b677343..713e45d59b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/ErrorMessagePublisher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/ErrorMessagePublisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,7 +23,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.core.AttributeAccessor; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.MessagingTemplate; +import org.springframework.integration.support.DefaultErrorMessageStrategy; +import org.springframework.integration.support.ErrorMessageStrategy; +import org.springframework.integration.support.ErrorMessageUtils; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractFetchLimitingMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractFetchLimitingMessageSource.java index d9f1ad8623..2a708e8eb0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractFetchLimitingMessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractFetchLimitingMessageSource.java @@ -16,6 +16,8 @@ package org.springframework.integration.endpoint; +import org.springframework.integration.support.management.MessageSourceManagement; + /** * A message source that can limit the number of remote objects it fetches. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageSourcePollingTemplate.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageSourcePollingTemplate.java index f1bb85f597..ca4dcfb0ce 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageSourcePollingTemplate.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageSourcePollingTemplate.java @@ -16,9 +16,10 @@ package org.springframework.integration.endpoint; +import org.springframework.integration.StaticMessageHeaderAccessor; +import org.springframework.integration.acks.AckUtils; +import org.springframework.integration.acks.AcknowledgmentCallback; import org.springframework.integration.core.MessageSource; -import org.springframework.integration.support.AckUtils; -import org.springframework.integration.support.AcknowledgmentCallback; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessageHandlingException; @@ -48,7 +49,7 @@ public class MessageSourcePollingTemplate implements PollingOperations { Assert.notNull(handler, "'handler' cannot be null"); Message message = this.source.receive(); if (message != null) { - AcknowledgmentCallback ackCallback = AckUtils.getAckCallback(message); + AcknowledgmentCallback ackCallback = StaticMessageHeaderAccessor.getAcknowledgmentCallback(message); try { handler.handleMessage(message); AckUtils.autoAck(ackCallback); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java index 01e9f2eea9..611728d62c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java @@ -27,14 +27,14 @@ import org.springframework.aop.support.AopUtils; import org.springframework.aop.support.NameMatchMethodPointcutAdvisor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.Lifecycle; +import org.springframework.integration.StaticMessageHeaderAccessor; +import org.springframework.integration.acks.AckUtils; +import org.springframework.integration.acks.AcknowledgmentCallback; import org.springframework.integration.aop.AbstractMessageSourceAdvice; import org.springframework.integration.context.ExpressionCapable; import org.springframework.integration.core.MessageSource; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.history.MessageHistory; -import org.springframework.integration.support.AckUtils; -import org.springframework.integration.support.AcknowledgmentCallback; -import org.springframework.integration.support.StaticMessageHeaderAccessor; import org.springframework.integration.support.context.NamedComponent; import org.springframework.integration.support.management.TrackableComponent; import org.springframework.integration.transaction.IntegrationResourceHolder; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java index 62900c8a78..250b873819 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java @@ -22,7 +22,7 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.Lifecycle; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.util.MessagingMethodInvokerHelper; +import org.springframework.integration.handler.support.MessagingMethodInvokerHelper; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandlingException; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java index 1167dbe999..df59ec898b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java @@ -17,8 +17,8 @@ package org.springframework.integration.handler.advice; import org.springframework.core.AttributeAccessor; +import org.springframework.integration.core.ErrorMessagePublisher; import org.springframework.integration.support.DefaultErrorMessageStrategy; -import org.springframework.integration.support.ErrorMessagePublisher; import org.springframework.integration.support.ErrorMessageStrategy; import org.springframework.integration.support.ErrorMessageUtils; import org.springframework.messaging.Message; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/HandlerMethodArgumentResolversHolder.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/support/HandlerMethodArgumentResolversHolder.java similarity index 92% rename from spring-integration-core/src/main/java/org/springframework/integration/config/HandlerMethodArgumentResolversHolder.java rename to spring-integration-core/src/main/java/org/springframework/integration/handler/support/HandlerMethodArgumentResolversHolder.java index 8c60ca975a..242a40a68d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/HandlerMethodArgumentResolversHolder.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/support/HandlerMethodArgumentResolversHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 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.config; +package org.springframework.integration.handler.support; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/support/MessagingMethodInvokerHelper.java similarity index 99% rename from spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java rename to spring-integration-core/src/main/java/org/springframework/integration/handler/support/MessagingMethodInvokerHelper.java index 2e2462d3ac..c634a6c349 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/support/MessagingMethodInvokerHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.util; +package org.springframework.integration.handler.support; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -70,15 +70,16 @@ import org.springframework.integration.annotation.Default; import org.springframework.integration.annotation.Payloads; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.annotation.UseSpelInvoker; -import org.springframework.integration.config.HandlerMethodArgumentResolversHolder; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.handler.support.CollectionArgumentResolver; -import org.springframework.integration.handler.support.MapArgumentResolver; -import org.springframework.integration.handler.support.PayloadExpressionArgumentResolver; -import org.springframework.integration.handler.support.PayloadsArgumentResolver; import org.springframework.integration.support.MutableMessage; import org.springframework.integration.support.json.JsonObjectMapper; import org.springframework.integration.support.json.JsonObjectMapperProvider; +import org.springframework.integration.util.AbstractExpressionEvaluator; +import org.springframework.integration.util.AnnotatedMethodFilter; +import org.springframework.integration.util.ClassUtils; +import org.springframework.integration.util.FixedMethodFilter; +import org.springframework.integration.util.MessagingAnnotationUtils; +import org.springframework.integration.util.UniqueMethodFilter; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessageHeaders; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagementConfigurer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagementConfigurer.java index 8a6f9d8315..d8bbcee6c0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagementConfigurer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagementConfigurer.java @@ -16,6 +16,7 @@ package org.springframework.integration.support.management; +import java.lang.reflect.Method; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -32,8 +33,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.integration.core.MessageSource; import org.springframework.integration.support.management.IntegrationManagement.ManagementOverrides; -import org.springframework.integration.support.management.micrometer.MicrometerMetricsCaptor; -import org.springframework.integration.util.PatternMatchUtils; +import org.springframework.integration.support.utils.PatternMatchUtils; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; @@ -212,9 +212,20 @@ public class IntegrationManagementConfigurer implements SmartInitializingSinglet Assert.state(this.applicationContext != null, "'applicationContext' must not be null"); Assert.state(MANAGEMENT_CONFIGURER_NAME.equals(this.beanName), getClass().getSimpleName() + " bean name must be " + MANAGEMENT_CONFIGURER_NAME); + ClassLoader classLoader = IntegrationManagementConfigurer.class.getClassLoader(); if (ClassUtils.isPresent("io.micrometer.core.instrument.MeterRegistry", - IntegrationManagementConfigurer.class.getClassLoader())) { - this.metricsCaptor = MicrometerMetricsCaptor.loadCaptor(this.applicationContext); + classLoader)) { + try { + // Use reflection to avoid a package tangle with ...management.micrometer + Class captor = ClassUtils.forName( + "org.springframework.integration.support.management.micrometer.MicrometerMetricsCaptor", + classLoader); + Method method = captor.getDeclaredMethod("loadCaptor", ApplicationContext.class); + this.metricsCaptor = (MetricsCaptor) method.invoke(null, this.applicationContext); + } + catch (Exception e) { + // no op + } } if (this.metricsCaptor != null) { injectCaptor(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleMessageSourceManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleMessageSourceManagement.java index 284d85bd6f..76b9c6a4d1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleMessageSourceManagement.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleMessageSourceManagement.java @@ -17,7 +17,6 @@ package org.springframework.integration.support.management; import org.springframework.context.Lifecycle; -import org.springframework.integration.endpoint.MessageSourceManagement; /** * An extension to {@link LifecycleMessageSourceMetrics} for sources that implement {@link MessageSourceManagement}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageSourceManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageSourceManagement.java index e4544a48b5..f928d2833f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageSourceManagement.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/LifecycleTrackableMessageSourceManagement.java @@ -17,7 +17,6 @@ package org.springframework.integration.support.management; import org.springframework.context.Lifecycle; -import org.springframework.integration.endpoint.MessageSourceManagement; /** * An extension to {@link LifecycleTrackableMessageSourceMetrics} for sources diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageSourceManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/MessageSourceManagement.java similarity index 87% rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageSourceManagement.java rename to spring-integration-core/src/main/java/org/springframework/integration/support/management/MessageSourceManagement.java index 0884a9ec07..acdc93a1fe 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageSourceManagement.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/MessageSourceManagement.java @@ -14,10 +14,8 @@ * limitations under the License. */ -package org.springframework.integration.endpoint; +package org.springframework.integration.support.management; -import org.springframework.integration.support.management.IntegrationManagedResource; -import org.springframework.integration.support.management.MessageSourceMetrics; import org.springframework.jmx.export.annotation.ManagedAttribute; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/PatternMatchUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/support/utils/PatternMatchUtils.java similarity index 97% rename from spring-integration-core/src/main/java/org/springframework/integration/util/PatternMatchUtils.java rename to spring-integration-core/src/main/java/org/springframework/integration/support/utils/PatternMatchUtils.java index 2815152e45..1fa9946202 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/PatternMatchUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/utils/PatternMatchUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.util; +package org.springframework.integration.support.utils; /** * Utility methods for pattern matching. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/StreamTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/StreamTransformer.java index f59e9224f4..acdff968cb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/StreamTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/StreamTransformer.java @@ -20,7 +20,7 @@ import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.InputStream; -import org.springframework.integration.support.StaticMessageHeaderAccessor; +import org.springframework.integration.StaticMessageHeaderAccessor; import org.springframework.messaging.Message; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index 6b29d601c1..6bb8288879 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -55,11 +55,11 @@ import org.springframework.integration.aggregator.ReleaseStrategy; import org.springframework.integration.aggregator.SimpleMessageGroupProcessor; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; +import org.springframework.integration.handler.support.MessagingMethodInvokerHelper; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.locks.LockRegistry; import org.springframework.integration.support.utils.IntegrationUtils; import org.springframework.integration.test.util.TestUtils; -import org.springframework.integration.util.MessagingMethodInvokerHelper; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageSourcePollingTemplateTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageSourcePollingTemplateTests.java index 3ae197faf8..83890c44eb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageSourcePollingTemplateTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageSourcePollingTemplateTests.java @@ -29,9 +29,9 @@ import java.util.Collections; import org.junit.Test; import org.springframework.integration.IntegrationMessageHeaderAccessor; +import org.springframework.integration.acks.AcknowledgmentCallback; +import org.springframework.integration.acks.AcknowledgmentCallback.Status; import org.springframework.integration.core.MessageSource; -import org.springframework.integration.support.AcknowledgmentCallback; -import org.springframework.integration.support.AcknowledgmentCallback.Status; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java index c3654dd7eb..59962ca172 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java @@ -73,9 +73,9 @@ import org.springframework.integration.annotation.UseSpelInvoker; import org.springframework.integration.config.EnableIntegration; import org.springframework.integration.gateway.GatewayProxyFactoryBean; import org.springframework.integration.gateway.RequestReplyExchanger; +import org.springframework.integration.handler.support.MessagingMethodInvokerHelper; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; -import org.springframework.integration.util.MessagingMethodInvokerHelper; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessageHandlingException; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java index cc693f3578..d4a32beeab 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java @@ -238,7 +238,7 @@ public abstract class RemoteFileInboundChannelAdapterSpec the type the operations accepts. - * @param the type the callback returns. - * - * @author Artem Bilan - * - * @since 5.0 - */ -@FunctionalInterface -public interface OperationsCallback { - - /** - * Execute any number of operations using a dedicated remote - * session as long as those operations are performed - * on the template argument and on the calling thread. - * The session will be closed when the callback exits. - * - * @param operations the RemoteFileOperations. - * @return the result of operations. - */ - T doInOperations(RemoteFileOperations operations); - -} diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileOperations.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileOperations.java index 51c5971717..3dd03e05c1 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileOperations.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileOperations.java @@ -167,4 +167,29 @@ public interface RemoteFileOperations { */ Session getSession(); + /** + * Callback for using the same session for multiple + * RemoteFileTemplate operations. + + * @param the type the operations accepts. + * @param the type the callback returns. + * + * @since 5.1 + */ + @FunctionalInterface + public interface OperationsCallback { + + /** + * Execute any number of operations using a dedicated remote + * session as long as those operations are performed + * on the template argument and on the calling thread. + * The session will be closed when the callback exits. + * + * @param operations the RemoteFileOperations. + * @return the result of operations. + */ + T doInOperations(RemoteFileOperations operations); + + } + } diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java index 6d75092d80..56c9c5be6e 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java @@ -34,11 +34,11 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; +import org.springframework.integration.StaticMessageHeaderAccessor; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.splitter.FileSplitter.FileMarker.Mark; import org.springframework.integration.splitter.AbstractMessageSplitter; import org.springframework.integration.support.AbstractIntegrationMessageBuilder; -import org.springframework.integration.support.StaticMessageHeaderAccessor; import org.springframework.integration.support.json.JsonObjectMapper; import org.springframework.integration.support.json.JsonObjectMapperProvider; import org.springframework.messaging.Message; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java index f068ae305c..8df56b2227 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java @@ -41,13 +41,13 @@ import org.junit.rules.ExpectedException; import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.IntegrationMessageHeaderAccessor; +import org.springframework.integration.StaticMessageHeaderAccessor; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.filters.AcceptOnceFileListFilter; import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.file.splitter.FileSplitter; -import org.springframework.integration.support.StaticMessageHeaderAccessor; import org.springframework.integration.transformer.StreamTransformer; import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java index 6fa831e009..2630c3391e 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java @@ -25,7 +25,6 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AliasFor; import org.springframework.integration.http.management.IntegrationGraphController; -import org.springframework.integration.http.support.HttpContextUtils; /** * Enables the {@link IntegrationGraphController} if diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/HttpContextUtils.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpContextUtils.java similarity index 98% rename from spring-integration-http/src/main/java/org/springframework/integration/http/support/HttpContextUtils.java rename to spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpContextUtils.java index 370fa3e8a8..21ff7e6ec9 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/HttpContextUtils.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpContextUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.http.support; +package org.springframework.integration.http.config; import java.util.HashMap; import java.util.Map; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java index 749511fc95..91c98c5f68 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.integration.config.IntegrationConfigurationInitializer; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.springframework.integration.http.inbound.IntegrationRequestMappingHandlerMapping; -import org.springframework.integration.http.support.HttpContextUtils; /** * The HTTP Integration infrastructure {@code beanFactory} initializer. diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerParser.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerParser.java index a78af6ea6a..774b8632b1 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerParser.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerParser.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.core.type.StandardAnnotationMetadata; -import org.springframework.integration.http.support.HttpContextUtils; /** * The {@link BeanDefinitionParser} for the {@code } component. diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrar.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrar.java index 9f24a65f8e..3706867b2b 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrar.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrar.java @@ -37,7 +37,6 @@ import org.springframework.core.env.MapPropertySource; import org.springframework.core.type.AnnotationMetadata; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.http.management.IntegrationGraphController; -import org.springframework.integration.http.support.HttpContextUtils; import org.springframework.integration.support.management.graph.IntegrationGraphServer; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrarImportSelector.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrarImportSelector.java index 556ab41b71..b5e4a56784 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrarImportSelector.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrarImportSelector.java @@ -21,7 +21,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.context.annotation.ImportSelector; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.integration.http.support.HttpContextUtils; /** * @author Artem Bilan diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java index a64d64f517..fdb2f1575c 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java @@ -50,7 +50,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl * elements, if there is none registered, yet. However it can be configured as a regular * bean with appropriate configuration for {@link RequestMappingHandlerMapping}. * It is recommended to have only one similar bean in the application context using the 'id' - * {@link org.springframework.integration.http.support.HttpContextUtils#HANDLER_MAPPING_BEAN_NAME}. + * {@link org.springframework.integration.http.config.HttpContextUtils#HANDLER_MAPPING_BEAN_NAME}. *

* In most cases, Spring MVC offers to configure Request Mapping via * {@code org.springframework.stereotype.Controller} and diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/management/IntegrationGraphController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/management/IntegrationGraphController.java index f6ade879ea..6ce0ba55a3 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/management/IntegrationGraphController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/management/IntegrationGraphController.java @@ -16,7 +16,7 @@ package org.springframework.integration.http.management; -import org.springframework.integration.http.support.HttpContextUtils; +import org.springframework.integration.http.config.HttpContextUtils; import org.springframework.integration.support.management.graph.Graph; import org.springframework.integration.support.management.graph.IntegrationGraphServer; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java index dbc71961d2..6e86223e78 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java @@ -48,7 +48,6 @@ import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.context.OrderlyShutdownCapable; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.endpoint.AbstractEndpoint; -import org.springframework.integration.endpoint.MessageSourceManagement; import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.handler.AbstractMessageProducingHandler; import org.springframework.integration.history.MessageHistoryConfigurer; @@ -63,13 +62,14 @@ import org.springframework.integration.support.management.LifecycleTrackableMess import org.springframework.integration.support.management.MappingMessageRouterManagement; import org.springframework.integration.support.management.MessageChannelMetrics; import org.springframework.integration.support.management.MessageHandlerMetrics; +import org.springframework.integration.support.management.MessageSourceManagement; import org.springframework.integration.support.management.MessageSourceMetrics; import org.springframework.integration.support.management.PollableChannelManagement; import org.springframework.integration.support.management.RouterMetrics; import org.springframework.integration.support.management.Statistics; import org.springframework.integration.support.management.TrackableComponent; import org.springframework.integration.support.management.TrackableRouterMetrics; -import org.springframework.integration.util.PatternMatchUtils; +import org.springframework.integration.support.utils.PatternMatchUtils; import org.springframework.jmx.export.MBeanExporter; import org.springframework.jmx.export.UnableToRegisterMBeanException; import org.springframework.jmx.export.annotation.ManagedAttribute; diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/config/WebFluxIntegrationConfigurationInitializer.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/config/WebFluxIntegrationConfigurationInitializer.java index c4e1140aac..4223619c1b 100644 --- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/config/WebFluxIntegrationConfigurationInitializer.java +++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/config/WebFluxIntegrationConfigurationInitializer.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.integration.config.IntegrationConfigurationInitializer; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; -import org.springframework.integration.http.support.HttpContextUtils; +import org.springframework.integration.http.config.HttpContextUtils; import org.springframework.integration.webflux.inbound.IntegrationHandlerResultHandler; import org.springframework.integration.webflux.inbound.WebFluxIntegrationRequestMappingHandlerMapping; import org.springframework.integration.webflux.support.WebFluxContextUtils; diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java index 7e35f7d849..cacb45fd49 100644 --- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java +++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java @@ -21,10 +21,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.integration.http.config.HttpContextUtils; import org.springframework.integration.http.inbound.BaseHttpInboundEndpoint; import org.springframework.integration.http.inbound.CrossOrigin; import org.springframework.integration.http.inbound.RequestMapping; -import org.springframework.integration.http.support.HttpContextUtils; import org.springframework.integration.webflux.support.WebFluxContextUtils; import org.springframework.util.CollectionUtils; import org.springframework.util.ReflectionUtils; diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/support/WebFluxContextUtils.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/support/WebFluxContextUtils.java index 3c694ccf73..7c5c996251 100644 --- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/support/WebFluxContextUtils.java +++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/support/WebFluxContextUtils.java @@ -16,7 +16,7 @@ package org.springframework.integration.webflux.support; -import org.springframework.integration.http.support.HttpContextUtils; +import org.springframework.integration.http.config.HttpContextUtils; /** * Utility class for accessing WebFlux integration components