diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java index 3fdd8970..dbc876ed 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java @@ -83,7 +83,7 @@ import org.springframework.util.StringUtils; @ConditionalOnClass({ GemFireCache.class, GemFireHttpSessionConfiguration.class }) @ConditionalOnMissingBean(SessionRepositoryFilter.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) -@EnableGemFireHttpSession +@EnableGemFireHttpSession(poolName = "DEFAULT") @Import(EnableSubscriptionConfiguration.class) @SuppressWarnings("unused") public class SpringSessionAutoConfiguration { diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java index e3bdfaa9..04a9f747 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java @@ -66,10 +66,7 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @SpringBootTest( - properties = { - "spring.session.data.gemfire.cache.client.pool.name=DEFAULT", - "spring.session.data.gemfire.cache.client.region.shortcut=" - }, + properties = "spring.session.data.gemfire.cache.client.region.shortcut=", webEnvironment = SpringBootTest.WebEnvironment.MOCK ) @SuppressWarnings("unused") @@ -85,6 +82,32 @@ public class AutoConfiguredSessionCachingIntegrationTests extends IntegrationTes assertThat(this.applicationContext.getBean(GemFireHttpSessionConfiguration.class)).isNotNull(); } + @Test + public void sessionConfigurationIsCorrect() { + + GemFireHttpSessionConfiguration sessionConfiguration = + this.applicationContext.getBean(GemFireHttpSessionConfiguration.class); + + assertThat(sessionConfiguration).isNotNull(); + assertThat(sessionConfiguration.getClientRegionShortcut()) + .isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_CLIENT_REGION_SHORTCUT); + assertThat(sessionConfiguration.isExposeConfigurationAsProperties()) + .isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_EXPOSE_CONFIGURATION_AS_PROPERTIES); + assertThat(sessionConfiguration.getIndexableSessionAttributes()) + .isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_INDEXABLE_SESSION_ATTRIBUTES); + assertThat(sessionConfiguration.getMaxInactiveIntervalInSeconds()) + .isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL_IN_SECONDS); + assertThat(sessionConfiguration.getPoolName()).isEqualTo("DEFAULT"); + assertThat(sessionConfiguration.getServerRegionShortcut()) + .isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SERVER_REGION_SHORTCUT); + assertThat(sessionConfiguration.getSessionExpirationPolicyBeanName().orElse("")) + .isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SESSION_EXPIRATION_POLICY_BEAN_NAME); + assertThat(sessionConfiguration.getSessionRegionName()) + .isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SESSION_REGION_NAME); + assertThat(sessionConfiguration.getSessionSerializerBeanName()) + .isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SESSION_SERIALIZER_BEAN_NAME); + } + @Test @SuppressWarnings("unchecked") public void sessionRegionExists() { @@ -99,6 +122,8 @@ public class AutoConfiguredSessionCachingIntegrationTests extends IntegrationTes assertThat(sessionRegion.getName()).isEqualTo(GemFireHttpSessionConfiguration.DEFAULT_SESSION_REGION_NAME); assertThat(sessionRegion.getFullPath()) .isEqualTo(RegionUtils.toRegionPath(GemFireHttpSessionConfiguration.DEFAULT_SESSION_REGION_NAME)); + assertThat(sessionRegion.getAttributes()).isNotNull(); + assertThat(sessionRegion.getAttributes().getPoolName()).isNotEqualTo("gemfirePool"); RegionAttributes sessionRegionAttributes = sessionRegion.getAttributes(); diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java index 098e7cb4..95513679 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java @@ -93,10 +93,7 @@ import org.springframework.web.client.RestTemplate; AutoConfiguredSessionRemoteCachingIntegrationTests.SessionGemFireClientConfiguration.class, AutoConfiguredSessionRemoteCachingIntegrationTests.TestWebApplication.class }, - properties = { - "spring.session.data.gemfire.cache.client.pool.name=DEFAULT", - "spring.session.data.gemfire.cache.client.region.shortcut=PROXY" - }, + properties = "spring.session.data.gemfire.cache.client.region.shortcut=PROXY", webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT ) @SuppressWarnings("unused") diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java index b2a0e99c..5160edaf 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java @@ -60,7 +60,6 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @SpringBootTest(properties = { - "spring.session.data.gemfire.cache.client.pool.name=DEFAULT", "spring.session.data.gemfire.cache.client.region.shortcut=LOCAL", "spring.session.timeout=1", }, webEnvironment = SpringBootTest.WebEnvironment.MOCK)