From df7ab9d99ed7db673360ca8d57b42366726cc624 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Sun, 22 Oct 2017 21:16:10 -0500 Subject: [PATCH] Package tangles for Reactive Configuration Fixes gh-900 --- .../annotation/web/server}/EnableSpringWebSession.java | 2 +- .../annotation/web/server}/SpringWebSessionConfiguration.java | 4 +++- .../session/SpringWebSessionConfigurationTests.java | 1 + .../annotation/web/reactor/EnableRedisReactorSession.java | 2 +- .../web/reactor/RedisReactorSessionConfiguration.java | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) rename spring-session-core/src/main/java/org/springframework/session/{ => config/annotation/web/server}/EnableSpringWebSession.java (96%) rename spring-session-core/src/main/java/org/springframework/session/{ => config/annotation/web/server}/SpringWebSessionConfiguration.java (93%) diff --git a/spring-session-core/src/main/java/org/springframework/session/EnableSpringWebSession.java b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/EnableSpringWebSession.java similarity index 96% rename from spring-session-core/src/main/java/org/springframework/session/EnableSpringWebSession.java rename to spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/EnableSpringWebSession.java index ede6b0a1..93bb0ed6 100644 --- a/spring-session-core/src/main/java/org/springframework/session/EnableSpringWebSession.java +++ b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/EnableSpringWebSession.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.session; +package org.springframework.session.config.annotation.web.server; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/spring-session-core/src/main/java/org/springframework/session/SpringWebSessionConfiguration.java b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/SpringWebSessionConfiguration.java similarity index 93% rename from spring-session-core/src/main/java/org/springframework/session/SpringWebSessionConfiguration.java rename to spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/SpringWebSessionConfiguration.java index 606bd970..3cae1f46 100644 --- a/spring-session-core/src/main/java/org/springframework/session/SpringWebSessionConfiguration.java +++ b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/SpringWebSessionConfiguration.java @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.session; +package org.springframework.session.config.annotation.web.server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.session.ReactorSessionRepository; +import org.springframework.session.Session; import org.springframework.session.web.server.session.SpringSessionWebSessionStore; import org.springframework.web.server.adapter.WebHttpHandlerBuilder; import org.springframework.web.server.session.DefaultWebSessionManager; diff --git a/spring-session-core/src/test/java/org/springframework/session/SpringWebSessionConfigurationTests.java b/spring-session-core/src/test/java/org/springframework/session/SpringWebSessionConfigurationTests.java index 4ed447dd..080cb172 100644 --- a/spring-session-core/src/test/java/org/springframework/session/SpringWebSessionConfigurationTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/SpringWebSessionConfigurationTests.java @@ -24,6 +24,7 @@ import org.junit.Test; import org.springframework.beans.factory.UnsatisfiedDependencyException; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; +import org.springframework.session.config.annotation.web.server.EnableSpringWebSession; import org.springframework.web.server.adapter.WebHttpHandlerBuilder; import org.springframework.web.server.session.CookieWebSessionIdResolver; import org.springframework.web.server.session.DefaultWebSessionManager; 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/reactor/EnableRedisReactorSession.java index 0cb1df5c..cb714a06 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/reactor/EnableRedisReactorSession.java @@ -23,9 +23,9 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory; -import org.springframework.session.EnableSpringWebSession; import org.springframework.session.ReactorSessionRepository; import org.springframework.session.Session; +import org.springframework.session.config.annotation.web.server.EnableSpringWebSession; import org.springframework.session.data.redis.RedisFlushMode; /** 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/reactor/RedisReactorSessionConfiguration.java index b33d2174..d1f1d594 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/reactor/RedisReactorSessionConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -import org.springframework.session.SpringWebSessionConfiguration; +import org.springframework.session.config.annotation.web.server.SpringWebSessionConfiguration; import org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository; import org.springframework.session.data.redis.RedisFlushMode; import org.springframework.util.Assert;