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

Rename o.s.b.d.g.GemfireBeanFactoryLocatorProxy.clean() to clear().

Browse Source
This commit is contained in:
John Blum
2018-05-29 13:07:10 -07:00
parent 66a83c18b4
commit 46f8f46cb6
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java
View File

@@ -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

4
geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java
View File

@@ -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

2
geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyIntegrationTests.java
View File

@@ -55,7 +55,7 @@ public class SecurityManagerProxyIntegrationTests {
@BeforeClass
@AfterClass
public static void cleanUpBeanFactoryLocatorReferences() {
GemfireBeanFactoryLocatorProxy.clean();
GemfireBeanFactoryLocatorProxy.clear();
}
@Autowired

5
geode-spring-boot-starter/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorProxy.java
View File

@@ -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();
}
}