From 341f23e0e666ce0a00090fe1cad91caa7cb5e97c Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 14 Apr 2016 15:56:53 -0400 Subject: [PATCH] Add "result" package under ~.web.reactive The new package is parallel to the "mvc" package under spring-webmvc and a place to hold the various programming model styles. --- .../http/client/reactive/package-info.java | 16 --------------- .../web/reactive/handler/package-info.java | 19 ++---------------- .../method/annotation/package-info.java | 20 ------------------- .../web/reactive/method/package-info.java | 20 ------------------- .../web/reactive/package-info.java | 18 +---------------- .../SimpleResultHandler.java | 2 +- .../WebHandlerHandlerAdapter.java | 4 +--- .../method/HandlerMethodArgumentResolver.java | 2 +- .../method/InvocableHandlerMethod.java | 2 +- .../annotation/ModelArgumentResolver.java | 4 ++-- .../RequestBodyArgumentResolver.java | 4 ++-- .../RequestMappingHandlerAdapter.java | 6 +++--- .../RequestMappingHandlerMapping.java | 2 +- .../RequestParamArgumentResolver.java | 4 ++-- .../annotation/ResponseBodyResultHandler.java | 2 +- .../method/annotation/package-info.java | 4 ++++ .../reactive/result/method/package-info.java | 4 ++++ .../web/reactive/result/package-info.java | 4 ++++ .../core/codec/support/jaxb/package-info.java | 16 --------------- .../reactive/DispatcherHandlerErrorTests.java | 6 +++--- .../SimpleResultHandlerTests.java | 3 ++- .../WebHandlerIntegrationTests.java | 5 ++++- .../method/InvocableHandlerMethodTests.java | 4 ++-- .../RequestMappingHandlerMappingTests.java | 2 +- .../RequestMappingIntegrationTests.java | 4 ++-- .../ResponseBodyResultHandlerTests.java | 2 +- 26 files changed, 45 insertions(+), 134 deletions(-) delete mode 100644 spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/package-info.java delete mode 100644 spring-web-reactive/src/main/java/org/springframework/web/reactive/method/package-info.java rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{handler => result}/SimpleResultHandler.java (98%) rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{handler => result}/WebHandlerHandlerAdapter.java (92%) rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{ => result}/method/HandlerMethodArgumentResolver.java (96%) rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{ => result}/method/InvocableHandlerMethod.java (99%) rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{ => result}/method/annotation/ModelArgumentResolver.java (89%) rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{ => result}/method/annotation/RequestBodyArgumentResolver.java (95%) rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{ => result}/method/annotation/RequestMappingHandlerAdapter.java (96%) rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{ => result}/method/annotation/RequestMappingHandlerMapping.java (98%) rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{ => result}/method/annotation/RequestParamArgumentResolver.java (92%) rename spring-web-reactive/src/main/java/org/springframework/web/reactive/{ => result}/method/annotation/ResponseBodyResultHandler.java (99%) create mode 100644 spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java create mode 100644 spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/package-info.java create mode 100644 spring-web-reactive/src/main/java/org/springframework/web/reactive/result/package-info.java rename spring-web-reactive/src/test/java/org/springframework/web/reactive/{handler => result}/SimpleResultHandlerTests.java (97%) rename spring-web-reactive/src/test/java/org/springframework/web/reactive/{handler => result}/WebHandlerIntegrationTests.java (95%) rename spring-web-reactive/src/test/java/org/springframework/web/reactive/{ => result}/method/InvocableHandlerMethodTests.java (98%) rename spring-web-reactive/src/test/java/org/springframework/web/reactive/{ => result}/method/annotation/RequestMappingHandlerMappingTests.java (98%) rename spring-web-reactive/src/test/java/org/springframework/web/reactive/{ => result}/method/annotation/RequestMappingIntegrationTests.java (99%) rename spring-web-reactive/src/test/java/org/springframework/web/reactive/{ => result}/method/annotation/ResponseBodyResultHandlerTests.java (97%) diff --git a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/package-info.java b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/package-info.java index 64e63d30de..99f7e54bb6 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/package-info.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/package-info.java @@ -1,19 +1,3 @@ -/* - * Copyright 2002-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /** * Core package of the reactive client HTTP support. * Provides {@link org.springframework.http.client.reactive.ClientHttpRequest} diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/package-info.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/package-info.java index 9e6c1eba58..7de0c290e4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/package-info.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/package-info.java @@ -1,20 +1,5 @@ -/* - * Copyright 2002-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /** - * Provides reactive HandlerMapping implementations. + * Provides standard HandlerMapping implementations, + * including abstract base classes for custom implementations. */ package org.springframework.web.reactive.handler; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/package-info.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/package-info.java deleted file mode 100644 index cd65a7ee26..0000000000 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2002-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Reactive infrastructure for annotation-based handler method processing. - */ -package org.springframework.web.reactive.method.annotation; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/package-info.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/package-info.java deleted file mode 100644 index 96a7727322..0000000000 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2002-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Reactive infrastructure for handler method processing. - */ -package org.springframework.web.reactive.method; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/package-info.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/package-info.java index 9ec7eabc9a..92e4457779 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/package-info.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/package-info.java @@ -1,20 +1,4 @@ -/* - * Copyright 2002-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /** - * Provides the core interfaces and classes for the Spring web reactive framework. + * Core interfaces and classes for Spring Web Reactive. */ package org.springframework.web.reactive; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/SimpleResultHandler.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleResultHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/SimpleResultHandler.java index e8b56e4ce1..447147e7c3 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/SimpleResultHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.web.reactive.result; import java.util.Optional; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/WebHandlerHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/WebHandlerHandlerAdapter.java similarity index 92% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/WebHandlerHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/WebHandlerHandlerAdapter.java index 1dfec138e9..c9f8932eb4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/WebHandlerHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/WebHandlerHandlerAdapter.java @@ -14,14 +14,12 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.web.reactive.result; import org.reactivestreams.Publisher; import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; -import org.springframework.ui.ExtendedModelMap; -import org.springframework.ui.ModelMap; import org.springframework.web.reactive.DispatcherHandler; import org.springframework.web.reactive.HandlerAdapter; import org.springframework.web.reactive.HandlerResult; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolver.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolver.java index 2c2e7c0c72..2876124e93 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.method; +package org.springframework.web.reactive.result.method; import reactor.core.publisher.Mono; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java similarity index 99% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java index 860995a962..fc63515005 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.method; +package org.springframework.web.reactive.result.method; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ModelArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelArgumentResolver.java similarity index 89% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ModelArgumentResolver.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelArgumentResolver.java index 9365172f87..dbcd43b3d6 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ModelArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelArgumentResolver.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.web.reactive.method.annotation; +package org.springframework.web.reactive.result.method.annotation; import reactor.core.publisher.Mono; import org.springframework.core.MethodParameter; import org.springframework.ui.Model; import org.springframework.ui.ModelMap; -import org.springframework.web.reactive.method.HandlerMethodArgumentResolver; +import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver; import org.springframework.web.server.ServerWebExchange; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java similarity index 95% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java index c39aa0da50..216a62cc4c 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.method.annotation; +package org.springframework.web.reactive.result.method.annotation; import java.util.List; @@ -31,7 +31,7 @@ import org.springframework.http.MediaType; import org.springframework.ui.ModelMap; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.reactive.method.HandlerMethodArgumentResolver; +import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver; import org.springframework.web.server.ServerWebExchange; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java similarity index 96% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java index 4f369a6577..e906bf7a83 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.method.annotation; +package org.springframework.web.reactive.result.method.annotation; import java.lang.reflect.Method; import java.util.ArrayList; @@ -45,8 +45,8 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.annotation.ExceptionHandlerMethodResolver; import org.springframework.web.reactive.HandlerAdapter; import org.springframework.web.reactive.HandlerResult; -import org.springframework.web.reactive.method.HandlerMethodArgumentResolver; -import org.springframework.web.reactive.method.InvocableHandlerMethod; +import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver; +import org.springframework.web.reactive.result.method.InvocableHandlerMethod; import org.springframework.web.server.ServerWebExchange; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java similarity index 98% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java index d2d86dc76c..e6861bd8c2 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.method.annotation; +package org.springframework.web.reactive.result.method.annotation; import java.util.Arrays; import java.util.Collection; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamArgumentResolver.java similarity index 92% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamArgumentResolver.java index 8eceba031f..b518e3f628 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamArgumentResolver.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.web.reactive.method.annotation; +package org.springframework.web.reactive.result.method.annotation; import reactor.core.publisher.Mono; import org.springframework.core.MethodParameter; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.reactive.method.HandlerMethodArgumentResolver; +import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java similarity index 99% rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java index 10f4470754..e0b5c2fdb8 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.method.annotation; +package org.springframework.web.reactive.result.method.annotation; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java new file mode 100644 index 0000000000..eee90dcffd --- /dev/null +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java @@ -0,0 +1,4 @@ +/** + * Infrastructure for annotation-based handler method processing. + */ +package org.springframework.web.reactive.result.method.annotation; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/package-info.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/package-info.java new file mode 100644 index 0000000000..9761f929e6 --- /dev/null +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/package-info.java @@ -0,0 +1,4 @@ +/** + * Infrastructure for handler method processing. + */ +package org.springframework.web.reactive.result.method; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/package-info.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/package-info.java new file mode 100644 index 0000000000..3c4228f0fd --- /dev/null +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/package-info.java @@ -0,0 +1,4 @@ +/** + * Provides various controller styles for request handling. + */ +package org.springframework.web.reactive.result; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/jaxb/package-info.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/support/jaxb/package-info.java index 0500a2aae5..e02f2405c1 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/support/jaxb/package-info.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/support/jaxb/package-info.java @@ -1,18 +1,2 @@ -/* - * Copyright 2002-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - @javax.xml.bind.annotation.XmlSchema(namespace = "namespace") package org.springframework.core.codec.support.jaxb; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java index 92617fda03..99b99b004b 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java @@ -46,9 +46,9 @@ import org.springframework.web.ResponseStatusException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.reactive.method.annotation.RequestMappingHandlerAdapter; -import org.springframework.web.reactive.method.annotation.RequestMappingHandlerMapping; -import org.springframework.web.reactive.method.annotation.ResponseBodyResultHandler; +import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerAdapter; +import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping; +import org.springframework.web.reactive.result.method.annotation.ResponseBodyResultHandler; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebExceptionHandler; import org.springframework.web.server.WebFilter; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleResultHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/SimpleResultHandlerTests.java similarity index 97% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleResultHandlerTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/result/SimpleResultHandlerTests.java index 9a94d4c2ee..c58f189ca5 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleResultHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/SimpleResultHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.web.reactive.result; import java.util.concurrent.CompletableFuture; @@ -29,6 +29,7 @@ import org.springframework.core.convert.support.ReactiveStreamsToCompletableFutu import org.springframework.core.convert.support.ReactiveStreamsToRxJava1Converter; import org.springframework.web.method.HandlerMethod; import org.springframework.web.reactive.HandlerResult; +import org.springframework.web.reactive.result.SimpleResultHandler; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/WebHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/WebHandlerIntegrationTests.java similarity index 95% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/WebHandlerIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/result/WebHandlerIntegrationTests.java index c6c8f1747a..49d4aa1e26 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/WebHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/WebHandlerIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.handler; +package org.springframework.web.reactive.result; import java.net.URI; import java.nio.charset.Charset; @@ -38,6 +38,9 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import org.springframework.web.reactive.DispatcherHandler; import org.springframework.web.reactive.ResponseStatusExceptionHandler; +import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping; +import org.springframework.web.reactive.result.SimpleResultHandler; +import org.springframework.web.reactive.result.WebHandlerHandlerAdapter; import org.springframework.web.server.WebHandler; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.adapter.WebHttpHandlerBuilder; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java similarity index 98% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java index cf4b5da07a..3d9ae0bbef 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.web.reactive.method; +package org.springframework.web.reactive.result.method; import java.lang.reflect.Method; import java.net.URI; @@ -35,7 +35,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.method.HandlerMethod; import org.springframework.web.reactive.HandlerResult; -import org.springframework.web.reactive.method.annotation.RequestParamArgumentResolver; +import org.springframework.web.reactive.result.method.annotation.RequestParamArgumentResolver; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.adapter.DefaultServerWebExchange; import org.springframework.web.server.session.WebSessionManager; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java similarity index 98% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java index d29d0d7f2e..d9bba5aefb 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.method.annotation; +package org.springframework.web.reactive.result.method.annotation; import java.net.URI; import java.util.List; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java similarity index 99% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java index 58bb05524e..66d595e495 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.method.annotation; +package org.springframework.web.reactive.result.method.annotation; import java.net.URI; import java.nio.ByteBuffer; @@ -67,7 +67,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; import org.springframework.web.reactive.DispatcherHandler; import org.springframework.web.reactive.ViewResolver; -import org.springframework.web.reactive.handler.SimpleResultHandler; +import org.springframework.web.reactive.result.SimpleResultHandler; import org.springframework.web.reactive.view.ViewResolverResultHandler; import org.springframework.web.reactive.view.freemarker.FreeMarkerConfigurer; import org.springframework.web.reactive.view.freemarker.FreeMarkerViewResolver; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java similarity index 97% rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandlerTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java index 8216843c3f..f290593a8d 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.reactive.method.annotation; +package org.springframework.web.reactive.result.method.annotation; import java.util.Collections;