From d9c7f42b4cce7111df5ee2d9d592462fa5ac1e00 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 17 May 2017 15:33:38 -0500 Subject: [PATCH] Rename Application->HelloWebFluxApplication --- ...{SecurityTests.java => HelloWebfluxApplicationITests.java} | 4 ++-- .../src/integration-test/java/sample/UserRepositoryTests.java | 2 +- .../sample/{Application.java => HelloWebfluxApplication.java} | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename samples/javaconfig/hellowebflux/src/integration-test/java/sample/{SecurityTests.java => HelloWebfluxApplicationITests.java} (98%) rename samples/javaconfig/hellowebflux/src/main/java/sample/{Application.java => HelloWebfluxApplication.java} (97%) diff --git a/samples/javaconfig/hellowebflux/src/integration-test/java/sample/SecurityTests.java b/samples/javaconfig/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java similarity index 98% rename from samples/javaconfig/hellowebflux/src/integration-test/java/sample/SecurityTests.java rename to samples/javaconfig/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java index 4ad395f119..1b11efc5f4 100644 --- a/samples/javaconfig/hellowebflux/src/integration-test/java/sample/SecurityTests.java +++ b/samples/javaconfig/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java @@ -40,9 +40,9 @@ import static org.springframework.web.reactive.function.client.ExchangeFilterFun * @since 5.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(classes = Application.class) +@ContextConfiguration(classes = HelloWebfluxApplication.class) @TestPropertySource(properties = "server.port=0") -public class SecurityTests { +public class HelloWebfluxApplicationITests { @Value("#{@nettyContext.address().getPort()}") int port; diff --git a/samples/javaconfig/hellowebflux/src/integration-test/java/sample/UserRepositoryTests.java b/samples/javaconfig/hellowebflux/src/integration-test/java/sample/UserRepositoryTests.java index f77c7fefa9..7bb63bf49f 100644 --- a/samples/javaconfig/hellowebflux/src/integration-test/java/sample/UserRepositoryTests.java +++ b/samples/javaconfig/hellowebflux/src/integration-test/java/sample/UserRepositoryTests.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @SuppressWarnings("unused") @RunWith(SpringRunner.class) -@ContextConfiguration(classes = Application.class) +@ContextConfiguration(classes = HelloWebfluxApplication.class) @TestPropertySource(properties = "server.port=0") public class UserRepositoryTests { diff --git a/samples/javaconfig/hellowebflux/src/main/java/sample/Application.java b/samples/javaconfig/hellowebflux/src/main/java/sample/HelloWebfluxApplication.java similarity index 97% rename from samples/javaconfig/hellowebflux/src/main/java/sample/Application.java rename to samples/javaconfig/hellowebflux/src/main/java/sample/HelloWebfluxApplication.java index 6b2d40eee9..12d48f5263 100644 --- a/samples/javaconfig/hellowebflux/src/main/java/sample/Application.java +++ b/samples/javaconfig/hellowebflux/src/main/java/sample/HelloWebfluxApplication.java @@ -53,7 +53,7 @@ import static org.springframework.security.config.web.server.HttpSecurity.http; @Configuration @EnableWebFlux @ComponentScan -public class Application implements WebFluxConfigurer { +public class HelloWebfluxApplication implements WebFluxConfigurer { @Value("${server.port:8080}") private int port = 8080; @@ -61,7 +61,7 @@ public class Application implements WebFluxConfigurer { private ReactiveAdapterRegistry adapterRegistry = new ReactiveAdapterRegistry(); public static void main(String[] args) throws Exception { - try(AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Application.class)) { + try(AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(HelloWebfluxApplication.class)) { context.getBean(NettyContext.class).onClose().block(); } }