From dc57e2621cda360ca7f6e9c7ed3cfc18f75dae66 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Tue, 24 Nov 2015 18:11:44 +0100 Subject: [PATCH] Move HttpServer related classes back to src/main/java This is needed in order to be able to use Spring Reactive in standalone applications. These are temporary classes that will return in src/test/java when Spring Boot support for Reactive applications will be implemented. --- .../springframework/http/server/support}/HttpServer.java | 2 +- .../http/server/support}/HttpServerSupport.java | 2 +- .../http/server/support}/JettyHttpServer.java | 2 +- .../http/server/support}/ReactorHttpServer.java | 2 +- .../http/server/support}/RxNettyHttpServer.java | 2 +- .../http/server/support}/TomcatHttpServer.java | 2 +- .../http/server/support}/UndertowHttpServer.java | 2 +- .../springframework/http/server/support/package-info.java | 5 +++++ .../http/server/AbstractHttpHandlerIntegrationTests.java | 6 ++++++ 9 files changed, 18 insertions(+), 7 deletions(-) rename spring-web-reactive/src/{test/java/org/springframework/http/server => main/java/org/springframework/http/server/support}/HttpServer.java (95%) rename spring-web-reactive/src/{test/java/org/springframework/http/server => main/java/org/springframework/http/server/support}/HttpServerSupport.java (95%) rename spring-web-reactive/src/{test/java/org/springframework/http/server => main/java/org/springframework/http/server/support}/JettyHttpServer.java (98%) rename spring-web-reactive/src/{test/java/org/springframework/http/server => main/java/org/springframework/http/server/support}/ReactorHttpServer.java (97%) rename spring-web-reactive/src/{test/java/org/springframework/http/server => main/java/org/springframework/http/server/support}/RxNettyHttpServer.java (97%) rename spring-web-reactive/src/{test/java/org/springframework/http/server => main/java/org/springframework/http/server/support}/TomcatHttpServer.java (97%) rename spring-web-reactive/src/{test/java/org/springframework/http/server => main/java/org/springframework/http/server/support}/UndertowHttpServer.java (97%) create mode 100644 spring-web-reactive/src/main/java/org/springframework/http/server/support/package-info.java diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/HttpServer.java b/spring-web-reactive/src/main/java/org/springframework/http/server/support/HttpServer.java similarity index 95% rename from spring-web-reactive/src/test/java/org/springframework/http/server/HttpServer.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/support/HttpServer.java index 695609328f..f1510c8abe 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/HttpServer.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/support/HttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server; +package org.springframework.http.server.support; import org.springframework.beans.factory.InitializingBean; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/HttpServerSupport.java b/spring-web-reactive/src/main/java/org/springframework/http/server/support/HttpServerSupport.java similarity index 95% rename from spring-web-reactive/src/test/java/org/springframework/http/server/HttpServerSupport.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/support/HttpServerSupport.java index 8c8358d872..3510b9d610 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/HttpServerSupport.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/support/HttpServerSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server; +package org.springframework.http.server.support; import org.springframework.http.server.ReactiveHttpHandler; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/JettyHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/http/server/support/JettyHttpServer.java similarity index 98% rename from spring-web-reactive/src/test/java/org/springframework/http/server/JettyHttpServer.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/support/JettyHttpServer.java index f34221bcd3..38cc7d1a83 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/JettyHttpServer.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/support/JettyHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server; +package org.springframework.http.server.support; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/ReactorHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/http/server/support/ReactorHttpServer.java similarity index 97% rename from spring-web-reactive/src/test/java/org/springframework/http/server/ReactorHttpServer.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/support/ReactorHttpServer.java index 30e2edf75e..868f0f53a6 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/ReactorHttpServer.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/support/ReactorHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server; +package org.springframework.http.server.support; import reactor.io.buffer.Buffer; import reactor.io.net.ReactiveNet; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/RxNettyHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/http/server/support/RxNettyHttpServer.java similarity index 97% rename from spring-web-reactive/src/test/java/org/springframework/http/server/RxNettyHttpServer.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/support/RxNettyHttpServer.java index 44f3f4a228..fe0bf6323d 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/RxNettyHttpServer.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/support/RxNettyHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server; +package org.springframework.http.server.support; import io.netty.buffer.ByteBuf; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/TomcatHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/http/server/support/TomcatHttpServer.java similarity index 97% rename from spring-web-reactive/src/test/java/org/springframework/http/server/TomcatHttpServer.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/support/TomcatHttpServer.java index 2dc89f2d79..fa4d989480 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/TomcatHttpServer.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/support/TomcatHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server; +package org.springframework.http.server.support; import java.io.File; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/UndertowHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/http/server/support/UndertowHttpServer.java similarity index 97% rename from spring-web-reactive/src/test/java/org/springframework/http/server/UndertowHttpServer.java rename to spring-web-reactive/src/main/java/org/springframework/http/server/support/UndertowHttpServer.java index 6248bdb085..8a0cb5b40a 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/UndertowHttpServer.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/support/UndertowHttpServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server; +package org.springframework.http.server.support; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/support/package-info.java b/spring-web-reactive/src/main/java/org/springframework/http/server/support/package-info.java new file mode 100644 index 0000000000..f404a34927 --- /dev/null +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/support/package-info.java @@ -0,0 +1,5 @@ +/** + * This package contains temporary interfaces and classes for running embedded servers. + * They are expected to be replaced by an upcoming Spring Boot support. + */ +package org.springframework.http.server.support; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/AbstractHttpHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/AbstractHttpHandlerIntegrationTests.java index 5a53e0b496..0f75b552da 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/AbstractHttpHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/AbstractHttpHandlerIntegrationTests.java @@ -21,6 +21,12 @@ import org.junit.Before; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.springframework.http.server.support.HttpServer; +import org.springframework.http.server.support.JettyHttpServer; +import org.springframework.http.server.support.ReactorHttpServer; +import org.springframework.http.server.support.RxNettyHttpServer; +import org.springframework.http.server.support.TomcatHttpServer; +import org.springframework.http.server.support.UndertowHttpServer; import org.springframework.util.SocketUtils;