diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java b/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java similarity index 98% rename from src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java rename to src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java index edb29f7..898b370 100644 --- a/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java +++ b/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java @@ -123,27 +123,42 @@ import org.springframework.data.gemfire.tests.mock.support.MockObjectInvocationE import org.springframework.data.gemfire.tests.util.FileSystemUtils; /** - * The {@link MockGemFireObjectsSupport} class is an abstract base class encapsulating factory methods for creating + * The {@link GemFireMockObjectsSupport} class is an abstract base class encapsulating factory methods for creating * Mock GemFire Objects (e.g. {@link Cache}, {@link ClientCache}, {@link Region}, etc). * * @author John Blum * @see org.apache.geode.cache.Cache * @see org.apache.geode.cache.CacheFactory * @see org.apache.geode.cache.DiskStore + * @see org.apache.geode.cache.DiskStoreFactory * @see org.apache.geode.cache.GemFireCache * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.RegionFactory + * @see org.apache.geode.cache.RegionService + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueue + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory * @see org.apache.geode.cache.client.ClientCache * @see org.apache.geode.cache.client.ClientCacheFactory + * @see org.apache.geode.cache.client.Pool + * @see org.apache.geode.cache.client.PoolFactory * @see org.apache.geode.cache.control.ResourceManager + * @see org.apache.geode.cache.query.CqQuery + * @see org.apache.geode.cache.query.Query + * @see org.apache.geode.cache.query.QueryService * @see org.apache.geode.cache.server.CacheServer * @see org.apache.geode.cache.server.ClientSubscriptionConfig + * @see org.apache.geode.cache.wan.GatewayReceiver + * @see org.apache.geode.cache.wan.GatewayReceiverFactory + * @see org.apache.geode.cache.wan.GatewaySender + * @see org.apache.geode.cache.wan.GatewaySenderFactory + * @see org.apache.geode.distributed.DistributedMember * @see org.apache.geode.distributed.DistributedSystem * @see org.mockito.Mockito * @see org.springframework.data.gemfire.tests.mock.MockObjectsSupport * @since 0.0.1 */ @SuppressWarnings("unused") -public abstract class MockGemFireObjectsSupport extends MockObjectsSupport { +public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { private static final boolean DEFAULT_USE_SINGLETON_CACHE = false; @@ -431,7 +446,7 @@ public abstract class MockGemFireObjectsSupport extends MockObjectsSupport { return Optional.ofNullable(regionPath) .map(String::trim) .map(it -> it.startsWith(Region.SEPARATOR) ? it : String.format("%1$s%2$s", Region.SEPARATOR, it)) - .map(MockGemFireObjectsSupport::normalizeRegionPath) + .map(GemFireMockObjectsSupport::normalizeRegionPath) .filter(it -> !it.isEmpty()) .orElseThrow(() -> newIllegalArgumentException("Region path [%s] is required", regionPath)); } @@ -491,7 +506,7 @@ public abstract class MockGemFireObjectsSupport extends MockObjectsSupport { String resolvedRegionPath = Optional.ofNullable(regionPath) .map(String::trim) .filter(it -> !it.isEmpty()) - .map(MockGemFireObjectsSupport::toRegionPath) + .map(GemFireMockObjectsSupport::toRegionPath) .orElseThrow(() -> newIllegalArgumentException("Region path [%s] is not valid", regionPath)); return regions.get(resolvedRegionPath); @@ -504,7 +519,7 @@ public abstract class MockGemFireObjectsSupport extends MockObjectsSupport { .thenThrow(newUnsupportedOperationException(NOT_SUPPORTED)); when(mockRegionService.rootRegions()).thenAnswer(invocation -> - regions.values().stream().filter(MockGemFireObjectsSupport::isRootRegion).collect(Collectors.toSet())); + regions.values().stream().filter(GemFireMockObjectsSupport::isRootRegion).collect(Collectors.toSet())); return mockRegionService; } @@ -2161,7 +2176,7 @@ public abstract class MockGemFireObjectsSupport extends MockObjectsSupport { CacheFactory cacheFactorySpy = spy(cacheFactory); - Cache resolvedMockCache = MockGemFireObjectsSupport.resolveMockedGemFireCache(useSingletonCache) + Cache resolvedMockCache = GemFireMockObjectsSupport.resolveMockedGemFireCache(useSingletonCache) .orElseGet(() -> { Cache mockCache = mockPeerCache(); @@ -2211,7 +2226,7 @@ public abstract class MockGemFireObjectsSupport extends MockObjectsSupport { ClientCacheFactory clientCacheFactorySpy = spy(clientCacheFactory); ClientCache resolvedMockedClientCache = - MockGemFireObjectsSupport.resolveMockedGemFireCache(useSingletonCache).orElseGet(() -> { + GemFireMockObjectsSupport.resolveMockedGemFireCache(useSingletonCache).orElseGet(() -> { ClientCache mockClientCache = mockClientCache(); diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java b/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java index 291f0f7..ac23bea 100644 --- a/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java @@ -26,26 +26,27 @@ import org.springframework.context.event.ContextClosedEvent; import org.springframework.context.event.EventListener; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.data.gemfire.tests.mock.MockGemFireObjectsSupport; -import org.springframework.data.gemfire.tests.mock.config.MockGemFireObjectsBeanPostProcessor; +import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport; +import org.springframework.data.gemfire.tests.mock.config.GemFireMockObjectsBeanPostProcessor; /** * The {@link GemFireMockObjectsConfiguration} class is a Spring {@link Configuration @Configuration} class * containing bean definitions to configure GemFire Object mocking. * * @author John Blum - * @see Annotation + * @see java.lang.annotation.Annotation * @see org.springframework.beans.factory.config.BeanPostProcessor * @see org.springframework.context.annotation.Bean * @see org.springframework.context.annotation.Configuration * @see org.springframework.context.annotation.ImportAware * @see org.springframework.core.annotation.AnnotationAttributes * @see org.springframework.core.type.AnnotationMetadata - * @see org.springframework.data.gemfire.tests.mock.config.MockGemFireObjectsBeanPostProcessor + * @see org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport + * @see org.springframework.data.gemfire.tests.mock.config.GemFireMockObjectsBeanPostProcessor * @since 0.0.1 */ -@SuppressWarnings("unused") @Configuration +@SuppressWarnings("unused") public class GemFireMockObjectsConfiguration implements ImportAware { private boolean useSingletonCache = false; @@ -86,12 +87,12 @@ public class GemFireMockObjectsConfiguration implements ImportAware { } @Bean - public BeanPostProcessor mockGemFireObjectsBeanPostProcessor() { - return MockGemFireObjectsBeanPostProcessor.newInstance(this.useSingletonCache); + public BeanPostProcessor gemfireMockObjectsBeanPostProcessor() { + return GemFireMockObjectsBeanPostProcessor.newInstance(this.useSingletonCache); } @EventListener public void releaseMockResources(ContextClosedEvent event) { - MockGemFireObjectsSupport.destroy(); + GemFireMockObjectsSupport.destroy(); } } diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java b/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java index 13dda26..a0b13f4 100644 --- a/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java +++ b/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.junit.runner.RunWith; -import org.springframework.data.gemfire.tests.mock.context.MockGemFireObjectsApplicationContextInitializer; +import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -41,7 +41,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see java.lang.annotation.Retention * @see java.lang.annotation.Target * @see org.junit.runner.RunWith - * @see org.springframework.data.gemfire.tests.mock.context.MockGemFireObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 0.0.1 @@ -51,7 +51,7 @@ import org.springframework.test.context.junit4.SpringRunner; @Inherited @Documented @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = MockGemFireObjectsApplicationContextInitializer.class) +@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) @SuppressWarnings("unused") public @interface GemFireUnitTest { diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/config/MockGemFireObjectsBeanPostProcessor.java b/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java similarity index 88% rename from src/main/java/org/springframework/data/gemfire/tests/mock/config/MockGemFireObjectsBeanPostProcessor.java rename to src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java index 70088d8..98882b8 100644 --- a/src/main/java/org/springframework/data/gemfire/tests/mock/config/MockGemFireObjectsBeanPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java @@ -30,26 +30,27 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; import org.springframework.data.gemfire.client.PoolFactoryBean; -import org.springframework.data.gemfire.tests.mock.MockGemFireObjectsSupport; +import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport; import org.springframework.lang.Nullable; /** - * The {@link MockGemFireObjectsBeanPostProcessor} class is a Spring {@link BeanPostProcessor} that applies + * The {@link GemFireMockObjectsBeanPostProcessor} class is a Spring {@link BeanPostProcessor} that applies * mocks and spies to Spring Data GemFire / Spring Data Geode and Pivotal GemFire / Apache Geode objects * and components. * * @author John Blum * @see org.apache.geode.cache.CacheFactory + * @see org.apache.geode.cache.GemFireCache * @see org.apache.geode.cache.client.ClientCacheFactory * @see org.apache.geode.cache.client.PoolFactory * @see org.springframework.beans.factory.config.BeanPostProcessor * @see org.springframework.data.gemfire.CacheFactoryBean * @see org.springframework.data.gemfire.client.ClientCacheFactoryBean * @see org.springframework.data.gemfire.client.PoolFactoryBean - * @see org.springframework.data.gemfire.tests.mock.MockGemFireObjectsSupport + * @see org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport * @since 0.0.1 */ -public class MockGemFireObjectsBeanPostProcessor implements BeanPostProcessor { +public class GemFireMockObjectsBeanPostProcessor implements BeanPostProcessor { private static final boolean DEFAULT_USE_SINGLETON_CACHE = false; @@ -59,13 +60,13 @@ public class MockGemFireObjectsBeanPostProcessor implements BeanPostProcessor { private final AtomicReference gemfireProperties = new AtomicReference<>(new Properties()); - public static MockGemFireObjectsBeanPostProcessor newInstance() { + public static GemFireMockObjectsBeanPostProcessor newInstance() { return newInstance(DEFAULT_USE_SINGLETON_CACHE); } - public static MockGemFireObjectsBeanPostProcessor newInstance(boolean useSingletonCache) { + public static GemFireMockObjectsBeanPostProcessor newInstance(boolean useSingletonCache) { - MockGemFireObjectsBeanPostProcessor beanPostProcessor = new MockGemFireObjectsBeanPostProcessor(); + GemFireMockObjectsBeanPostProcessor beanPostProcessor = new GemFireMockObjectsBeanPostProcessor(); beanPostProcessor.useSingletonCache = useSingletonCache; @@ -130,7 +131,7 @@ public class MockGemFireObjectsBeanPostProcessor implements BeanPostProcessor { @Override public CacheFactory initialize(CacheFactory cacheFactory) { - return MockGemFireObjectsSupport.spyOn(cacheFactory, useSingletonCache); + return GemFireMockObjectsSupport.spyOn(cacheFactory, useSingletonCache); } } @@ -154,7 +155,7 @@ public class MockGemFireObjectsBeanPostProcessor implements BeanPostProcessor { @Override public ClientCacheFactory initialize(ClientCacheFactory clientCacheFactory) { - return MockGemFireObjectsSupport.spyOn(clientCacheFactory, this.useSingletonCache); + return GemFireMockObjectsSupport.spyOn(clientCacheFactory, this.useSingletonCache); } } @@ -167,7 +168,7 @@ public class MockGemFireObjectsBeanPostProcessor implements BeanPostProcessor { @Override public PoolFactory initialize(PoolFactory poolFactory) { - return MockGemFireObjectsSupport.mockPoolFactory(); + return GemFireMockObjectsSupport.mockPoolFactory(); } } } diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/context/MockGemFireObjectsApplicationContextInitializer.java b/src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java similarity index 76% rename from src/main/java/org/springframework/data/gemfire/tests/mock/context/MockGemFireObjectsApplicationContextInitializer.java rename to src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java index db305e9..335d076 100644 --- a/src/main/java/org/springframework/data/gemfire/tests/mock/context/MockGemFireObjectsApplicationContextInitializer.java +++ b/src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java @@ -18,24 +18,24 @@ package org.springframework.data.gemfire.tests.mock.context; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.data.gemfire.tests.mock.config.MockGemFireObjectsBeanPostProcessor; +import org.springframework.data.gemfire.tests.mock.config.GemFireMockObjectsBeanPostProcessor; /** - * The {@link MockGemFireObjectsApplicationContextInitializer} class is a Spring {@link ApplicationContextInitializer} + * The {@link GemFireMockObjectsApplicationContextInitializer} class is a Spring {@link ApplicationContextInitializer} * used to initialize the Spring {@link ConfigurableApplicationContext} with GemFire Object mocking. * * @author John Blum * @see org.springframework.context.ApplicationContextInitializer * @see org.springframework.context.ConfigurableApplicationContext - * @see org.springframework.data.gemfire.tests.mock.config.MockGemFireObjectsBeanPostProcessor + * @see org.springframework.data.gemfire.tests.mock.config.GemFireMockObjectsBeanPostProcessor * @since 0.0.1 */ -public class MockGemFireObjectsApplicationContextInitializer +public class GemFireMockObjectsApplicationContextInitializer implements ApplicationContextInitializer { @Override @SuppressWarnings("all") public void initialize(ConfigurableApplicationContext applicationContext) { - applicationContext.getBeanFactory().addBeanPostProcessor(MockGemFireObjectsBeanPostProcessor.newInstance()); + applicationContext.getBeanFactory().addBeanPostProcessor(GemFireMockObjectsBeanPostProcessor.newInstance()); } }