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 82%
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 2a02654ce..e3138ccc4 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
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 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.lang.reflect.Field;
@@ -25,9 +25,6 @@
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.Assert;
-import org.springframework.session.data.mongo.JdkMongoSessionConverter;
import org.springframework.util.ReflectionUtils;
/**
@@ -49,8 +46,7 @@ void verifyContainerClassLoaderLoadedIntoConverter() {
Field mongoSessionConverterField = ReflectionUtils.findField(this.sessionRepository.getClass(),
"mongoSessionConverter");
- ReflectionUtils.makeAccessible(
- Assert.requireNonNull(mongoSessionConverterField, "mongoSessionConverter must not be null!"));
+ ReflectionUtils.makeAccessible(mongoSessionConverterField);
AbstractMongoSessionConverter sessionConverter = (AbstractMongoSessionConverter) ReflectionUtils
.getField(mongoSessionConverterField, this.sessionRepository);
@@ -70,7 +66,7 @@ void verifyContainerClassLoaderLoadedIntoConverter() {
private static Object extractField(Class<?> clazz, String fieldName, Object obj) {
Field field = ReflectionUtils.findField(clazz, fieldName);
- ReflectionUtils.makeAccessible(Assert.requireNonNull(field, fieldName + " must not be null!"));
+ ReflectionUtils.makeAccessible(field);
return ReflectionUtils.getField(field, obj);
}
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 26be00db1..450084b5f 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 b2ec99bc8..46364a265 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.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 7b0364b65..8e3973405 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.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 dd4aa5114..17fb4eac9 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 f4a2d0bef..d94db319f 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.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 a92f51511..01ee64d26 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.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 2245b7a53..0e68f9407 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
@@ -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.
@@ -36,6 +36,8 @@
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;
/**
* Base class for serializing and deserializing session objects. To create custom
@@ -54,8 +56,7 @@ public abstract class AbstractMongoSessionConverter implements GenericConverter
private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
- private IndexResolver<MongoSession> indexResolver = new DelegatingIndexResolver<>(
- new PrincipalNameIndexResolver<>());
+ private IndexResolver<Session> indexResolver = new DelegatingIndexResolver<>(new PrincipalNameIndexResolver<>());
/**
* Returns query to be executed to return sessions based on a particular index.
@@ -122,8 +123,9 @@ else if (Document.class.isAssignableFrom(sourceType.getType())) {
protected abstract MongoSession convert(Document sessionWrapper);
- public void setIndexResolver(IndexResolver<MongoSession> indexResolver) {
- this.indexResolver = Assert.requireNonNull(indexResolver, "indexResolver must not be null!");
+ public void setIndexResolver(IndexResolver<Session> 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/Assert.java b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/Assert.java
deleted file mode 100644
index bb599b965..000000000
--- a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/Assert.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2019 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.data.mongo;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Utility to verify non null fields.
- *
- * @author Greg Turnquist
- */
-public final class Assert {
-
- private Assert() {
- }
-
- public static <T> T requireNonNull(@Nullable T item, String message) {
-
- if (item == null) {
- throw new IllegalArgumentException(message);
- }
-
- return item;
- }
-
-}
diff --git a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoIndexedSessionRepository.java b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoIndexedSessionRepository.java
index 301eacaf2..3c5f5aff4 100644
--- a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoIndexedSessionRepository.java
+++ b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoIndexedSessionRepository.java
@@ -22,6 +22,7 @@
import java.util.Optional;
import java.util.stream.Collectors;
+import com.mongodb.DBObject;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.bson.Document;
@@ -38,6 +39,7 @@
import org.springframework.session.events.SessionCreatedEvent;
import org.springframework.session.events.SessionDeletedEvent;
import org.springframework.session.events.SessionExpiredEvent;
+import org.springframework.util.Assert;
/**
* Session repository implementation which stores sessions in Mongo. Uses
@@ -97,9 +99,9 @@ public MongoSession createSession() {
@Override
public void save(MongoSession session) {
- this.mongoOperations
- .save(Assert.requireNonNull(MongoSessionUtils.convertToDBObject(this.mongoSessionConverter, session),
- "convertToDBObject must not null!"), this.collectionName);
+ DBObject dbObject = MongoSessionUtils.convertToDBObject(this.mongoSessionConverter, session);
+ Assert.notNull(dbObject, "dbObject must not be null");
+ this.mongoOperations.save(dbObject, this.collectionName);
}
@Override
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 47a506b1d..39a47ffc1 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 @@
* @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<String, Object> 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 Instant getCreationTime() {
return Instant.ofEpochMilli(this.createdMillis);
}
- public void setCreationTime(long created) {
+ void setCreationTime(long created) {
this.createdMillis = created;
}
@@ -184,11 +184,11 @@ public String getId() {
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/MongoSessionUtils.java b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoSessionUtils.java
index 9e056070a..aa8a6a9b3 100644
--- a/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoSessionUtils.java
+++ b/spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoSessionUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 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.
@@ -27,7 +27,7 @@
*
* @author Greg Turnquist
*/
-public final class MongoSessionUtils {
+final class MongoSessionUtils {
private MongoSessionUtils() {
}
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 8fcdad952..3a920d05a 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.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<MongoSession> indexResolver;
+ private IndexResolver<Session> indexResolver;
@Bean
public MongoIndexedSessionRepository mongoSessionRepository(MongoOperations mongoOperations) {
@@ -156,7 +156,7 @@ public void setEmbeddedValueResolver(StringValueResolver resolver) {
}
@Autowired(required = false)
- public void setIndexResolver(IndexResolver<MongoSession> indexResolver) {
+ public void setIndexResolver(IndexResolver<Session> 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 b824832a5..197d599a8 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.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<MongoSession> indexResolver;
+ private IndexResolver<Session> indexResolver;
@Bean
public ReactiveMongoSessionRepository reactiveMongoSessionRepository(ReactiveMongoOperations operations) {
@@ -176,7 +176,7 @@ public void setSessionRepositoryCustomizers(
}
@Autowired(required = false)
- public void setIndexResolver(IndexResolver<MongoSession> indexResolver) {
+ public void setIndexResolver(IndexResolver<Session> 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 3f807fe56..6612628da 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.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 @@ void customIndexResolverConfigurationWithDefaultMongoSessionConverter() {
CustomIndexResolverConfigurationWithDefaultMongoSessionConverter.class);
MongoIndexedSessionRepository repository = this.context.getBean(MongoIndexedSessionRepository.class);
- IndexResolver<MongoSession> indexResolver = this.context.getBean(IndexResolver.class);
+ IndexResolver<Session> indexResolver = this.context.getBean(IndexResolver.class);
assertThat(repository).isNotNull();
assertThat(indexResolver).isNotNull();
@@ -185,7 +185,7 @@ void customIndexResolverConfigurationWithProvidedMongoSessionConverter() {
CustomIndexResolverConfigurationWithProvidedMongoSessionConverter.class);
MongoIndexedSessionRepository repository = this.context.getBean(MongoIndexedSessionRepository.class);
- IndexResolver<MongoSession> indexResolver = this.context.getBean(IndexResolver.class);
+ IndexResolver<Session> indexResolver = this.context.getBean(IndexResolver.class);
assertThat(repository).isNotNull();
assertThat(indexResolver).isNotNull();
@@ -316,7 +316,7 @@ static class CustomIndexResolverConfigurationWithDefaultMongoSessionConverter {
@Bean
@SuppressWarnings("unchecked")
- IndexResolver<MongoSession> indexResolver() {
+ IndexResolver<Session> indexResolver() {
return mock(IndexResolver.class);
}
@@ -333,7 +333,7 @@ AbstractMongoSessionConverter mongoSessionConverter() {
@Bean
@SuppressWarnings("unchecked")
- IndexResolver<MongoSession> indexResolver() {
+ IndexResolver<Session> 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 e20d0805d..46f2029d5 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.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 @@ void customIndexResolverConfigurationWithDefaultMongoSessionConverter() {
this.context.refresh();
ReactiveMongoSessionRepository repository = this.context.getBean(ReactiveMongoSessionRepository.class);
- IndexResolver<MongoSession> indexResolver = this.context.getBean(IndexResolver.class);
+ IndexResolver<Session> indexResolver = this.context.getBean(IndexResolver.class);
assertThat(repository).isNotNull();
assertThat(indexResolver).isNotNull();
@@ -205,7 +205,7 @@ void customIndexResolverConfigurationWithProvidedMongoSessionConverter() {
this.context.refresh();
ReactiveMongoSessionRepository repository = this.context.getBean(ReactiveMongoSessionRepository.class);
- IndexResolver<MongoSession> indexResolver = this.context.getBean(IndexResolver.class);
+ IndexResolver<Session> indexResolver = this.context.getBean(IndexResolver.class);
assertThat(repository).isNotNull();
assertThat(indexResolver).isNotNull();
@@ -367,7 +367,7 @@ ReactiveMongoOperations operations() {
@Bean
@SuppressWarnings("unchecked")
- IndexResolver<MongoSession> indexResolver() {
+ IndexResolver<Session> indexResolver() {
return mock(IndexResolver.class);
}
@@ -389,7 +389,7 @@ JacksonMongoSessionConverter jacksonMongoSessionConverter() {
@Bean
@SuppressWarnings("unchecked")
- IndexResolver<MongoSession> indexResolver() {
+ IndexResolver<Session> indexResolver() {
return mock(IndexResolver.class);
}