From 4bdebc0bab94f485c24b2cdf29ff5f457ad1f024 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 21 Mar 2019 17:31:24 -0700 Subject: [PATCH] Fix ordering. --- .../configuration/GemFirePropertiesIntegrationTests.java | 4 +++- .../resources/application-gemfire-config-test.properties | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java index 7050af4f..e5325aa0 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java @@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.gemfire.config.annotation.EnableMemcachedServer; import org.springframework.data.gemfire.config.annotation.EnableSsl; +import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; import org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration; import org.springframework.geode.boot.autoconfigure.configuration.support.CacheProperties; @@ -161,6 +162,7 @@ public class GemFirePropertiesIntegrationTests { assertThat(cacheServerProperties.getSocketBufferSize()).isEqualTo(8192); assertThat(cacheServerProperties.getSubscriptionCapacity()).isEqualTo(2); assertThat(cacheServerProperties.getSubscriptionDiskStoreName()).isEqualTo("TestSubscriptionDiskStore"); + assertThat(cacheServerProperties.getSubscriptionEvictionPolicy()).isEqualTo(SubscriptionEvictionPolicy.ENTRY); assertThat(cacheServerProperties.isTcpNoDelay()).isFalse(); } @@ -295,8 +297,8 @@ public class GemFirePropertiesIntegrationTests { assertThat(poolProperties.isMultiUserAuthentication()).isTrue(); assertThat(poolProperties.getPingInterval()).isEqualTo(15000L); assertThat(poolProperties.isPrSingleHopEnabled()).isFalse(); - assertThat(poolProperties.isReadyForEvents()).isTrue(); assertThat(poolProperties.getReadTimeout()).isEqualTo(5000); + assertThat(poolProperties.isReadyForEvents()).isTrue(); assertThat(poolProperties.getRetryAttempts()).isEqualTo(2); assertThat(poolProperties.getServerGroup()).isEqualTo("TestServerGroup"); assertThat(poolProperties.getServers()).containsExactly("cardboardbox[41414]"); diff --git a/spring-geode-autoconfigure/src/test/resources/application-gemfire-config-test.properties b/spring-geode-autoconfigure/src/test/resources/application-gemfire-config-test.properties index 3419e86e..a0714d4f 100644 --- a/spring-geode-autoconfigure/src/test/resources/application-gemfire-config-test.properties +++ b/spring-geode-autoconfigure/src/test/resources/application-gemfire-config-test.properties @@ -1,3 +1,5 @@ +# Spring Boot application.properties containing Spring Data for Apache Geode / Pivotal GemFire properties. + spring.data.gemfire.name=GemFirePropertiesIntegrationTests spring.data.gemfire.locators=localhost[11235],localhost[12480] spring.data.gemfire.use-bean-factory-locator=true @@ -35,6 +37,7 @@ spring.data.gemfire.cache.server.port=12345 spring.data.gemfire.cache.server.socket-buffer-size=8192 spring.data.gemfire.cache.server.subscription-capacity=2 spring.data.gemfire.cache.server.subscription-disk-store-name=TestSubscriptionDiskStore +spring.data.gemfire.cache.server.subscription-eviction-policy=entry spring.data.gemfire.cache.server.tcp-no-delay=false spring.data.gemfire.cluster.region.type=PARTITION_REDUNDANT_PERSISTENT spring.data.gemfire.disk.store.allow-force-compaction=true @@ -81,8 +84,8 @@ spring.data.gemfire.pool.min-connections=10 spring.data.gemfire.pool.multi-user-authentication=true spring.data.gemfire.pool.ping-interval=15000 spring.data.gemfire.pool.pr-single-hop-enabled=false -spring.data.gemfire.pool.ready-for-events=true spring.data.gemfire.pool.read-timeout=5000 +spring.data.gemfire.pool.ready-for-events=true spring.data.gemfire.pool.retry-attempts=2 spring.data.gemfire.pool.server-group=TestServerGroup spring.data.gemfire.pool.servers=cardboardbox[41414] @@ -124,10 +127,10 @@ spring.data.gemfire.security.ssl.keystore-config.password=keypass spring.data.gemfire.security.ssl.keystore-config.type=JKS spring.data.gemfire.security.ssl.protocols=any spring.data.gemfire.security.ssl.require-authentication=false -spring.data.gemfire.security.ssl.web-require-authentication=true spring.data.gemfire.security.ssl.truststore=/path/to/truststore.jks spring.data.gemfire.security.ssl.truststore-config.password=storepass spring.data.gemfire.security.ssl.truststore-config.type=PKS11 +spring.data.gemfire.security.ssl.web-require-authentication=true spring.data.gemfire.service.http.bind-address=10.51.151.255 spring.data.gemfire.service.http.port=8181 spring.data.gemfire.service.http.ssl-require-authentication=true