From 6cfa975b29effc3719c04c5b206005b5c2c934d1 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Sun, 22 Oct 2017 22:36:13 -0500 Subject: [PATCH] Move Redis Reactive Configuration Renaming the package to better align with WebSession pacakge structure Fixes gh-901 --- .../webflux/src/main/java/sample/HelloWebfluxSessionConfig.java | 2 +- .../redis/ReactiveRedisOperationsSessionRepositoryITests.java | 2 +- .../web/{reactor => server}/EnableRedisReactorSession.java | 2 +- .../{reactor => server}/RedisReactorSessionConfiguration.java | 2 +- .../RedisReactorSessionConfigurationTests.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/{reactor => server}/EnableRedisReactorSession.java (99%) rename spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/{reactor => server}/RedisReactorSessionConfiguration.java (99%) rename spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/{reactor => server}/RedisReactorSessionConfigurationTests.java (99%) diff --git a/samples/javaconfig/webflux/src/main/java/sample/HelloWebfluxSessionConfig.java b/samples/javaconfig/webflux/src/main/java/sample/HelloWebfluxSessionConfig.java index f1e57baa..5fed6d89 100644 --- a/samples/javaconfig/webflux/src/main/java/sample/HelloWebfluxSessionConfig.java +++ b/samples/javaconfig/webflux/src/main/java/sample/HelloWebfluxSessionConfig.java @@ -19,7 +19,7 @@ package sample; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; -import org.springframework.session.data.redis.config.annotation.web.reactor.EnableRedisReactorSession; +import org.springframework.session.data.redis.config.annotation.web.server.EnableRedisReactorSession; @Import(EmbeddedRedisConfig.class) // tag::class[] diff --git a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepositoryITests.java b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepositoryITests.java index 9906f5e5..df9a440b 100644 --- a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepositoryITests.java +++ b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepositoryITests.java @@ -22,7 +22,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.session.Session; -import org.springframework.session.data.redis.config.annotation.web.reactor.EnableRedisReactorSession; +import org.springframework.session.data.redis.config.annotation.web.server.EnableRedisReactorSession; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/reactor/EnableRedisReactorSession.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/EnableRedisReactorSession.java similarity index 99% rename from spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/reactor/EnableRedisReactorSession.java rename to spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/EnableRedisReactorSession.java index cb714a06..71ab2b35 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/reactor/EnableRedisReactorSession.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/EnableRedisReactorSession.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.redis.config.annotation.web.reactor; +package org.springframework.session.data.redis.config.annotation.web.server; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/reactor/RedisReactorSessionConfiguration.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/RedisReactorSessionConfiguration.java similarity index 99% rename from spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/reactor/RedisReactorSessionConfiguration.java rename to spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/RedisReactorSessionConfiguration.java index d1f1d594..f3c91e35 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/reactor/RedisReactorSessionConfiguration.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/RedisReactorSessionConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.redis.config.annotation.web.reactor; +package org.springframework.session.data.redis.config.annotation.web.server; import java.util.Map; diff --git a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/reactor/RedisReactorSessionConfigurationTests.java b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/server/RedisReactorSessionConfigurationTests.java similarity index 99% rename from spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/reactor/RedisReactorSessionConfigurationTests.java rename to spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/server/RedisReactorSessionConfigurationTests.java index ac56a016..9bfb2d75 100644 --- a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/reactor/RedisReactorSessionConfigurationTests.java +++ b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/server/RedisReactorSessionConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.redis.config.annotation.web.reactor; +package org.springframework.session.data.redis.config.annotation.web.server; import org.junit.After; import org.junit.Before;