diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/Pausable.java b/spring-integration-core/src/main/java/org/springframework/integration/core/Pausable.java similarity index 95% rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/Pausable.java rename to spring-integration-core/src/main/java/org/springframework/integration/core/Pausable.java index 590f057946..9883648dae 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/Pausable.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/Pausable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.endpoint; +package org.springframework.integration.core; import org.springframework.context.Lifecycle; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/expression/ControlBusMethodFilter.java b/spring-integration-core/src/main/java/org/springframework/integration/expression/ControlBusMethodFilter.java index 7305d65108..f169bb3008 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/expression/ControlBusMethodFilter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/expression/ControlBusMethodFilter.java @@ -25,7 +25,7 @@ import org.springframework.core.annotation.AnnotationFilter; import org.springframework.core.annotation.MergedAnnotations; import org.springframework.core.annotation.RepeatableContainers; import org.springframework.expression.MethodFilter; -import org.springframework.integration.endpoint.Pausable; +import org.springframework.integration.core.Pausable; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.util.CustomizableThreadCreator; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java index 0106301577..c96f3796d1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java @@ -93,9 +93,9 @@ import org.springframework.integration.config.SpelFunctionFactoryBean; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.MessageSource; import org.springframework.integration.core.MessagingTemplate; +import org.springframework.integration.core.Pausable; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.MethodInvokingMessageSource; -import org.springframework.integration.endpoint.Pausable; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.expression.SpelPropertyAccessorRegistrar; import org.springframework.integration.gateway.GatewayProxyFactoryBean; diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc index 98865800f5..984556d2c5 100644 --- a/src/reference/asciidoc/whats-new.adoc +++ b/src/reference/asciidoc/whats-new.adoc @@ -12,6 +12,11 @@ If you are interested in the changes and features that were introduced in earlie If you are interested in more details, see the Issue Tracker tickets that were resolved as part of the 5.2 development process. +[[x5.2-package-clas]] +=== Package and Class Changes + +`Pausable` has been moved from `o.s.i.endpoint` to `o.s.i.core`. + [[x5.2-new-components]] === New Components