From 57984c570564f26928a8b701ef68b00a3850c05f Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 4 May 2019 17:34:32 +0200 Subject: [PATCH] Move package annotation.support.reactive to annotation.reactive Aligned with invocation.reactive and transaction.reactive packages. Closes gh-22887 --- .../reactive/AbstractNamedValueMethodArgumentResolver.java | 2 +- .../reactive/ContinuationHandlerMethodArgumentResolver.java | 2 +- .../reactive/DestinationVariableMethodArgumentResolver.java | 2 +- .../{support => }/reactive/HeaderMethodArgumentResolver.java | 2 +- .../{support => }/reactive/HeadersMethodArgumentResolver.java | 2 +- .../{support => }/reactive/MessageMappingMessageHandler.java | 2 +- .../{support => }/reactive/PayloadMethodArgumentResolver.java | 2 +- .../handler/annotation/{support => }/reactive/package-info.java | 2 +- .../messaging/rsocket/RSocketMessageHandler.java | 2 +- .../DestinationVariableMethodArgumentResolverTests.java | 2 +- .../reactive/HeaderMethodArgumentResolverTests.java | 2 +- .../reactive/HeadersMethodArgumentResolverTests.java | 2 +- .../reactive/MessageMappingMessageHandlerTests.java | 2 +- .../reactive/PayloadMethodArgumentResolverTests.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/{support => }/reactive/AbstractNamedValueMethodArgumentResolver.java (99%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/{support => }/reactive/ContinuationHandlerMethodArgumentResolver.java (94%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/{support => }/reactive/DestinationVariableMethodArgumentResolver.java (97%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/{support => }/reactive/HeaderMethodArgumentResolver.java (98%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/{support => }/reactive/HeadersMethodArgumentResolver.java (97%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/{support => }/reactive/MessageMappingMessageHandler.java (99%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/{support => }/reactive/PayloadMethodArgumentResolver.java (99%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/{support => }/reactive/package-info.java (76%) rename spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/{support => }/reactive/DestinationVariableMethodArgumentResolverTests.java (97%) rename spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/{support => }/reactive/HeaderMethodArgumentResolverTests.java (98%) rename spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/{support => }/reactive/HeadersMethodArgumentResolverTests.java (98%) rename spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/{support => }/reactive/MessageMappingMessageHandlerTests.java (99%) rename spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/{support => }/reactive/PayloadMethodArgumentResolverTests.java (98%) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/AbstractNamedValueMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.java similarity index 99% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/AbstractNamedValueMethodArgumentResolver.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.java index 789c2d5020..d69572061d 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/AbstractNamedValueMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/AbstractNamedValueMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/ContinuationHandlerMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/ContinuationHandlerMethodArgumentResolver.java similarity index 94% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/ContinuationHandlerMethodArgumentResolver.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/ContinuationHandlerMethodArgumentResolver.java index 18f3132d3b..db2f7dae3a 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/ContinuationHandlerMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/ContinuationHandlerMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import reactor.core.publisher.Mono; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/DestinationVariableMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.java similarity index 97% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/DestinationVariableMethodArgumentResolver.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.java index f13063129e..6cd3f07f08 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/DestinationVariableMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.util.Map; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.java similarity index 98% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolver.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.java index ba52139e1b..0c632ee931 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.util.List; import java.util.Map; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeadersMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/HeadersMethodArgumentResolver.java similarity index 97% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeadersMethodArgumentResolver.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/HeadersMethodArgumentResolver.java index c01246ce83..3912b97ce2 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeadersMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/HeadersMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.lang.reflect.Method; import java.util.Map; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java similarity index 99% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandler.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java index e4a1bed73b..a63e0c44d5 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java similarity index 99% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolver.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java index 62fa3af05e..0dffe73b8b 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.lang.annotation.Annotation; import java.util.ArrayList; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/package-info.java similarity index 76% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/package-info.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/package-info.java index 41f18a41cd..cd1dcb8aba 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/package-info.java @@ -4,7 +4,7 @@ */ @NonNullApi @NonNullFields -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketMessageHandler.java index 485f4982c2..bf7481fe66 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketMessageHandler.java @@ -24,7 +24,7 @@ import org.springframework.core.codec.Encoder; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.MessageDeliveryException; -import org.springframework.messaging.handler.annotation.support.reactive.MessageMappingMessageHandler; +import org.springframework.messaging.handler.annotation.reactive.MessageMappingMessageHandler; import org.springframework.messaging.handler.invocation.reactive.HandlerMethodReturnValueHandler; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/DestinationVariableMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolverTests.java similarity index 97% rename from spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/DestinationVariableMethodArgumentResolverTests.java rename to spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolverTests.java index 95a394e9bf..de6ee0c93a 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/DestinationVariableMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/DestinationVariableMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.time.Duration; import java.util.HashMap; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolverTests.java similarity index 98% rename from spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolverTests.java rename to spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolverTests.java index 4efcd2cc80..ff1fb5dce6 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeaderMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.time.Duration; import java.util.List; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/HeadersMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeadersMethodArgumentResolverTests.java similarity index 98% rename from spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/HeadersMethodArgumentResolverTests.java rename to spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeadersMethodArgumentResolverTests.java index 412ff92402..3bcfe7d61f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/HeadersMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/HeadersMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.time.Duration; import java.util.Collections; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java similarity index 99% rename from spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandlerTests.java rename to spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java index 837311c403..89384014f0 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.time.Duration; import java.util.Arrays; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolverTests.java similarity index 98% rename from spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolverTests.java rename to spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolverTests.java index da82e20dea..005dc7ba33 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolverTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.messaging.handler.annotation.support.reactive; +package org.springframework.messaging.handler.annotation.reactive; import java.nio.charset.StandardCharsets; import java.time.Duration;