Spring/spring-session
1
0
Fork 0
Code Issues 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-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java
View File

@@ -66,7 +66,7 @@ class ClientServerHazelcastIndexedSessionRepositoryITests extends AbstractHazelc
static class HazelcastSessionConfig {
@Bean
public HazelcastInstance hazelcastInstance() {
HazelcastInstance hazelcastInstance() {
ClientConfig clientConfig = new ClientConfig();
clientConfig.getNetworkConfig()
.addAddress(container.getContainerIpAddress() + ":" + container.getFirstMappedPort());

2
spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/EmbeddedHazelcastIndexedSessionRepositoryITests.java
View File

@@ -43,7 +43,7 @@ class EmbeddedHazelcastIndexedSessionRepositoryITests extends AbstractHazelcastI
static class HazelcastSessionConfig {
@Bean
public HazelcastInstance hazelcastInstance() {
HazelcastInstance hazelcastInstance() {
return HazelcastITestUtils.embeddedHazelcastServer();
}

4
spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java
View File

@@ -206,12 +206,12 @@ class EnableHazelcastHttpSessionEventsTests<S extends Session> {
static class HazelcastSessionConfig {
@Bean
public HazelcastInstance embeddedHazelcast() {
HazelcastInstance embeddedHazelcast() {
return HazelcastITestUtils.embeddedHazelcastServer();
}
@Bean
public SessionEventRegistry sessionEventRegistry() {
SessionEventRegistry sessionEventRegistry() {
return new SessionEventRegistry();
}

4
spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java
View File

@@ -72,7 +72,7 @@ public class HazelcastHttpSessionConfigurationXmlTests<S extends Session> {
static class HazelcastSessionXmlConfigCustomMapName {
@Bean
public HazelcastInstance embeddedHazelcast() {
HazelcastInstance embeddedHazelcast() {
Config hazelcastConfig = new ClasspathXmlConfig(
"org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-map-name.xml");
NetworkConfig netConfig = new NetworkConfig();
@@ -111,7 +111,7 @@ public class HazelcastHttpSessionConfigurationXmlTests<S extends Session> {
static class HazelcastSessionXmlConfigCustomMapNameAndIdle {
@Bean
public HazelcastInstance embeddedHazelcast() {
HazelcastInstance embeddedHazelcast() {
Config hazelcastConfig = new ClasspathXmlConfig(
"org/springframework/session/hazelcast/config/annotation/web/http/hazelcast-custom-idle-time-map-name.xml");
NetworkConfig netConfig = new NetworkConfig();

20
spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationTests.java
View File

@@ -262,7 +262,7 @@ class HazelcastHttpSessionConfigurationTests {
static IMap<Object, Object> defaultHazelcastInstanceSessions = mock(IMap.class);
@Bean
public HazelcastInstance defaultHazelcastInstance() {
HazelcastInstance defaultHazelcastInstance() {
HazelcastInstance hazelcastInstance = mock(HazelcastInstance.class);
given(hazelcastInstance.getMap(anyString())).willReturn(defaultHazelcastInstanceSessions);
return hazelcastInstance;
@@ -361,7 +361,7 @@ class HazelcastHttpSessionConfigurationTests {
@Bean
@SpringSessionHazelcastInstance
public HazelcastInstance qualifiedHazelcastInstance() {
HazelcastInstance qualifiedHazelcastInstance() {
HazelcastInstance hazelcastInstance = mock(HazelcastInstance.class);
given(hazelcastInstance.getMap(anyString())).willReturn(qualifiedHazelcastInstanceSessions);
return hazelcastInstance;
@@ -378,7 +378,7 @@ class HazelcastHttpSessionConfigurationTests {
@Bean
@Primary
public HazelcastInstance primaryHazelcastInstance() {
HazelcastInstance primaryHazelcastInstance() {
HazelcastInstance hazelcastInstance = mock(HazelcastInstance.class);
given(hazelcastInstance.getMap(anyString())).willReturn(primaryHazelcastInstanceSessions);
return hazelcastInstance;
@@ -398,7 +398,7 @@ class HazelcastHttpSessionConfigurationTests {
@Bean
@SpringSessionHazelcastInstance
public HazelcastInstance qualifiedHazelcastInstance() {
HazelcastInstance qualifiedHazelcastInstance() {
HazelcastInstance hazelcastInstance = mock(HazelcastInstance.class);
given(hazelcastInstance.getMap(anyString())).willReturn(qualifiedHazelcastInstanceSessions);
return hazelcastInstance;
@@ -406,7 +406,7 @@ class HazelcastHttpSessionConfigurationTests {
@Bean
@Primary
public HazelcastInstance primaryHazelcastInstance() {
HazelcastInstance primaryHazelcastInstance() {
HazelcastInstance hazelcastInstance = mock(HazelcastInstance.class);
given(hazelcastInstance.getMap(anyString())).willReturn(primaryHazelcastInstanceSessions);
return hazelcastInstance;
@@ -422,7 +422,7 @@ class HazelcastHttpSessionConfigurationTests {
static IMap<Object, Object> hazelcastInstanceSessions = mock(IMap.class);
@Bean
public HazelcastInstance hazelcastInstance() {
HazelcastInstance hazelcastInstance() {
HazelcastInstance hazelcastInstance = mock(HazelcastInstance.class);
given(hazelcastInstance.getMap(anyString())).willReturn(hazelcastInstanceSessions);
return hazelcastInstance;
@@ -438,7 +438,7 @@ class HazelcastHttpSessionConfigurationTests {
static IMap<Object, Object> secondaryHazelcastInstanceSessions = mock(IMap.class);
@Bean
public HazelcastInstance secondaryHazelcastInstance() {
HazelcastInstance secondaryHazelcastInstance() {
HazelcastInstance hazelcastInstance = mock(HazelcastInstance.class);
given(hazelcastInstance.getMap(anyString())).willReturn(secondaryHazelcastInstanceSessions);
return hazelcastInstance;
@@ -451,7 +451,7 @@ class HazelcastHttpSessionConfigurationTests {
@Bean
@SuppressWarnings("unchecked")
public IndexResolver<Session> indexResolver() {
IndexResolver<Session> indexResolver() {
return mock(IndexResolver.class);
}
@@ -462,13 +462,13 @@ class HazelcastHttpSessionConfigurationTests {
@Bean
@Order(0)
public SessionRepositoryCustomizer<HazelcastIndexedSessionRepository> sessionRepositoryCustomizerOne() {
SessionRepositoryCustomizer<HazelcastIndexedSessionRepository> sessionRepositoryCustomizerOne() {
return (sessionRepository) -> sessionRepository.setDefaultMaxInactiveInterval(0);
}
@Bean
@Order(1)
public SessionRepositoryCustomizer<HazelcastIndexedSessionRepository> sessionRepositoryCustomizerTwo() {
SessionRepositoryCustomizer<HazelcastIndexedSessionRepository> sessionRepositoryCustomizerTwo() {
return (sessionRepository) -> sessionRepository
.setDefaultMaxInactiveInterval(MAX_INACTIVE_INTERVAL_IN_SECONDS);
}