diff --git a/docs/src/test/java/docs/IndexDocTests.java b/docs/src/test/java/docs/IndexDocTests.java index 2cd3da70..83859996 100644 --- a/docs/src/test/java/docs/IndexDocTests.java +++ b/docs/src/test/java/docs/IndexDocTests.java @@ -16,11 +16,14 @@ package docs; +import java.time.Duration; + import com.hazelcast.config.Config; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.IMap; import org.junit.Test; + import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; @@ -36,8 +39,6 @@ import org.springframework.session.web.http.SessionRepositoryFilter; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import java.time.Duration; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/samples/javaconfig/users/src/main/java/sample/UserAccountsFilter.java b/samples/javaconfig/users/src/main/java/sample/UserAccountsFilter.java index c70407b7..2781e248 100644 --- a/samples/javaconfig/users/src/main/java/sample/UserAccountsFilter.java +++ b/samples/javaconfig/users/src/main/java/sample/UserAccountsFilter.java @@ -16,17 +16,23 @@ package sample; -import org.springframework.session.Session; -import org.springframework.session.SessionRepository; -import org.springframework.session.web.http.HttpSessionManager; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.session.Session; +import org.springframework.session.SessionRepository; +import org.springframework.session.web.http.HttpSessionManager; + public class UserAccountsFilter implements Filter { public void init(FilterConfig filterConfig) throws ServletException { diff --git a/spring-session-core/src/main/java/org/springframework/session/MapReactorSessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/MapReactorSessionRepository.java index a2b4bc0b..087308be 100644 --- a/spring-session-core/src/main/java/org/springframework/session/MapReactorSessionRepository.java +++ b/spring-session-core/src/main/java/org/springframework/session/MapReactorSessionRepository.java @@ -16,16 +16,15 @@ package org.springframework.session; -import org.springframework.session.events.SessionDeletedEvent; -import org.springframework.session.events.SessionExpiredEvent; -import reactor.core.publisher.Mono; - import java.time.Duration; -import java.util.Collection; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import reactor.core.publisher.Mono; + +import org.springframework.session.events.SessionDeletedEvent; +import org.springframework.session.events.SessionExpiredEvent; + /** * A {@link SessionRepository} backed by a {@link Map} and that uses a * {@link MapSession}. By default a {@link ConcurrentHashMap} is @@ -80,7 +79,7 @@ public class MapReactorSessionRepository implements ReactorSessionRepository(); - for(Session session : sessions) { + for (Session session : sessions) { this.performSave(session); } } @@ -96,7 +95,7 @@ public class MapReactorSessionRepository implements ReactorSessionRepository(); - for(Session session : sessions) { + for (Session session : sessions) { this.performSave(session); } } diff --git a/spring-session-core/src/main/java/org/springframework/session/MapSession.java b/spring-session-core/src/main/java/org/springframework/session/MapSession.java index 51c8de8e..f0b7764e 100644 --- a/spring-session-core/src/main/java/org/springframework/session/MapSession.java +++ b/spring-session-core/src/main/java/org/springframework/session/MapSession.java @@ -94,7 +94,7 @@ public final class MapSession implements Session, Serializable { session.getAttributeNames().size()); for (String attrName : session.getAttributeNames()) { Object attrValue = session.getAttribute(attrName); - if(attrValue != null) { + if (attrValue != null) { this.sessionAttrs.put(attrName, attrValue); } } diff --git a/spring-session-core/src/main/java/org/springframework/session/ReactorSessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/ReactorSessionRepository.java index d7506d10..fdca6907 100644 --- a/spring-session-core/src/main/java/org/springframework/session/ReactorSessionRepository.java +++ b/spring-session-core/src/main/java/org/springframework/session/ReactorSessionRepository.java @@ -53,6 +53,7 @@ public interface ReactorSessionRepository { *

* * @param session the {@link Session} to save + * @return indicator of operation completion */ Mono save(S session); @@ -70,6 +71,7 @@ public interface ReactorSessionRepository { * Deletes the {@link Session} with the given {@link Session#getId()} or does nothing * if the {@link Session} is not found. * @param id the {@link Session#getId()} to delete + * @return indicator of operation completion */ Mono delete(String id); } diff --git a/spring-session-core/src/main/java/org/springframework/session/Session.java b/spring-session-core/src/main/java/org/springframework/session/Session.java index 52b87422..c859c71d 100644 --- a/spring-session-core/src/main/java/org/springframework/session/Session.java +++ b/spring-session-core/src/main/java/org/springframework/session/Session.java @@ -16,12 +16,12 @@ package org.springframework.session; -import org.springframework.util.Assert; - import java.time.Duration; import java.time.Instant; import java.util.Set; +import org.springframework.util.Assert; + /** * Provides a way to identify a user in an agnostic way. This allows the session to be * used by an HttpSession, WebSocket Session, or even non web related sessions. diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java index 37af741b..18598886 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java @@ -16,17 +16,18 @@ package org.springframework.session.web.http; -import org.springframework.session.Session; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; import java.time.Duration; import java.util.Collections; import java.util.Enumeration; import java.util.NoSuchElementException; import java.util.Set; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionContext; + +import org.springframework.session.Session; + /** * Adapts Spring Session's {@link Session} to an {@link HttpSession}. * diff --git a/spring-session-core/src/test/java/org/springframework/session/MapReactorSessionRepositoryTests.java b/spring-session-core/src/test/java/org/springframework/session/MapReactorSessionRepositoryTests.java index 3da5b976..c52dbeac 100644 --- a/spring-session-core/src/test/java/org/springframework/session/MapReactorSessionRepositoryTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/MapReactorSessionRepositoryTests.java @@ -16,9 +16,6 @@ package org.springframework.session; -import org.junit.Before; -import org.junit.Test; - import java.time.Duration; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -26,6 +23,9 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import org.junit.Before; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; /** @@ -86,7 +86,7 @@ public class MapReactorSessionRepositoryTests { @Test(expected = IllegalArgumentException.class) public void constructorMapWhenNullThenThrowsIllegalArgumentException() { - Map sessions = null; + Map sessions = null; new MapReactorSessionRepository(sessions); } @@ -145,4 +145,4 @@ public class MapReactorSessionRepositoryTests { assertThat(session.getMaxInactiveInterval()) .isEqualTo(expectedMaxInterval); } -} \ No newline at end of file +} diff --git a/spring-session-core/src/test/java/org/springframework/session/MapSessionTests.java b/spring-session-core/src/test/java/org/springframework/session/MapSessionTests.java index 88cba156..20940861 100644 --- a/spring-session-core/src/test/java/org/springframework/session/MapSessionTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/MapSessionTests.java @@ -16,13 +16,13 @@ package org.springframework.session; -import org.junit.Before; -import org.junit.Test; - import java.time.Duration; import java.time.Instant; import java.util.Set; +import org.junit.Before; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; public class MapSessionTests { diff --git a/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java b/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java index 508952d3..2a6080eb 100644 --- a/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java +++ b/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java @@ -16,12 +16,19 @@ package org.springframework.session.security; +import java.time.Instant; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextImpl; import org.springframework.security.core.session.SessionInformation; @@ -30,14 +37,10 @@ import org.springframework.session.FindByIndexNameSessionRepository; import org.springframework.session.MapSession; import org.springframework.session.Session; -import java.time.Instant; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.*; +import static org.mockito.BDDMockito.mock; +import static org.mockito.BDDMockito.verify; +import static org.mockito.BDDMockito.when; /** * Tests for {@link SpringSessionBackedSessionRegistry}. diff --git a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java index 7db013f9..a109c39d 100644 --- a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java +++ b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java @@ -15,7 +15,11 @@ */ package org.springframework.session.data.redis; +import java.util.Map; +import java.util.UUID; + import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -37,9 +41,6 @@ import org.springframework.session.events.SessionCreatedEvent; import org.springframework.session.events.SessionDestroyedEvent; import org.springframework.test.context.ContextConfiguration; -import java.util.Map; -import java.util.UUID; - import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java index 07fe55c8..adc86529 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java @@ -16,8 +16,16 @@ package org.springframework.session.data.redis; +import java.time.Duration; +import java.time.Instant; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.redis.connection.Message; @@ -42,13 +50,6 @@ import org.springframework.session.events.SessionExpiredEvent; import org.springframework.session.web.http.SessionRepositoryFilter; import org.springframework.util.Assert; -import java.time.Duration; -import java.time.Instant; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - /** *

* A {@link org.springframework.session.SessionRepository} that is implemented using diff --git a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java index cf52d8fd..d9941500 100644 --- a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java +++ b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java @@ -16,6 +16,17 @@ package org.springframework.session.data.redis; +import java.time.Duration; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -23,6 +34,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.redis.connection.DefaultMessage; import org.springframework.data.redis.connection.RedisConnection; @@ -45,18 +57,17 @@ import org.springframework.session.data.redis.RedisOperationsSessionRepository.P import org.springframework.session.data.redis.RedisOperationsSessionRepository.RedisSession; import org.springframework.session.events.AbstractSessionEvent; -import java.time.Duration; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.concurrent.TimeUnit; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; @RunWith(MockitoJUnitRunner.class) @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/PrincipalNameExtractor.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/PrincipalNameExtractor.java index 72a964f7..1ef12b58 100644 --- a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/PrincipalNameExtractor.java +++ b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/PrincipalNameExtractor.java @@ -18,6 +18,7 @@ package org.springframework.session.hazelcast; import com.hazelcast.query.extractor.ValueCollector; import com.hazelcast.query.extractor.ValueExtractor; + import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.session.FindByIndexNameSessionRepository; diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java index 7d9c3296..43f715be 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java @@ -16,9 +16,18 @@ package org.springframework.session.jdbc; +import java.time.Duration; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Map; +import java.util.UUID; + +import javax.sql.DataSource; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.jdbc.datasource.DataSourceTransactionManager; @@ -37,13 +46,6 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.Transactional; -import javax.sql.DataSource; -import java.time.Duration; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.Map; -import java.util.UUID; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java index f1181d6a..6b7a981c 100644 --- a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java +++ b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java @@ -16,8 +16,23 @@ package org.springframework.session.jdbc; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.time.Duration; +import java.time.Instant; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.sql.DataSource; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.GenericConversionService; @@ -45,14 +60,6 @@ import org.springframework.transaction.support.TransactionTemplate; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import javax.sql.DataSource; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.time.Duration; -import java.time.Instant; -import java.util.*; - /** * A {@link org.springframework.session.SessionRepository} implementation that uses * Spring's {@link JdbcOperations} to store sessions in a relational database. This