diff --git a/samples/boot/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java b/samples/boot/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java index eca2bbac..4fc8e79b 100644 --- a/samples/boot/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java +++ b/samples/boot/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java @@ -20,7 +20,6 @@ import com.maxmind.geoip2.DatabaseReader; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; - import sample.config.GeoConfig; import org.springframework.beans.factory.annotation.Autowired; diff --git a/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java index 78b07887..7fdf7fd2 100644 --- a/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java +++ b/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java @@ -16,14 +16,13 @@ package sample; -/** - * @author Rob Winch - */ - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +/** + * @author Rob Winch + */ @EnableWebSecurity public class SecurityConfig { @Autowired diff --git a/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java index 78b07887..7fdf7fd2 100644 --- a/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java +++ b/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java @@ -16,14 +16,13 @@ package sample; -/** - * @author Rob Winch - */ - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +/** + * @author Rob Winch + */ @EnableWebSecurity public class SecurityConfig { @Autowired diff --git a/settings.gradle b/settings.gradle index 792dbf04..328071d3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ rootProject.name = 'spring-session-build' - FileTree buildFiles = fileTree(rootDir) { include '**/*.gradle' exclude '**/gradle', 'settings.gradle', 'buildSrc', '/build.gradle', '.*' @@ -9,15 +8,14 @@ FileTree buildFiles = fileTree(rootDir) { String rootDirPath = rootDir.absolutePath + File.separator buildFiles.each { File buildFile -> - - boolean isDefaultName = 'build.gradle'.equals(buildFile.name) - if(isDefaultName) { + if (buildFile.name == 'build.gradle') { String buildFilePath = buildFile.parentFile.absolutePath String projectPath = buildFilePath.replace(rootDirPath, '').replaceAll(File.separator, ':') include projectPath - } else { - String projectName = buildFile.name.replace('.gradle', ''); - String projectPath = ':' + projectName; + } + else { + String projectName = buildFile.name.replace('.gradle', '') + String projectPath = ':' + projectName include projectPath def project = findProject("${projectPath}") project.name = projectName diff --git a/spring-session-core/src/main/java/org/springframework/session/MapReactiveSessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/MapReactiveSessionRepository.java index fa28fc54..9f129ad2 100644 --- a/spring-session-core/src/main/java/org/springframework/session/MapReactiveSessionRepository.java +++ b/spring-session-core/src/main/java/org/springframework/session/MapReactiveSessionRepository.java @@ -68,7 +68,7 @@ public class MapReactiveSessionRepository implements ReactiveSessionRepository save(MapSession session) { diff --git a/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java index f639d909..a4798352 100644 --- a/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java +++ b/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java @@ -66,7 +66,7 @@ public class MapSessionRepository implements SessionRepository { * should be kept alive between client requests. */ public void setDefaultMaxInactiveInterval(int defaultMaxInactiveInterval) { - this.defaultMaxInactiveInterval = Integer.valueOf(defaultMaxInactiveInterval); + this.defaultMaxInactiveInterval = defaultMaxInactiveInterval; } public void save(MapSession session) { diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java index 238de606..a7c7960e 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java @@ -76,8 +76,7 @@ public class SessionEventHttpSessionListenerAdapter Session session = event.getSession(); HttpSession httpSession = new HttpSessionAdapter<>(session, this.context); - HttpSessionEvent httpSessionEvent = new HttpSessionEvent(httpSession); - return httpSessionEvent; + return new HttpSessionEvent(httpSession); } /* diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java index 099c6be1..f8a08b31 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java @@ -75,8 +75,7 @@ public class SessionEventHttpSessionListenerAdapterTests { // none) @Test public void constructorEmptyWorks() { - new SessionEventHttpSessionListenerAdapter( - Collections.emptyList()); + new SessionEventHttpSessionListenerAdapter(Collections.emptyList()); } /** @@ -86,7 +85,7 @@ public class SessionEventHttpSessionListenerAdapterTests { @Test public void onApplicationEventEmptyListenersDoesNotUseEvent() { this.listener = new SessionEventHttpSessionListenerAdapter( - Collections.emptyList()); + Collections.emptyList()); this.destroyed = mock(SessionDestroyedEvent.class); this.listener.onApplicationEvent(this.destroyed); diff --git a/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java b/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java index 01be92bb..6b48696a 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java @@ -136,7 +136,7 @@ public class SessionRepositoryMessageInterceptorTests { @Test(expected = IllegalArgumentException.class) public void setMatchingMessageTypesEmpty() { - this.interceptor.setMatchingMessageTypes(Collections.emptySet()); + this.interceptor.setMatchingMessageTypes(Collections.emptySet()); } @Test 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 3f78e5d2..1822296d 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 @@ -497,9 +497,6 @@ public class RedisOperationsSessionRepository implements public void onMessage(Message message, byte[] pattern) { byte[] messageChannel = message.getChannel(); byte[] messageBody = message.getBody(); - if (messageChannel == null || messageBody == null) { - return; - } String channel = new String(messageChannel); @@ -536,8 +533,6 @@ public class RedisOperationsSessionRepository implements else { handleExpired(sessionId, session); } - - return; } } 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 c45037dd..403a5cbe 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 @@ -433,7 +433,7 @@ public class RedisOperationsSessionRepositoryTests { given(this.redisOperations.boundSetOps(anyString())) .willReturn(this.boundSetOperations); given(this.boundSetOperations.members()) - .willReturn(Collections.singleton(expiredId)); + .willReturn(Collections.singleton(expiredId)); given(this.redisOperations.boundHashOps(getKey(expiredId))) .willReturn(this.boundHashOperations); Map map = map(RedisOperationsSessionRepository.MAX_INACTIVE_ATTR, 1, @@ -455,7 +455,7 @@ public class RedisOperationsSessionRepositoryTests { given(this.redisOperations.boundSetOps(anyString())) .willReturn(this.boundSetOperations); given(this.boundSetOperations.members()) - .willReturn(Collections.singleton(sessionId)); + .willReturn(Collections.singleton(sessionId)); given(this.redisOperations.boundHashOps(getKey(sessionId))) .willReturn(this.boundHashOperations); Map map = map(RedisOperationsSessionRepository.CREATION_TIME_ATTR, createdTime.toEpochMilli(), diff --git a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java index 212e7011..8de4765b 100644 --- a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java +++ b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java @@ -320,8 +320,7 @@ public class HazelcastSessionRepository implements public String changeSessionId() { this.changed = true; - String result = this.delegate.changeSessionId(); - return result; + return this.delegate.changeSessionId(); } public Instant getLastAccessedTime() { diff --git a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfiguration.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfiguration.java index 0ce637df..2eb32778 100644 --- a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfiguration.java +++ b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfiguration.java @@ -75,10 +75,9 @@ public class HazelcastHttpSessionConfiguration extends SpringHttpSessionConfigur .getAnnotationAttributes(EnableHazelcastHttpSession.class.getName()); AnnotationAttributes enableAttrs = AnnotationAttributes.fromMap(enableAttrMap); setMaxInactiveIntervalInSeconds( - (Integer) enableAttrs.getNumber("maxInactiveIntervalInSeconds")); + enableAttrs.getNumber("maxInactiveIntervalInSeconds")); setSessionMapName(enableAttrs.getString("sessionMapName")); - setHazelcastFlushMode( - (HazelcastFlushMode) enableAttrs.getEnum("hazelcastFlushMode")); + setHazelcastFlushMode(enableAttrs.getEnum("hazelcastFlushMode")); } public void setMaxInactiveIntervalInSeconds(int maxInactiveIntervalInSeconds) { diff --git a/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-idle-time-map-name.xml b/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-idle-time-map-name.xml index ab14415c..025c9512 100644 --- a/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-idle-time-map-name.xml +++ b/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-idle-time-map-name.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.8.xsd"> spring-session-it-test-idle-time-map-name diff --git a/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-map-name.xml b/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-map-name.xml index 919fc2fb..da0a419a 100644 --- a/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-map-name.xml +++ b/spring-session-hazelcast/src/test/resources/org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-map-name.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.8.xsd"> spring-session-it-test-map-name 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 e0fe8411..587477dd 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 @@ -527,7 +527,7 @@ public class JdbcOperationsSessionRepository implements @Scheduled(cron = "${spring.session.cleanup.cron.expression:0 * * * * *}") public void cleanUpExpiredSessions() { - int deletedCount = this.transactionOperations.execute(transactionStatus -> + Integer deletedCount = this.transactionOperations.execute(transactionStatus -> JdbcOperationsSessionRepository.this.jdbcOperations.update( JdbcOperationsSessionRepository.this.deleteSessionsByExpiryTimeQuery, System.currentTimeMillis()));