From e67dc5e8d2456f31ce3033c3a97eb4ac9f789f6d Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 13 May 2020 14:41:29 -0700 Subject: [PATCH] Switch to using SDG Annotation-based configuration for the "Books" Region on the client. Technically, this means annotated the TestGeodeCientConfiguration with SDG's @EnableEntityDefinedRegions, which auto-magically defines and creates Region(s) from application entity classes. Resolves gh-67. --- ...xportAutoConfigurationIntegrationTests.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/ClientCacheDataImportExportAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/ClientCacheDataImportExportAutoConfigurationIntegrationTests.java index d58748bd..bfc394aa 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/ClientCacheDataImportExportAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/data/ClientCacheDataImportExportAutoConfigurationIntegrationTests.java @@ -33,7 +33,6 @@ import org.junit.runner.RunWith; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.client.ClientRegionShortcut; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -43,8 +42,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Profile; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.LocalRegionFactoryBean; -import org.springframework.data.gemfire.client.ClientRegionFactoryBean; import org.springframework.data.gemfire.config.annotation.CacheServerApplication; +import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; import org.springframework.geode.boot.autoconfigure.DataImportExportAutoConfiguration; import org.springframework.geode.core.util.ObjectUtils; @@ -166,19 +165,8 @@ public class ClientCacheDataImportExportAutoConfigurationIntegrationTests @Profile("IMPORT") @SpringBootApplication - static class TestGeodeClientConfiguration { - - @Bean("Books") - ClientRegionFactoryBean clientRegion(GemFireCache cache) { - - ClientRegionFactoryBean clientRegion = new ClientRegionFactoryBean<>(); - - clientRegion.setCache(cache); - clientRegion.setShortcut(ClientRegionShortcut.PROXY); - - return clientRegion; - } - } + @EnableEntityDefinedRegions(basePackageClasses = Book.class) + static class TestGeodeClientConfiguration { } @Profile("IMPORT-SERVER") @CacheServerApplication(name = "ClientCacheDataImportExportAutoConfigurationIntegrationTestsServer")