diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractClassLoaderTest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractClassLoaderTest.java similarity index 92% rename from spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractClassLoaderTest.java rename to spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractClassLoaderTest.java index 81ba6530..e3138ccc 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractClassLoaderTest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractClassLoaderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.mongo.integration; +package org.springframework.session.data.mongo; import java.lang.reflect.Field; @@ -25,8 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.core.serializer.DefaultDeserializer; import org.springframework.core.serializer.support.DeserializingConverter; -import org.springframework.session.data.mongo.AbstractMongoSessionConverter; -import org.springframework.session.data.mongo.JdkMongoSessionConverter; import org.springframework.util.ReflectionUtils; /** diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractITest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractITest.java similarity index 94% rename from spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractITest.java rename to spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractITest.java index 26be00db..450084b5 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractITest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractITest.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2022 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.mongo.integration; +package org.springframework.session.data.mongo; import java.util.UUID; diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractMongoRepositoryITest.java similarity index 98% rename from spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java rename to spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractMongoRepositoryITest.java index b2ec99bc..46364a26 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/AbstractMongoRepositoryITest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.mongo.integration; +package org.springframework.session.data.mongo; import java.time.Duration; import java.time.Instant; @@ -37,8 +37,6 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.session.FindByIndexNameSessionRepository; import org.springframework.session.Session; -import org.springframework.session.data.mongo.MongoIndexedSessionRepository; -import org.springframework.session.data.mongo.MongoSession; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoDbDeleteJacksonSessionVerificationTest.java similarity index 96% rename from spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java rename to spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoDbDeleteJacksonSessionVerificationTest.java index 7b0364b6..8e397340 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoDbDeleteJacksonSessionVerificationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.mongo.integration; +package org.springframework.session.data.mongo; import java.net.URI; @@ -41,8 +41,6 @@ import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; import org.springframework.security.core.userdetails.User; import org.springframework.security.web.server.SecurityWebFilterChain; -import org.springframework.session.data.mongo.AbstractMongoSessionConverter; -import org.springframework.session.data.mongo.JacksonMongoSessionConverter; import org.springframework.session.data.mongo.config.annotation.web.reactive.EnableMongoWebSession; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoDbLogoutVerificationTest.java similarity index 99% rename from spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java rename to spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoDbLogoutVerificationTest.java index dd4aa511..17fb4eac 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoDbLogoutVerificationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.mongo.integration; +package org.springframework.session.data.mongo; import java.net.URI; diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJacksonITest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoRepositoryJacksonITest.java similarity index 86% rename from spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJacksonITest.java rename to spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoRepositoryJacksonITest.java index f4a2d0be..d94db319 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJacksonITest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoRepositoryJacksonITest.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2022 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.mongo.integration; +package org.springframework.session.data.mongo; import java.util.Collections; import java.util.Map; @@ -25,9 +25,6 @@ import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.geo.GeoModule; -import org.springframework.session.data.mongo.AbstractMongoSessionConverter; -import org.springframework.session.data.mongo.JacksonMongoSessionConverter; -import org.springframework.session.data.mongo.MongoSession; import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJdkSerializationITest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoRepositoryJdkSerializationITest.java similarity index 89% rename from spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJdkSerializationITest.java rename to spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoRepositoryJdkSerializationITest.java index a92f5151..01ee64d2 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoRepositoryJdkSerializationITest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/MongoRepositoryJdkSerializationITest.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2022 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.session.data.mongo.integration; +package org.springframework.session.data.mongo; import java.time.Duration; import java.util.Map; @@ -23,9 +23,6 @@ import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.session.data.mongo.AbstractMongoSessionConverter; -import org.springframework.session.data.mongo.JdkMongoSessionConverter; -import org.springframework.session.data.mongo.MongoSession; import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/AbstractMongoSessionConverter.java b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/AbstractMongoSessionConverter.java index da1047ed..0e68f940 100644 --- a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/AbstractMongoSessionConverter.java +++ b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/AbstractMongoSessionConverter.java @@ -36,6 +36,7 @@ import org.springframework.session.DelegatingIndexResolver; import org.springframework.session.FindByIndexNameSessionRepository; import org.springframework.session.IndexResolver; import org.springframework.session.PrincipalNameIndexResolver; +import org.springframework.session.Session; import org.springframework.util.Assert; /** @@ -55,8 +56,7 @@ public abstract class AbstractMongoSessionConverter implements GenericConverter private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT"; - private IndexResolver indexResolver = new DelegatingIndexResolver<>( - new PrincipalNameIndexResolver<>()); + private IndexResolver indexResolver = new DelegatingIndexResolver<>(new PrincipalNameIndexResolver<>()); /** * Returns query to be executed to return sessions based on a particular index. @@ -123,7 +123,7 @@ public abstract class AbstractMongoSessionConverter implements GenericConverter protected abstract MongoSession convert(Document sessionWrapper); - public void setIndexResolver(IndexResolver indexResolver) { + public void setIndexResolver(IndexResolver indexResolver) { Assert.notNull(indexResolver, "indexResolver must not be null"); this.indexResolver = indexResolver; } diff --git a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoSession.java b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoSession.java index 47a506b1..39a47ffc 100644 --- a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoSession.java +++ b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoSession.java @@ -37,7 +37,7 @@ import org.springframework.session.Session; * @author Greg Turnquist * @since 1.2 */ -public class MongoSession implements Session { +class MongoSession implements Session { /** * Mongo doesn't support {@literal dot} in field names. We replace it with a unicode @@ -66,15 +66,15 @@ public class MongoSession implements Session { private Map attrs = new HashMap<>(); - public MongoSession() { + MongoSession() { this(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS); } - public MongoSession(long maxInactiveIntervalInSeconds) { + MongoSession(long maxInactiveIntervalInSeconds) { this(UUID.randomUUID().toString(), maxInactiveIntervalInSeconds); } - public MongoSession(String id, long maxInactiveIntervalInSeconds) { + MongoSession(String id, long maxInactiveIntervalInSeconds) { this.id = id; this.originalSessionId = id; @@ -130,7 +130,7 @@ public class MongoSession implements Session { return Instant.ofEpochMilli(this.createdMillis); } - public void setCreationTime(long created) { + void setCreationTime(long created) { this.createdMillis = created; } @@ -184,11 +184,11 @@ public class MongoSession implements Session { return this.id; } - public Date getExpireAt() { + Date getExpireAt() { return this.expireAt; } - public void setExpireAt(final Date expireAt) { + void setExpireAt(final Date expireAt) { this.expireAt = expireAt; } diff --git a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java index 8fcdad95..3a920d05 100644 --- a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java +++ b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java @@ -35,12 +35,12 @@ import org.springframework.core.type.AnnotationMetadata; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.session.IndexResolver; import org.springframework.session.MapSession; +import org.springframework.session.Session; import org.springframework.session.config.SessionRepositoryCustomizer; import org.springframework.session.config.annotation.web.http.SpringHttpSessionConfiguration; import org.springframework.session.data.mongo.AbstractMongoSessionConverter; import org.springframework.session.data.mongo.JdkMongoSessionConverter; import org.springframework.session.data.mongo.MongoIndexedSessionRepository; -import org.springframework.session.data.mongo.MongoSession; import org.springframework.util.StringUtils; import org.springframework.util.StringValueResolver; @@ -68,7 +68,7 @@ public class MongoHttpSessionConfiguration implements BeanClassLoaderAware, Embe private ClassLoader classLoader; - private IndexResolver indexResolver; + private IndexResolver indexResolver; @Bean public MongoIndexedSessionRepository mongoSessionRepository(MongoOperations mongoOperations) { @@ -156,7 +156,7 @@ public class MongoHttpSessionConfiguration implements BeanClassLoaderAware, Embe } @Autowired(required = false) - public void setIndexResolver(IndexResolver indexResolver) { + public void setIndexResolver(IndexResolver indexResolver) { this.indexResolver = indexResolver; } diff --git a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfiguration.java b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfiguration.java index b824832a..197d599a 100644 --- a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfiguration.java +++ b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfiguration.java @@ -36,11 +36,11 @@ import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.ReactiveMongoOperations; import org.springframework.session.IndexResolver; import org.springframework.session.MapSession; +import org.springframework.session.Session; import org.springframework.session.config.ReactiveSessionRepositoryCustomizer; import org.springframework.session.config.annotation.web.server.SpringWebSessionConfiguration; import org.springframework.session.data.mongo.AbstractMongoSessionConverter; import org.springframework.session.data.mongo.JdkMongoSessionConverter; -import org.springframework.session.data.mongo.MongoSession; import org.springframework.session.data.mongo.ReactiveMongoSessionRepository; import org.springframework.util.StringUtils; import org.springframework.util.StringValueResolver; @@ -72,7 +72,7 @@ public class ReactiveMongoWebSessionConfiguration private ClassLoader classLoader; - private IndexResolver indexResolver; + private IndexResolver indexResolver; @Bean public ReactiveMongoSessionRepository reactiveMongoSessionRepository(ReactiveMongoOperations operations) { @@ -176,7 +176,7 @@ public class ReactiveMongoWebSessionConfiguration } @Autowired(required = false) - public void setIndexResolver(IndexResolver indexResolver) { + public void setIndexResolver(IndexResolver indexResolver) { this.indexResolver = indexResolver; } diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java index 3f807fe5..6612628d 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java @@ -33,11 +33,11 @@ import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.index.IndexOperations; import org.springframework.mock.env.MockEnvironment; import org.springframework.session.IndexResolver; +import org.springframework.session.Session; import org.springframework.session.config.SessionRepositoryCustomizer; import org.springframework.session.data.mongo.AbstractMongoSessionConverter; import org.springframework.session.data.mongo.JacksonMongoSessionConverter; import org.springframework.session.data.mongo.MongoIndexedSessionRepository; -import org.springframework.session.data.mongo.MongoSession; import org.springframework.test.util.ReflectionTestUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -170,7 +170,7 @@ public class MongoHttpSessionConfigurationTest { CustomIndexResolverConfigurationWithDefaultMongoSessionConverter.class); MongoIndexedSessionRepository repository = this.context.getBean(MongoIndexedSessionRepository.class); - IndexResolver indexResolver = this.context.getBean(IndexResolver.class); + IndexResolver indexResolver = this.context.getBean(IndexResolver.class); assertThat(repository).isNotNull(); assertThat(indexResolver).isNotNull(); @@ -185,7 +185,7 @@ public class MongoHttpSessionConfigurationTest { CustomIndexResolverConfigurationWithProvidedMongoSessionConverter.class); MongoIndexedSessionRepository repository = this.context.getBean(MongoIndexedSessionRepository.class); - IndexResolver indexResolver = this.context.getBean(IndexResolver.class); + IndexResolver indexResolver = this.context.getBean(IndexResolver.class); assertThat(repository).isNotNull(); assertThat(indexResolver).isNotNull(); @@ -316,7 +316,7 @@ public class MongoHttpSessionConfigurationTest { @Bean @SuppressWarnings("unchecked") - IndexResolver indexResolver() { + IndexResolver indexResolver() { return mock(IndexResolver.class); } @@ -333,7 +333,7 @@ public class MongoHttpSessionConfigurationTest { @Bean @SuppressWarnings("unchecked") - IndexResolver indexResolver() { + IndexResolver indexResolver() { return mock(IndexResolver.class); } diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java index e20d0805..46f2029d 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java @@ -34,12 +34,12 @@ import org.springframework.data.mongodb.core.ReactiveMongoOperations; import org.springframework.data.mongodb.core.index.IndexOperations; import org.springframework.session.IndexResolver; import org.springframework.session.ReactiveSessionRepository; +import org.springframework.session.Session; import org.springframework.session.config.ReactiveSessionRepositoryCustomizer; import org.springframework.session.config.annotation.web.server.EnableSpringWebSession; import org.springframework.session.data.mongo.AbstractMongoSessionConverter; import org.springframework.session.data.mongo.JacksonMongoSessionConverter; import org.springframework.session.data.mongo.JdkMongoSessionConverter; -import org.springframework.session.data.mongo.MongoSession; import org.springframework.session.data.mongo.ReactiveMongoSessionRepository; import org.springframework.util.ReflectionUtils; import org.springframework.web.server.adapter.WebHttpHandlerBuilder; @@ -189,7 +189,7 @@ public class ReactiveMongoWebSessionConfigurationTest { this.context.refresh(); ReactiveMongoSessionRepository repository = this.context.getBean(ReactiveMongoSessionRepository.class); - IndexResolver indexResolver = this.context.getBean(IndexResolver.class); + IndexResolver indexResolver = this.context.getBean(IndexResolver.class); assertThat(repository).isNotNull(); assertThat(indexResolver).isNotNull(); @@ -205,7 +205,7 @@ public class ReactiveMongoWebSessionConfigurationTest { this.context.refresh(); ReactiveMongoSessionRepository repository = this.context.getBean(ReactiveMongoSessionRepository.class); - IndexResolver indexResolver = this.context.getBean(IndexResolver.class); + IndexResolver indexResolver = this.context.getBean(IndexResolver.class); assertThat(repository).isNotNull(); assertThat(indexResolver).isNotNull(); @@ -367,7 +367,7 @@ public class ReactiveMongoWebSessionConfigurationTest { @Bean @SuppressWarnings("unchecked") - IndexResolver indexResolver() { + IndexResolver indexResolver() { return mock(IndexResolver.class); } @@ -389,7 +389,7 @@ public class ReactiveMongoWebSessionConfigurationTest { @Bean @SuppressWarnings("unchecked") - IndexResolver indexResolver() { + IndexResolver indexResolver() { return mock(IndexResolver.class); }