diff --git a/build.gradle b/build.gradle index 33201ff6..a755c1ae 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath 'io.spring.gradle:spring-build-conventions:0.0.17.RELEASE' + classpath 'io.spring.gradle:spring-build-conventions:0.0.18.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } repositories { diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml index bba30aa9..7e918001 100644 --- a/etc/checkstyle/checkstyle.xml +++ b/etc/checkstyle/checkstyle.xml @@ -4,7 +4,7 @@ - + diff --git a/etc/checkstyle/header.txt b/etc/checkstyle/header.txt deleted file mode 100644 index 501a5343..00000000 --- a/etc/checkstyle/header.txt +++ /dev/null @@ -1,16 +0,0 @@ -^\Q/*\E$ -^\Q * Copyright 2014-\E20\d\d\Q the original author or authors.\E$ -^\Q *\E$ -^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$ -^\Q * you may not use this file except in compliance with the License.\E$ -^\Q * You may obtain a copy of the License at\E$ -^\Q *\E$ -^\Q * http://www.apache.org/licenses/LICENSE-2.0\E$ -^\Q *\E$ -^\Q * Unless required by applicable law or agreed to in writing, software\E$ -^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$ -^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$ -^\Q * See the License for the specific language governing permissions and\E$ -^\Q * limitations under the License.\E$ -^\Q */\E$ -^.*$ \ No newline at end of file diff --git a/etc/checkstyle/suppressions.xml b/etc/checkstyle/suppressions.xml index ff56025d..305c7f83 100644 --- a/etc/checkstyle/suppressions.xml +++ b/etc/checkstyle/suppressions.xml @@ -7,7 +7,6 @@ - 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 383838ec..cd1e0166 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 @@ -81,7 +81,7 @@ public interface Session { @SuppressWarnings("unchecked") default T getAttributeOrDefault(String name, T defaultValue) { T result = getAttribute(name); - return (result != null ? result : defaultValue); + return (result != null) ? result : defaultValue; } /** diff --git a/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java index 148ae974..a13f6daf 100644 --- a/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java +++ b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java @@ -110,8 +110,9 @@ public class SpringHttpSessionConfiguration implements ApplicationContextAware { @PostConstruct public void init() { - CookieSerializer cookieSerializer = (this.cookieSerializer != null - ? this.cookieSerializer : createDefaultCookieSerializer()); + CookieSerializer cookieSerializer = (this.cookieSerializer != null) + ? this.cookieSerializer + : createDefaultCookieSerializer(); this.defaultHttpSessionIdResolver.setCookieSerializer(cookieSerializer); } diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java b/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java index 7a260603..eaf78128 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java @@ -135,9 +135,9 @@ public class DefaultCookieSerializer implements CookieSerializer { int maxAge = getMaxAge(cookieValue); if (maxAge > -1) { sb.append("; Max-Age=").append(cookieValue.getCookieMaxAge()); - OffsetDateTime expires = (maxAge != 0 + OffsetDateTime expires = (maxAge != 0) ? OffsetDateTime.now().plusSeconds(maxAge) - : Instant.EPOCH.atOffset(ZoneOffset.UTC)); + : Instant.EPOCH.atOffset(ZoneOffset.UTC); sb.append("; Expires=") .append(expires.format(DateTimeFormatter.RFC_1123_DATE_TIME)); } diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionIdResolver.java b/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionIdResolver.java index cf33d714..04281ec2 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionIdResolver.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionIdResolver.java @@ -98,8 +98,8 @@ public class HeaderHttpSessionIdResolver implements HttpSessionIdResolver { @Override public List resolveSessionIds(HttpServletRequest request) { String headerValue = request.getHeader(this.headerName); - return (headerValue != null ? Collections.singletonList(headerValue) - : Collections.emptyList()); + return (headerValue != null) ? Collections.singletonList(headerValue) + : Collections.emptyList(); } @Override diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java b/spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java index a6dd6de7..a0a467c0 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java @@ -174,11 +174,11 @@ abstract class OnCommittedResponseWrapper extends HttpServletResponseWrapper { } private void trackContentLength(byte[] content) { - checkContentLength(content != null ? content.length : 0); + checkContentLength((content != null) ? content.length : 0); } private void trackContentLength(char[] content) { - checkContentLength(content != null ? content.length : 0); + checkContentLength((content != null) ? content.length : 0); } private void trackContentLength(int content) { @@ -257,13 +257,13 @@ abstract class OnCommittedResponseWrapper extends HttpServletResponseWrapper { } @Override - public int hashCode() { - return this.delegate.hashCode(); + public boolean equals(Object obj) { + return this.delegate.equals(obj); } @Override - public boolean equals(Object obj) { - return this.delegate.equals(obj); + public int hashCode() { + return this.delegate.hashCode(); } @Override @@ -502,13 +502,13 @@ abstract class OnCommittedResponseWrapper extends HttpServletResponseWrapper { } @Override - public int hashCode() { - return this.delegate.hashCode(); + public boolean equals(Object obj) { + return this.delegate.equals(obj); } @Override - public boolean equals(Object obj) { - return this.delegate.equals(obj); + public int hashCode() { + return this.delegate.hashCode(); } @Override diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java index 74bc1a12..8c2c6017 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java @@ -352,7 +352,7 @@ public class SessionRepositoryFilter extends OncePerRequestFi @Override public String getRequestedSessionId() { S requestedSession = getRequestedSession(); - return (requestedSession != null ? requestedSession.getId() : null); + return (requestedSession != null) ? requestedSession.getId() : null; } private S getRequestedSession() { diff --git a/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java b/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java index 68239522..66a01979 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java @@ -71,9 +71,9 @@ public final class WebSocketRegistryListener SessionDisconnectEvent e = (SessionDisconnectEvent) event; Map sessionAttributes = SimpMessageHeaderAccessor .getSessionAttributes(e.getMessage().getHeaders()); - String httpSessionId = (sessionAttributes != null + String httpSessionId = (sessionAttributes != null) ? SessionRepositoryMessageInterceptor.getSessionId(sessionAttributes) - : null); + : null; afterConnectionClosed(httpSessionId, e.getSessionId()); } } diff --git a/spring-session-core/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java b/spring-session-core/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java index 02c296fe..8a26304b 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java @@ -117,8 +117,9 @@ public final class SessionRepositoryMessageInterceptor } Map sessionHeaders = SimpMessageHeaderAccessor .getSessionAttributes(message.getHeaders()); - String sessionId = (sessionHeaders != null - ? (String) sessionHeaders.get(SPRING_SESSION_ID_ATTR_NAME) : null); + String sessionId = (sessionHeaders != null) + ? (String) sessionHeaders.get(SPRING_SESSION_ID_ATTR_NAME) + : null; if (sessionId != null) { S session = this.sessionRepository.findById(sessionId); if (session != null) { diff --git a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/taskexecutor/RedisListenerContainerTaskExecutorITests.java b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/taskexecutor/RedisListenerContainerTaskExecutorITests.java index 18e2fe26..37065b9a 100644 --- a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/taskexecutor/RedisListenerContainerTaskExecutorITests.java +++ b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/taskexecutor/RedisListenerContainerTaskExecutorITests.java @@ -95,7 +95,7 @@ public class RedisListenerContainerTaskExecutorITests extends AbstractRedisITest synchronized (this.lock) { this.lock.wait(TimeUnit.SECONDS.toMillis(1)); } - return (this.taskDispatched != null ? this.taskDispatched : Boolean.FALSE); + return (this.taskDispatched != null) ? this.taskDispatched : Boolean.FALSE; } } 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 ea8b625c..4f4b7c23 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 @@ -797,9 +797,10 @@ public class RedisOperationsSessionRepository implements this.delta = new HashMap<>(this.delta.size()); - Long originalExpiration = (this.originalLastAccessTime != null - ? this.originalLastAccessTime.plus(getMaxInactiveInterval()).toEpochMilli() - : null); + Long originalExpiration = (this.originalLastAccessTime != null) + ? this.originalLastAccessTime.plus(getMaxInactiveInterval()) + .toEpochMilli() + : null; RedisOperationsSessionRepository.this.expirationPolicy .onExpirationUpdated(originalExpiration, this); } diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/RedisWebSessionConfiguration.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/RedisWebSessionConfiguration.java index 0a27dc35..57d7d00b 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/RedisWebSessionConfiguration.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/RedisWebSessionConfiguration.java @@ -144,9 +144,9 @@ public class RedisWebSessionConfiguration extends SpringWebSessionConfiguration private ReactiveRedisTemplate createReactiveRedisTemplate() { RedisSerializer keySerializer = new StringRedisSerializer(); - RedisSerializer defaultSerializer = (this.defaultRedisSerializer != null + RedisSerializer defaultSerializer = (this.defaultRedisSerializer != null) ? this.defaultRedisSerializer - : new JdkSerializationRedisSerializer(this.classLoader)); + : new JdkSerializationRedisSerializer(this.classLoader); RedisSerializationContext serializationContext = RedisSerializationContext .newSerializationContext(defaultSerializer) .key(keySerializer).hashKey(keySerializer).build(); 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 c95685a4..0f575c6a 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 @@ -765,23 +765,23 @@ public class JdbcOperationsSessionRepository implements } if (attributeExists) { if (attributeRemoved) { - this.delta.merge(attributeName, DeltaValue.REMOVED, - (oldDeltaValue, deltaValue) -> (oldDeltaValue == DeltaValue.ADDED - ? null - : deltaValue)); + this.delta.merge(attributeName, DeltaValue.REMOVED, (oldDeltaValue, + deltaValue) -> (oldDeltaValue == DeltaValue.ADDED) ? null + : deltaValue); } else { this.delta.merge(attributeName, DeltaValue.UPDATED, - (oldDeltaValue, deltaValue) -> (oldDeltaValue == DeltaValue.ADDED - ? oldDeltaValue - : deltaValue)); + (oldDeltaValue, + deltaValue) -> (oldDeltaValue == DeltaValue.ADDED) + ? oldDeltaValue + : deltaValue); } } else { this.delta.merge(attributeName, DeltaValue.ADDED, - (oldDeltaValue, deltaValue) -> (oldDeltaValue == DeltaValue.ADDED + (oldDeltaValue, deltaValue) -> (oldDeltaValue == DeltaValue.ADDED) ? oldDeltaValue - : DeltaValue.UPDATED)); + : DeltaValue.UPDATED); } this.delegate.setAttribute(attributeName, attributeValue); if (PRINCIPAL_NAME_INDEX_NAME.equals(attributeName) ||