From 46f8f46cb6b04c3a001b79f09c6bec34bda26132 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 29 May 2018 13:07:10 -0700 Subject: [PATCH] Rename o.s.b.d.g.GemfireBeanFactoryLocatorProxy.clean() to clear(). --- .../AutoConfiguredCloudSecurityContextIntegrationTests.java | 6 ++---- .../AutoConfiguredLocalSecurityContextIntegrationTests.java | 4 ++-- .../support/SecurityManagerProxyIntegrationTests.java | 2 +- .../gemfire/support/GemfireBeanFactoryLocatorProxy.java | 5 +++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java index dbead846..e36264a6 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java @@ -31,7 +31,6 @@ import org.springframework.data.gemfire.config.annotation.CacheServerApplication import org.springframework.data.gemfire.config.annotation.EnableLocator; import org.springframework.data.gemfire.config.annotation.EnableLogging; import org.springframework.data.gemfire.support.GemfireBeanFactoryLocatorProxy; -import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; /** @@ -55,7 +54,6 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ -@DirtiesContext @RunWith(SpringRunner.class) @SpringBootTest(classes = AutoConfiguredCloudSecurityContextIntegrationTests.GemFireClientConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.NONE) @@ -75,7 +73,7 @@ public class AutoConfiguredCloudSecurityContextIntegrationTests loadVcapApplicationProperties(); - GemfireBeanFactoryLocatorProxy.clean(); + GemfireBeanFactoryLocatorProxy.clear(); } public static void loadVcapApplicationProperties() throws IOException { @@ -91,7 +89,7 @@ public class AutoConfiguredCloudSecurityContextIntegrationTests vcapApplicationProperties.stringPropertyNames().forEach(System::clearProperty); - GemfireBeanFactoryLocatorProxy.clean(); + GemfireBeanFactoryLocatorProxy.clear(); } @SpringBootApplication diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java index ba96aa11..c8688041 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java @@ -67,7 +67,7 @@ public class AutoConfiguredLocalSecurityContextIntegrationTests @BeforeClass public static void startGemFireServer() throws IOException { - GemfireBeanFactoryLocatorProxy.clean(); + GemfireBeanFactoryLocatorProxy.clear(); startGemFireServer(GemFireServerConfiguration.class, "-Dspring.profiles.active=security-local-server"); @@ -75,7 +75,7 @@ public class AutoConfiguredLocalSecurityContextIntegrationTests @AfterClass public static void cleanUpBeanFactoryLocatorReferences() { - GemfireBeanFactoryLocatorProxy.clean(); + GemfireBeanFactoryLocatorProxy.clear(); } @SpringBootApplication diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyIntegrationTests.java index baa3b79f..671cba76 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyIntegrationTests.java @@ -55,7 +55,7 @@ public class SecurityManagerProxyIntegrationTests { @BeforeClass @AfterClass public static void cleanUpBeanFactoryLocatorReferences() { - GemfireBeanFactoryLocatorProxy.clean(); + GemfireBeanFactoryLocatorProxy.clear(); } @Autowired diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorProxy.java b/geode-spring-boot-starter/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorProxy.java index 85ae9cf1..65ab535a 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorProxy.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorProxy.java @@ -20,7 +20,8 @@ import org.springframework.beans.factory.BeanFactory; /** * The {@link GemfireBeanFactoryLocatorProxy} class is an extension of {@link GemfireBeanFactoryLocator} - * used to clean up all Spring {@link BeanFactory} references. + * used to clean up all Spring {@link BeanFactory} references, which are stored throughout the runtime + * of an application for different purposes, like configuration of non-Spring managed components. * * @author John Blum * @see org.springframework.beans.factory.BeanFactory @@ -30,7 +31,7 @@ import org.springframework.beans.factory.BeanFactory; // TODO: remove this class once and refactor the SDG GemfireBeanFactoryLocator! public class GemfireBeanFactoryLocatorProxy extends GemfireBeanFactoryLocator { - public static void clean() { + public static void clear() { BEAN_FACTORIES.clear(); } }