mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align with spring-javaformat 0.0.15

Browse Source
This commit is contained in:
Vedran Pavic
2019-09-27 13:23:08 +02:00
parent ec82336477
commit bd36e115a8
53 changed files with 140 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java
View File

@@ -617,7 +617,7 @@ class RedisIndexedSessionRepositoryITests extends AbstractRedisITests {
static class Config extends BaseConfig {
@Bean
public SessionEventRegistry sessionEventRegistry() {
SessionEventRegistry sessionEventRegistry() {
return new SessionEventRegistry();
}

2
spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisSessionRepositoryITests.java
View File

@@ -227,7 +227,7 @@ class RedisSessionRepositoryITests extends AbstractRedisITests {
static class Config extends BaseConfig {
@Bean
public RedisSessionRepository sessionRepository(RedisConnectionFactory redisConnectionFactory) {
RedisSessionRepository sessionRepository(RedisConnectionFactory redisConnectionFactory) {
RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
redisTemplate.setConnectionFactory(redisConnectionFactory);
redisTemplate.afterPropertiesSet();

6
spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java
View File

@@ -102,11 +102,11 @@ class EnableRedisHttpSessionExpireSessionDestroyedTests<S extends Session> exten
}
}
public boolean receivedEvent() {
boolean receivedEvent() {
return this.receivedEvent;
}
public void setLock(Object lock) {
void setLock(Object lock) {
this.lock = lock;
}
@@ -117,7 +117,7 @@ class EnableRedisHttpSessionExpireSessionDestroyedTests<S extends Session> exten
static class Config extends BaseConfig {
@Bean
public SessionExpiredEventRegistry sessionDestroyedEventRegistry() {
SessionExpiredEventRegistry sessionDestroyedEventRegistry() {
return new SessionExpiredEventRegistry();
}

6
spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/taskexecutor/RedisListenerContainerTaskExecutorITests.java
View File

@@ -88,7 +88,7 @@ class RedisListenerContainerTaskExecutorITests extends AbstractRedisITests {
}
}
public boolean taskDispatched() throws InterruptedException {
boolean taskDispatched() throws InterruptedException {
if (this.taskDispatched != null) {
return this.taskDispatched;
}
@@ -105,12 +105,12 @@ class RedisListenerContainerTaskExecutorITests extends AbstractRedisITests {
static class Config extends BaseConfig {
@Bean
public Executor springSessionRedisTaskExecutor() {
Executor springSessionRedisTaskExecutor() {
return new SessionTaskExecutor(Executors.newSingleThreadExecutor());
}
@Bean
public Executor springSessionRedisSubscriptionExecutor() {
Executor springSessionRedisSubscriptionExecutor() {
return new SimpleAsyncTaskExecutor();
}

14
spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java
View File

@@ -396,10 +396,10 @@ public class RedisIndexedSessionRepository
@Override
public void save(RedisSession session) {
session.save();
if (session.isNew()) {
if (session.isNew) {
String sessionCreatedKey = getSessionCreatedChannel(session.getId());
this.sessionRedisOperations.convertAndSend(sessionCreatedKey, session.delta);
session.setNew(false);
session.isNew = false;
}
}
@@ -699,10 +699,6 @@ public class RedisIndexedSessionRepository
}
}
public void setNew(boolean isNew) {
this.isNew = isNew;
}
@Override
public void setLastAccessedTime(Instant lastAccessedTime) {
this.cached.setLastAccessedTime(lastAccessedTime);
@@ -715,10 +711,6 @@ public class RedisIndexedSessionRepository
return this.cached.isExpired();
}
public boolean isNew() {
return this.isNew;
}
@Override
public Instant getCreationTime() {
return this.cached.getCreationTime();
@@ -832,7 +824,7 @@ public class RedisIndexedSessionRepository
if (sessionId.equals(this.originalSessionId)) {
return;
}
if (!isNew()) {
if (!this.isNew) {
String originalSessionIdKey = getSessionKey(this.originalSessionId);
String sessionIdKey = getSessionKey(sessionId);
try {

6
spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisSessionExpirationPolicy.java
View File

@@ -64,13 +64,13 @@ final class RedisSessionExpirationPolicy {
this.lookupSessionKey = lookupSessionKey;
}
public void onDelete(Session session) {
void onDelete(Session session) {
long toExpire = roundUpToNextMinute(expiresInMillis(session));
String expireKey = getExpirationKey(toExpire);
this.redis.boundSetOps(expireKey).remove(session.getId());
}
public void onExpirationUpdated(Long originalExpirationTimeInMilli, Session session) {
void onExpirationUpdated(Long originalExpirationTimeInMilli, Session session) {
String keyToExpire = "expires:" + session.getId();
long toExpire = roundUpToNextMinute(expiresInMillis(session));
@@ -117,7 +117,7 @@ final class RedisSessionExpirationPolicy {
return this.lookupSessionKey.apply(sessionId);
}
public void cleanExpiredSessions() {
void cleanExpiredSessions() {
long now = System.currentTimeMillis();
long prevMin = roundDownMinute(now);

4
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationNoOpConfigureRedisActionTests.java
View File

@@ -46,12 +46,12 @@ class RedisHttpSessionConfigurationNoOpConfigureRedisActionTests {
static class Config {
@Bean
public static ConfigureRedisAction configureRedisAction() {
ConfigureRedisAction configureRedisAction() {
return ConfigureRedisAction.NO_OP;
}
@Bean
public RedisConnectionFactory redisConnectionFactory() {
RedisConnectionFactory redisConnectionFactory() {
return mock(RedisConnectionFactory.class);
}

4
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideDefaultSerializerTests.java
View File

@@ -65,12 +65,12 @@ class RedisHttpSessionConfigurationOverrideDefaultSerializerTests {
@Bean
@SuppressWarnings("unchecked")
public RedisSerializer<Object> springSessionDefaultRedisSerializer() {
RedisSerializer<Object> springSessionDefaultRedisSerializer() {
return mock(RedisSerializer.class);
}
@Bean
public RedisConnectionFactory connectionFactory() {
RedisConnectionFactory connectionFactory() {
RedisConnectionFactory factory = mock(RedisConnectionFactory.class);
RedisConnection connection = mock(RedisConnection.class);
given(factory.getConnection()).willReturn(connection);

4
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideSessionTaskExecutor.java
View File

@@ -65,12 +65,12 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutor {
static class Config {
@Bean
public Executor springSessionRedisTaskExecutor() {
Executor springSessionRedisTaskExecutor() {
return mock(Executor.class);
}
@Bean
public RedisConnectionFactory connectionFactory() {
RedisConnectionFactory connectionFactory() {
RedisConnectionFactory factory = mock(RedisConnectionFactory.class);
RedisConnection connection = mock(RedisConnection.class);
given(factory.getConnection()).willReturn(connection);

6
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideSessionTaskExecutors.java
View File

@@ -71,17 +71,17 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutors {
static class Config {
@Bean
public Executor springSessionRedisTaskExecutor() {
Executor springSessionRedisTaskExecutor() {
return mock(Executor.class);
}
@Bean
public Executor springSessionRedisSubscriptionExecutor() {
Executor springSessionRedisSubscriptionExecutor() {
return mock(Executor.class);
}
@Bean
public RedisConnectionFactory connectionFactory() {
RedisConnectionFactory connectionFactory() {
RedisConnectionFactory factory = mock(RedisConnectionFactory.class);
RedisConnection connection = mock(RedisConnection.class);
given(factory.getConnection()).willReturn(connection);

24
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationTests.java
View File

@@ -275,7 +275,7 @@ class RedisHttpSessionConfigurationTests {
static class PropertySourceConfiguration {
@Bean
public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
return new PropertySourcesPlaceholderConfigurer();
}
@@ -285,7 +285,7 @@ class RedisHttpSessionConfigurationTests {
static class RedisConfig {
@Bean
public RedisConnectionFactory defaultRedisConnectionFactory() {
RedisConnectionFactory defaultRedisConnectionFactory() {
return mockRedisConnectionFactory();
}
@@ -357,7 +357,7 @@ class RedisHttpSessionConfigurationTests {
@Bean
@SpringSessionRedisConnectionFactory
public RedisConnectionFactory qualifiedRedisConnectionFactory() {
RedisConnectionFactory qualifiedRedisConnectionFactory() {
return mockRedisConnectionFactory();
}
@@ -369,7 +369,7 @@ class RedisHttpSessionConfigurationTests {
@Bean
@Primary
public RedisConnectionFactory primaryRedisConnectionFactory() {
RedisConnectionFactory primaryRedisConnectionFactory() {
return mockRedisConnectionFactory();
}
@@ -381,13 +381,13 @@ class RedisHttpSessionConfigurationTests {
@Bean
@SpringSessionRedisConnectionFactory
public RedisConnectionFactory qualifiedRedisConnectionFactory() {
RedisConnectionFactory qualifiedRedisConnectionFactory() {
return mockRedisConnectionFactory();
}
@Bean
@Primary
public RedisConnectionFactory primaryRedisConnectionFactory() {
RedisConnectionFactory primaryRedisConnectionFactory() {
return mockRedisConnectionFactory();
}
@@ -398,7 +398,7 @@ class RedisHttpSessionConfigurationTests {
static class NamedConnectionFactoryRedisConfig {
@Bean
public RedisConnectionFactory redisConnectionFactory() {
RedisConnectionFactory redisConnectionFactory() {
return mockRedisConnectionFactory();
}
@@ -409,7 +409,7 @@ class RedisHttpSessionConfigurationTests {
static class MultipleConnectionFactoryRedisConfig {
@Bean
public RedisConnectionFactory secondaryRedisConnectionFactory() {
RedisConnectionFactory secondaryRedisConnectionFactory() {
return mockRedisConnectionFactory();
}
@@ -433,7 +433,7 @@ class RedisHttpSessionConfigurationTests {
@Bean
@SuppressWarnings("unchecked")
public IndexResolver<Session> indexResolver() {
IndexResolver<Session> indexResolver() {
return mock(IndexResolver.class);
}
@@ -444,7 +444,7 @@ class RedisHttpSessionConfigurationTests {
static class CustomRedisMessageListenerContainerConfig {
@Bean
public RedisMessageListenerContainer redisMessageListenerContainer() {
RedisMessageListenerContainer redisMessageListenerContainer() {
return new RedisMessageListenerContainer();
}
@@ -455,13 +455,13 @@ class RedisHttpSessionConfigurationTests {
@Bean
@Order(0)
public SessionRepositoryCustomizer<RedisIndexedSessionRepository> sessionRepositoryCustomizerOne() {
SessionRepositoryCustomizer<RedisIndexedSessionRepository> sessionRepositoryCustomizerOne() {
return (sessionRepository) -> sessionRepository.setDefaultMaxInactiveInterval(0);
}
@Bean
@Order(1)
public SessionRepositoryCustomizer<RedisIndexedSessionRepository> sessionRepositoryCustomizerTwo() {
SessionRepositoryCustomizer<RedisIndexedSessionRepository> sessionRepositoryCustomizerTwo() {
return (sessionRepository) -> sessionRepository
.setDefaultMaxInactiveInterval(MAX_INACTIVE_INTERVAL_IN_SECONDS);
}

4
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/gh109/Gh109Tests.java
View File

@@ -62,7 +62,7 @@ class Gh109Tests {
* override sessionRepository construction to set the custom session-timeout
*/
@Bean
public RedisIndexedSessionRepository sessionRepository(RedisOperations<Object, Object> sessionRedisTemplate,
RedisIndexedSessionRepository sessionRepository(RedisOperations<Object, Object> sessionRedisTemplate,
ApplicationEventPublisher applicationEventPublisher) {
RedisIndexedSessionRepository sessionRepository = new RedisIndexedSessionRepository(sessionRedisTemplate);
sessionRepository.setDefaultMaxInactiveInterval(this.sessionTimeout);
@@ -70,7 +70,7 @@ class Gh109Tests {
}
@Bean
public RedisConnectionFactory redisConnectionFactory() {
RedisConnectionFactory redisConnectionFactory() {
RedisConnectionFactory factory = mock(RedisConnectionFactory.class);
RedisConnection connection = mock(RedisConnection.class);
given(factory.getConnection()).willReturn(connection);

20
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/server/RedisWebSessionConfigurationTests.java
View File

@@ -232,7 +232,7 @@ class RedisWebSessionConfigurationTests {
static class RedisConfig {
@Bean
public ReactiveRedisConnectionFactory defaultRedisConnectionFactory() {
ReactiveRedisConnectionFactory defaultRedisConnectionFactory() {
return mock(ReactiveRedisConnectionFactory.class);
}
@@ -284,7 +284,7 @@ class RedisWebSessionConfigurationTests {
@Bean
@SpringSessionRedisConnectionFactory
public ReactiveRedisConnectionFactory qualifiedRedisConnectionFactory() {
ReactiveRedisConnectionFactory qualifiedRedisConnectionFactory() {
return mock(ReactiveRedisConnectionFactory.class);
}
@@ -295,7 +295,7 @@ class RedisWebSessionConfigurationTests {
@Bean
@Primary
public ReactiveRedisConnectionFactory primaryRedisConnectionFactory() {
ReactiveRedisConnectionFactory primaryRedisConnectionFactory() {
return mock(ReactiveRedisConnectionFactory.class);
}
@@ -306,13 +306,13 @@ class RedisWebSessionConfigurationTests {
@Bean
@SpringSessionRedisConnectionFactory
public ReactiveRedisConnectionFactory qualifiedRedisConnectionFactory() {
ReactiveRedisConnectionFactory qualifiedRedisConnectionFactory() {
return mock(ReactiveRedisConnectionFactory.class);
}
@Bean
@Primary
public ReactiveRedisConnectionFactory primaryRedisConnectionFactory() {
ReactiveRedisConnectionFactory primaryRedisConnectionFactory() {
return mock(ReactiveRedisConnectionFactory.class);
}
@@ -322,7 +322,7 @@ class RedisWebSessionConfigurationTests {
static class NamedConnectionFactoryRedisConfig {
@Bean
public ReactiveRedisConnectionFactory redisConnectionFactory() {
ReactiveRedisConnectionFactory redisConnectionFactory() {
return mock(ReactiveRedisConnectionFactory.class);
}
@@ -332,7 +332,7 @@ class RedisWebSessionConfigurationTests {
static class MultipleConnectionFactoryRedisConfig {
@Bean
public ReactiveRedisConnectionFactory secondaryRedisConnectionFactory() {
ReactiveRedisConnectionFactory secondaryRedisConnectionFactory() {
return mock(ReactiveRedisConnectionFactory.class);
}
@@ -343,7 +343,7 @@ class RedisWebSessionConfigurationTests {
@Bean
@SuppressWarnings("unchecked")
public RedisSerializer<Object> springSessionDefaultRedisSerializer() {
RedisSerializer<Object> springSessionDefaultRedisSerializer() {
return mock(RedisSerializer.class);
}
@@ -354,13 +354,13 @@ class RedisWebSessionConfigurationTests {
@Bean
@Order(0)
public ReactiveSessionRepositoryCustomizer<ReactiveRedisSessionRepository> sessionRepositoryCustomizerOne() {
ReactiveSessionRepositoryCustomizer<ReactiveRedisSessionRepository> sessionRepositoryCustomizerOne() {
return (sessionRepository) -> sessionRepository.setDefaultMaxInactiveInterval(0);
}
@Bean
@Order(1)
public ReactiveSessionRepositoryCustomizer<ReactiveRedisSessionRepository> sessionRepositoryCustomizerTwo() {
ReactiveSessionRepositoryCustomizer<ReactiveRedisSessionRepository> sessionRepositoryCustomizerTwo() {
return (sessionRepository) -> sessionRepository
.setDefaultMaxInactiveInterval(MAX_INACTIVE_INTERVAL_IN_SECONDS);
}