Spring/spring-session-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts and other issues with backporting GitHub Issues #10 and #12.

Browse Source
This commit is contained in:
John Blum
2018-11-07 16:31:51 -08:00
parent 9c2b2c1b59
commit 3fe8dcebdc
3 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/config/annotation/web/http/ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests.java
View File

@@ -40,6 +40,7 @@ import org.springframework.data.gemfire.config.annotation.ClientCacheApplication
import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects;
import org.springframework.mock.env.MockPropertySource;
import org.springframework.session.Session;
import org.springframework.session.data.gemfire.AbstractGemFireIntegrationTests;
import org.springframework.session.data.gemfire.config.annotation.web.http.support.SpringSessionGemFireConfigurer;
import org.springframework.session.data.gemfire.serialization.SessionSerializer;
@@ -66,7 +67,7 @@ import org.springframework.session.data.gemfire.serialization.SessionSerializer;
* @since 2.0.4
*/
@SuppressWarnings("unused")
public class ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests {
public class ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests extends AbstractGemFireIntegrationTests {
private ConfigurableApplicationContext applicationContext;
@@ -101,8 +102,7 @@ public class ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests {
.withProperty("spring.session.data.gemfire.cache.server.region.shortcut", RegionShortcut.REPLICATE_PERSISTENT_OVERFLOW.name())
.withProperty("spring.session.data.gemfire.session.attributes.indexable", "firstName, lastName")
.withProperty("spring.session.data.gemfire.session.expiration.max-inactive-interval-seconds", "600")
.withProperty("spring.session.data.gemfire.session.region.name", "PropertyRegionName")
.withProperty("spring.session.data.gemfire.session.serializer.bean-name", "MockSessionSerializer");
.withProperty("spring.session.data.gemfire.session.region.name", "PropertyRegionName");
this.applicationContext = newApplicationContext(testPropertySource, TestConfiguration.class);
@@ -116,7 +116,7 @@ public class ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests {
assertThat(sessionConfiguration.getPoolName()).isEqualTo("Dead");
assertThat(sessionConfiguration.getServerRegionShortcut()).isEqualTo(RegionShortcut.REPLICATE_PERSISTENT_OVERFLOW);
assertThat(sessionConfiguration.getSessionRegionName()).isEqualTo("ConfigurerRegionName");
assertThat(sessionConfiguration.getSessionSerializerBeanName()).isEqualTo("SessionPdxSerializer");
assertThat(sessionConfiguration.getSessionSerializerBeanName()).isEqualTo("TestSessionSerializer");
}
@Test
@@ -145,7 +145,7 @@ public class ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests {
assertThat(sessionConfiguration.getPoolName()).isEqualTo("Car");
assertThat(sessionConfiguration.getServerRegionShortcut()).isEqualTo(RegionShortcut.PARTITION_PERSISTENT);
assertThat(sessionConfiguration.getSessionRegionName()).isEqualTo("TestSessionRegionName");
assertThat(sessionConfiguration.getSessionSerializerBeanName()).isEqualTo("SessionPdxSerializer");
assertThat(sessionConfiguration.getSessionSerializerBeanName()).isEqualTo("TestSessionSerializer");
}
@Test
@@ -163,7 +163,7 @@ public class ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests {
assertThat(sessionConfiguration.getPoolName()).isEqualTo("Dead");
assertThat(sessionConfiguration.getServerRegionShortcut()).isEqualTo(RegionShortcut.REPLICATE);
assertThat(sessionConfiguration.getSessionRegionName()).isEqualTo("ConfigurerRegionName");
assertThat(sessionConfiguration.getSessionSerializerBeanName()).isEqualTo("SessionPdxSerializer");
assertThat(sessionConfiguration.getSessionSerializerBeanName()).isEqualTo("TestSessionSerializer");
}
@ClientCacheApplication
@@ -244,11 +244,11 @@ public class ConfigurerBasedGemFireHttpSessionConfigurationIntegrationTests {
@Bean
@Primary
SpringSessionGemFireConfigurer primarySpringSessionGemFireConfigurer(
@Value("${test.cache.client.pool.name:geodePool}") String poolName,
@Value("${test.cache.client.region.shortcut:LOCAL}") ClientRegionShortcut clientRegionShortcut,
@Value("${test.cache.server.region.shortcut:PARTITION_PERSISTENT}") RegionShortcut serverRegionShortcut,
@Value("${test.session.expiration.max-inactive-interval-seconds:600}") int maxInactiveIntervalInSeconds,
@Value("${test.session.region.name:MockSessionRegionName}") String regionName) {
@Value("${test.cache.client.pool.name:geodePool}") String poolName,
@Value("${test.cache.client.region.shortcut:LOCAL}") ClientRegionShortcut clientRegionShortcut,
@Value("${test.cache.server.region.shortcut:PARTITION_PERSISTENT}") RegionShortcut serverRegionShortcut,
@Value("${test.session.expiration.max-inactive-interval-seconds:600}") int maxInactiveIntervalInSeconds,
@Value("${test.session.region.name:MockSessionRegionName}") String regionName) {
return new SpringSessionGemFireConfigurer() {

3
spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java
View File

@@ -157,9 +157,6 @@ public class GemFireHttpSessionConfiguration extends AbstractGemFireHttpSessionC
public static final String CONFIGURER_GET_SERVER_REGION_SHORTCUT_METHOD_NAME =
findByMethodName(SpringSessionGemFireConfigurer.class, "getServerRegionShortcut");
public static final String CONFIGURER_GET_SESSION_EXPIRATION_POLICY_BEAN_NAME_METHOD_NAME =
findByMethodName(SpringSessionGemFireConfigurer.class, "getSessionExpirationPolicyBeanName");
public static final String CONFIGURER_GET_SESSION_SERIALIZER_BEAN_NAME_METHOD_NAME =
findByMethodName(SpringSessionGemFireConfigurer.class, "getSessionSerializerBeanName");

19
spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SpringSessionGemFireConfigurerUnitTests.java
View File

@@ -75,11 +75,6 @@ public class SpringSessionGemFireConfigurerUnitTests {
return RegionShortcut.REPLICATE;
}
@Override
public String getSessionExpirationPolicyBeanName() {
return "MockExpirationPolicy";
}
@Override
public String getSessionSerializerBeanName() {
return "MockSerializer";
@@ -142,7 +137,6 @@ public class SpringSessionGemFireConfigurerUnitTests {
assertThat(testConfigurer.getPoolName()).isEqualTo("MockPool");
assertThat(testConfigurer.getRegionName()).isEqualTo("MockRegion");
assertThat(testConfigurer.getServerRegionShortcut()).isEqualTo(RegionShortcut.REPLICATE);
assertThat(testConfigurer.getSessionExpirationPolicyBeanName()).isEqualTo("MockExpirationPolicy");
assertThat(testConfigurer.getSessionSerializerBeanName()).isEqualTo("MockSerializer");
Method[] declaredMethods = filterDeclaredMethods(testConfigurer.getClass().getDeclaredMethods());
@@ -151,12 +145,12 @@ public class SpringSessionGemFireConfigurerUnitTests {
Arrays.stream(declaredMethods).map(Method::getName).sorted().collect(Collectors.toList());
assertThat(declaredMethods).isNotNull();
assertThat(declaredMethods).hasSize(8);
assertThat(declaredMethods).hasSize(7);
assertThat(declaredMethodNames)
.containsExactly("getClientRegionShortcut", "getIndexableSessionAttributes",
"getMaxInactiveIntervalInSeconds", "getPoolName", "getRegionName", "getServerRegionShortcut",
"getSessionExpirationPolicyBeanName", "getSessionSerializerBeanName");
"getSessionSerializerBeanName");
}
@Test
@@ -177,8 +171,6 @@ public class SpringSessionGemFireConfigurerUnitTests {
.isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SESSION_REGION_NAME);
assertThat(testConfigurer.getServerRegionShortcut())
.isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SERVER_REGION_SHORTCUT);
assertThat(testConfigurer.getSessionExpirationPolicyBeanName())
.isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SESSION_EXPIRATION_POLICY_BEAN_NAME);
assertThat(testConfigurer.getSessionSerializerBeanName())
.isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SESSION_SERIALIZER_BEAN_NAME);
@@ -200,7 +192,6 @@ public class SpringSessionGemFireConfigurerUnitTests {
assertThat(testConfigurer.getPoolName()).isEqualTo("TestPool");
assertThat(testConfigurer.getRegionName()).isEqualTo("TestRegion");
assertThat(testConfigurer.getServerRegionShortcut()).isEqualTo(RegionShortcut.PARTITION);
assertThat(testConfigurer.getSessionExpirationPolicyBeanName()).isEmpty();
assertThat(testConfigurer.getSessionSerializerBeanName())
.isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SESSION_SERIALIZER_BEAN_NAME);
@@ -213,11 +204,9 @@ public class SpringSessionGemFireConfigurerUnitTests {
assertThat(declaredMethods).hasSize(4);
assertThat(declaredMethodNames)
.containsExactly("getClientRegionShortcut", "getMaxInactiveIntervalInSeconds",
"getPoolName", "getRegionName");
.containsExactly("getClientRegionShortcut", "getMaxInactiveIntervalInSeconds", "getPoolName", "getRegionName");
assertThat(declaredMethodNames)
.doesNotContain("getIndexableSessionAttributes", "getServerRegionShortcut",
"getSessionExpirationPolicyBeanName", "getSessionSerializerBeanName");
.doesNotContain("getIndexableSessionAttributes", "getServerRegionShortcut", "getSessionSerializerBeanName");
}
}