From b052f0ac8dadb5e5e676d7b7d363e94733992c0e Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 9 Mar 2016 20:19:39 -0800 Subject: [PATCH] SGF-479 - Remove lazy initialization option for configuring a GemFire cache. --- .../data/gemfire/CacheFactoryBean.java | 24 +------ .../data/gemfire/config/CacheParser.java | 1 - .../gemfire/config/spring-gemfire-1.8.xsd | 8 --- .../data/gemfire/CacheFactoryBeanTest.java | 51 +++----------- .../gemfire/RegionLookupIntegrationTests.java | 13 +--- .../data/gemfire/SubRegionTest.java | 1 + .../client/MultipleClientCacheTest.java | 9 --- ...ConfiguredClientCacheIntegrationTest.java} | 15 ++-- .../gemfire/config/CacheEagerInitTest.java | 46 ------------- .../gemfire/config/CacheNamespaceTest.java | 3 +- .../config/ClientCacheNamespaceTest.java | 6 +- .../JndiBindingsPropertyPlaceholderTest.java | 6 +- .../gemfire/test/MockCacheFactoryBean.java | 3 +- .../data/gemfire/test/StubCache.java | 1 + .../gemfire/test/StubResourceManager.java | 68 +++++++++++++++++++ .../resources/clientcache-with-regions.xml | 6 +- src/test/resources/empty-cache.xml | 5 ++ src/test/resources/empty-client-cache.xml | 5 ++ ...rtFunctionBasedIntegrationTest-context.xml | 4 +- ...nLookupIntegrationTests-server-context.xml | 28 -------- ...eAutoReconnectDisabledIntegrationTests.xml | 2 +- ...heAutoReconnectEnabledIntegrationTests.xml | 2 +- ...ingClusterConfigurationIntegrationTest.xml | 4 +- ...gLocalOnlyConfigurationIntegrationTest.xml | 4 +- ...lientCacheVariableLocatorsTest-context.xml | 7 +- ...ClientCacheVariableServersTest-context.xml | 9 +-- .../gemfire/client/client-cache-no-close.xml | 13 ++-- .../ClientCacheNamespaceTest-context.xml | 4 +- .../data/gemfire/config/cache-eager-init.xml | 20 ------ .../data/gemfire/config/cache-ns.xml | 3 +- ...-binding-with-property-placeholders-ns.xml | 4 +- .../gemfire/enableClientRegionLookupsTest.xml | 13 +--- ...xecutionIntegrationTest-server-context.xml | 2 +- .../data/gemfire/noClientRegionLookupTest.xml | 8 +-- .../gemfire/noClientSubRegionLookupTest.xml | 8 +-- 35 files changed, 145 insertions(+), 261 deletions(-) rename src/test/java/org/springframework/data/gemfire/client/{LazyInitializedClientCacheIntegrationTest.java => SpringJavaConfiguredClientCacheIntegrationTest.java} (79%) delete mode 100644 src/test/java/org/springframework/data/gemfire/config/CacheEagerInitTest.java create mode 100644 src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java create mode 100644 src/test/resources/empty-cache.xml create mode 100644 src/test/resources/empty-client-cache.xml delete mode 100644 src/test/resources/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml delete mode 100644 src/test/resources/org/springframework/data/gemfire/config/cache-eager-init.xml diff --git a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java index 8299cd02..f4feedb0 100644 --- a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java @@ -88,7 +88,6 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, InitializingBean, DisposableBean, PersistenceExceptionTranslator { protected boolean close = true; - protected boolean lazyInitialize = true; protected boolean useBeanFactoryLocator = false; protected final Log log = LogFactory.getLog(getClass()); @@ -215,10 +214,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, @Override public void afterPropertiesSet() throws Exception { postProcessPropertiesBeforeInitialization(getProperties()); - - if (!isLazyInitialize()) { - init(); - } + init(); } /* (non-Javadoc) */ @@ -579,13 +575,6 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, this.properties = properties; } - /** - * @param lazyInitialize set to false to force cache initialization if no other bean references it - */ - public void setLazyInitialize(boolean lazyInitialize) { - this.lazyInitialize = lazyInitialize; - } - /** * Indicates whether a bean factory locator is enabled (default) for this * cache definition or not. The locator stores the enclosing bean factory @@ -868,7 +857,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, @Override public Cache getObject() throws Exception { - return init(); + return cache; } @Override @@ -1019,13 +1008,4 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, return this.useClusterConfiguration; } - /** - * Determines whether this Cache instance will be lazily initialized. - * - * @return a boolean value indicating whether this Cache instance will be lazily initialized. - */ - public boolean isLazyInitialize() { - return lazyInitialize; - } - } diff --git a/src/main/java/org/springframework/data/gemfire/config/CacheParser.java b/src/main/java/org/springframework/data/gemfire/config/CacheParser.java index 44389ed8..477e4949 100644 --- a/src/main/java/org/springframework/data/gemfire/config/CacheParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/CacheParser.java @@ -60,7 +60,6 @@ class CacheParser extends AbstractSimpleBeanDefinitionParser { ParsingUtils.setPropertyValue(element, builder, "cache-xml-location", "cacheXml"); ParsingUtils.setPropertyReference(element, builder, "properties-ref", "properties"); - ParsingUtils.setPropertyValue(element, builder, "lazy-init","lazyInitialize"); ParsingUtils.setPropertyValue(element, builder, "use-bean-factory-locator"); ParsingUtils.setPropertyValue(element, builder, "close"); ParsingUtils.setPropertyValue(element, builder, "copy-on-read"); diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd index fec8a06d..b4339809 100644 --- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd +++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd @@ -133,14 +133,6 @@ consider using a dedicated utility such as the namespace and its 'prop ]]> - - - - - emptyList()); - when(mockDistributedMember.getRoles()).thenReturn(Collections.emptySet()); - when(mockDistributedMember.getHost()).thenReturn("skullbox"); - when(mockDistributedMember.getProcessId()).thenReturn(67890); + final Cache mockCache = mock(Cache.class); CacheFactoryBean cacheFactoryBean = new CacheFactoryBean() { - @Override protected GemFireCache fetchCache() { - assertSame(ClassLoader.getSystemClassLoader(), getBeanClassLoader()); - return mockCache; + @Override public void afterPropertiesSet() throws Exception { + this.cache = mockCache; } }; - cacheFactoryBean.setBeanClassLoader(ClassLoader.getSystemClassLoader()); - cacheFactoryBean.setBeanName("MockGemFireCache"); - cacheFactoryBean.setCopyOnRead(true); - cacheFactoryBean.setLockLease(15000); - cacheFactoryBean.setLockTimeout(5000); - cacheFactoryBean.setSearchTimeout(15000); - cacheFactoryBean.setUseBeanFactoryLocator(false); + assertThat(cacheFactoryBean.getObject(), is(nullValue())); - GemFireCache actualCache = cacheFactoryBean.getObject(); + cacheFactoryBean.afterPropertiesSet(); - assertSame(mockCache, actualCache); - assertSame(expectedThreadContextClassLoader, Thread.currentThread().getContextClassLoader()); + assertThat(cacheFactoryBean.getObject(), is(equalTo(mockCache))); - verify(mockCache, never()).loadCacheXml(any(InputStream.class)); - verify(mockCache, times(1)).setCopyOnRead(eq(true)); - verify(mockCache, never()).setGatewayConflictResolver(any(GatewayConflictResolver.class)); - verify(mockCache, times(1)).setLockLease(eq(15000)); - verify(mockCache, times(1)).setLockTimeout(eq(5000)); - verify(mockCache, never()).setMessageSyncInterval(anyInt()); - verify(mockCache, times(1)).setSearchTimeout(eq(15000)); - verify(mockCache, never()).getResourceManager(); - verify(mockCache, never()).getCacheTransactionManager(); + verifyZeroInteractions(mockCache); } @Test @@ -578,7 +549,6 @@ public class CacheFactoryBeanTest { cacheFactoryBean.setBeanName("TestCache"); cacheFactoryBean.setCacheXml(mockCacheXml); cacheFactoryBean.setProperties(gemfireProperties); - cacheFactoryBean.setLazyInitialize(false); cacheFactoryBean.setUseBeanFactoryLocator(false); cacheFactoryBean.setClose(false); cacheFactoryBean.setCopyOnRead(true); @@ -607,7 +577,6 @@ public class CacheFactoryBeanTest { assertEquals("TestCache", cacheFactoryBean.getBeanName()); assertSame(mockCacheXml, cacheFactoryBean.getCacheXml()); assertSame(gemfireProperties, cacheFactoryBean.getProperties()); - assertFalse(cacheFactoryBean.isLazyInitialize()); assertTrue(Boolean.FALSE.equals(TestUtils.readField("useBeanFactoryLocator", cacheFactoryBean))); assertTrue(Boolean.FALSE.equals(TestUtils.readField("close", cacheFactoryBean))); assertTrue(cacheFactoryBean.getCopyOnRead()); diff --git a/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java index 68fa846c..bf1d107c 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java @@ -22,12 +22,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.junit.BeforeClass; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.gemfire.fork.SpringCacheServerProcess; import com.gemstone.gemfire.cache.DataPolicy; import com.gemstone.gemfire.cache.Region; @@ -48,13 +46,6 @@ import com.gemstone.gemfire.cache.Scope; */ public class RegionLookupIntegrationTests { - @BeforeClass - @SuppressWarnings("deprecation") - public static void testSuiteSetup() { - ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " " - + "/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml"); - } - protected void assertNoRegionLookup(final String configLocation) { ConfigurableApplicationContext applicationContext = null; @@ -251,7 +242,7 @@ public class RegionLookupIntegrationTests { assertEquals("/NativeClientRegion", nativeClientRegion.getFullPath()); assertNotNull(nativeClientRegion.getAttributes()); assertFalse(nativeClientRegion.getAttributes().getCloningEnabled()); - assertEquals(DataPolicy.EMPTY, nativeClientRegion.getAttributes().getDataPolicy()); + assertEquals(DataPolicy.NORMAL, nativeClientRegion.getAttributes().getDataPolicy()); Region nativeClientChildRegion = applicationContext.getBean("/NativeClientParentRegion/NativeClientChildRegion", Region.class); @@ -260,7 +251,7 @@ public class RegionLookupIntegrationTests { assertEquals("NativeClientChildRegion", nativeClientChildRegion.getName()); assertEquals("/NativeClientParentRegion/NativeClientChildRegion", nativeClientChildRegion.getFullPath()); assertNotNull(nativeClientChildRegion.getAttributes()); - assertEquals(DataPolicy.EMPTY, nativeClientChildRegion.getAttributes().getDataPolicy()); + assertEquals(DataPolicy.NORMAL, nativeClientChildRegion.getAttributes().getDataPolicy()); } finally { closeApplicationContext(applicationContext); diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionTest.java b/src/test/java/org/springframework/data/gemfire/SubRegionTest.java index 1c6fa3c4..8e224610 100644 --- a/src/test/java/org/springframework/data/gemfire/SubRegionTest.java +++ b/src/test/java/org/springframework/data/gemfire/SubRegionTest.java @@ -48,6 +48,7 @@ public class SubRegionTest extends RecreatingContextTest { cacheFactoryBean.setBeanName("gemfireCache"); cacheFactoryBean.setUseBeanFactoryLocator(false); + cacheFactoryBean.afterPropertiesSet(); GemFireCache cache = cacheFactoryBean.getObject(); diff --git a/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java b/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java index 1efa8266..1494bf61 100644 --- a/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java @@ -16,12 +16,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -import org.junit.BeforeClass; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.gemfire.ForkUtil; -import org.springframework.data.gemfire.fork.SpringCacheServerProcess; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.Region; @@ -32,12 +29,6 @@ import com.gemstone.gemfire.cache.Region; */ public class MultipleClientCacheTest { - @BeforeClass - public static void startUp() throws Exception { - ForkUtil.startCacheServer(String.format("%1$s %2$s", SpringCacheServerProcess.class.getName(), - "/org/springframework/data/gemfire/client/datasource-server.xml")); - } - @Test public void testMultipleCaches() { String configLocation = "/org/springframework/data/gemfire/client/client-cache-no-close.xml"; diff --git a/src/test/java/org/springframework/data/gemfire/client/LazyInitializedClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java similarity index 79% rename from src/test/java/org/springframework/data/gemfire/client/LazyInitializedClientCacheIntegrationTest.java rename to src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java index 868eeb27..e594eed3 100644 --- a/src/test/java/org/springframework/data/gemfire/client/LazyInitializedClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java @@ -33,9 +33,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** - * The LazyInitializedClientCacheIntegrationTest class is a test suite of test cases testing the proper behavior a - * lazy initialized ClientCache by the SDG ClientCacheFactoryBean when the ClientCache instance is "looked up" - * in fetchCache() to ascertain whether the client is durable and readyForEvents needs to be signaled or not. + * The SpringJavaConfiguredClientCacheIntegrationTest class is a test suite of test cases testing + * the proper configuration of a GemFire ClientCache instance using Spring Java-based configuration meta-data. * * @author John Blum * @see org.junit.Test @@ -46,12 +45,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner * @see com.gemstone.gemfire.cache.client.ClientCache * @link https://jira.spring.io/browse/SGF-441 - * @since 1.0.0 + * @since 1.8.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = LazyInitializedClientCacheIntegrationTest.GemFireConfiguration.class) +@ContextConfiguration(classes = SpringJavaConfiguredClientCacheIntegrationTest.GemFireConfiguration.class) @SuppressWarnings("unused") -public class LazyInitializedClientCacheIntegrationTest { +public class SpringJavaConfiguredClientCacheIntegrationTest { @Resource(name = "&clientCache") private ClientCacheFactoryBean clientCacheFactoryBean; @@ -63,7 +62,6 @@ public class LazyInitializedClientCacheIntegrationTest { public void clientCacheFactoryBeanConfiguration() { assertThat(clientCacheFactoryBean, is(notNullValue())); assertThat(clientCacheFactoryBean.getBeanName(), is(equalTo("clientCache"))); - assertThat(clientCacheFactoryBean.isLazyInitialize(), is(equalTo(true))); assertThat(clientCacheFactoryBean.getProperties(), is(equalTo(gemfireProperties))); } @@ -73,7 +71,7 @@ public class LazyInitializedClientCacheIntegrationTest { @Bean public Properties gemfireProperties() { Properties gemfireProperties = new Properties(); - gemfireProperties.setProperty("name", LazyInitializedClientCacheIntegrationTest.class.getSimpleName()); + gemfireProperties.setProperty("name", SpringJavaConfiguredClientCacheIntegrationTest.class.getSimpleName()); gemfireProperties.setProperty("mcast-port", "0"); gemfireProperties.setProperty("log-level", "warning"); return gemfireProperties; @@ -84,7 +82,6 @@ public class LazyInitializedClientCacheIntegrationTest { ClientCacheFactoryBean clientCacheFactoryBean = new ClientCacheFactoryBean(); clientCacheFactoryBean.setUseBeanFactoryLocator(false); clientCacheFactoryBean.setProperties(gemfireProperties()); - clientCacheFactoryBean.setLazyInitialize(true); return clientCacheFactoryBean; } } diff --git a/src/test/java/org/springframework/data/gemfire/config/CacheEagerInitTest.java b/src/test/java/org/springframework/data/gemfire/config/CacheEagerInitTest.java deleted file mode 100644 index f77a6e8e..00000000 --- a/src/test/java/org/springframework/data/gemfire/config/CacheEagerInitTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2010-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.data.gemfire.config; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.data.gemfire.CacheFactoryBean; -import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Costin Leau - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations="/org/springframework/data/gemfire/config/cache-eager-init.xml", - initializers=GemfireTestApplicationContextInitializer.class) -public class CacheEagerInitTest{ - @Autowired ApplicationContext ctx; - - @Test - public void testEagerInit() throws Exception { - CacheFactoryBean cfb = (CacheFactoryBean) ctx.getBean("&gemfireCache"); - cfb.afterPropertiesSet(); - assertTrue(!cfb.isLazyInitialize()); - } - -} diff --git a/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java index 22be6645..1b11d6e3 100644 --- a/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java @@ -36,7 +36,6 @@ import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.GemfireBeanFactoryLocator; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; -import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.util.ReflectionTestUtils; @@ -51,7 +50,7 @@ import com.gemstone.gemfire.cache.util.TimestampedEntryEvent; * @author John Blum */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "cache-ns.xml", initializers = GemfireTestApplicationContextInitializer.class) +@ContextConfiguration(locations = "cache-ns.xml") @SuppressWarnings("unused") public class CacheNamespaceTest{ diff --git a/src/test/java/org/springframework/data/gemfire/config/ClientCacheNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/ClientCacheNamespaceTest.java index 556e2076..96b425c3 100644 --- a/src/test/java/org/springframework/data/gemfire/config/ClientCacheNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/ClientCacheNamespaceTest.java @@ -28,7 +28,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; -import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -47,7 +46,7 @@ import com.gemstone.gemfire.pdx.PdxSerializer; * @since 1.6.3 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(initializers = GemfireTestApplicationContextInitializer.class) +@ContextConfiguration @SuppressWarnings("unused") public class ClientCacheNamespaceTest { @@ -62,9 +61,8 @@ public class ClientCacheNamespaceTest { @Test public void clientCacheFactoryBeanConfiguration() throws Exception { - assertThat(clientCacheFactoryBean.getCacheXml().toString(), containsString("path/to/bogus/cache.xml")); + assertThat(clientCacheFactoryBean.getCacheXml().toString(), containsString("empty-client-cache.xml")); assertThat(clientCacheFactoryBean.getProperties(), is(equalTo(gemfireProperties))); - assertThat(clientCacheFactoryBean.isLazyInitialize(), is(true)); assertThat(clientCacheFactoryBean.getCopyOnRead(), is(true)); assertThat(clientCacheFactoryBean.getCriticalHeapPercentage(), is(equalTo(0.85f))); assertThat(clientCacheFactoryBean.getDurableClientId(), is(equalTo("TestDurableClientId"))); diff --git a/src/test/java/org/springframework/data/gemfire/config/JndiBindingsPropertyPlaceholderTest.java b/src/test/java/org/springframework/data/gemfire/config/JndiBindingsPropertyPlaceholderTest.java index ea5e59d9..9468f975 100644 --- a/src/test/java/org/springframework/data/gemfire/config/JndiBindingsPropertyPlaceholderTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/JndiBindingsPropertyPlaceholderTest.java @@ -29,7 +29,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.CacheFactoryBean; -import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -48,8 +47,7 @@ import com.gemstone.gemfire.internal.datasource.ConfigProperty; * @since 1.4.0 * @since 7.0.1 (GemFire) */ -@ContextConfiguration(locations = "jndi-binding-with-property-placeholders-ns.xml", - initializers = GemfireTestApplicationContextInitializer.class) +@ContextConfiguration(locations = "jndi-binding-with-property-placeholders-ns.xml") @RunWith(SpringJUnit4ClassRunner.class) public class JndiBindingsPropertyPlaceholderTest { @@ -88,7 +86,7 @@ public class JndiBindingsPropertyPlaceholderTest { assertNotNull(attributes); assertFalse(attributes.isEmpty()); assertEquals("testDataSource", attributes.get("jndi-name")); - assertEquals("XAPoolDataSource", attributes.get("type")); + assertEquals("XAPooledDataSource", attributes.get("type")); assertEquals("60", attributes.get("blocking-timeout-seconds")); assertEquals("org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource", attributes.get("conn-pooled-datasource-class")); assertEquals("jdbc:derby:testDataStore;create=true", attributes.get("connection-url")); diff --git a/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java b/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java index 9107618f..eed5e310 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java @@ -10,6 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ + package org.springframework.data.gemfire.test; import java.util.Properties; @@ -34,7 +35,6 @@ public class MockCacheFactoryBean extends CacheFactoryBean { this(); if (cacheFactoryBean != null) { this.beanFactoryLocator = cacheFactoryBean.getBeanFactoryLocator(); - this.lazyInitialize = cacheFactoryBean.isLazyInitialize(); this.beanClassLoader = cacheFactoryBean.getBeanClassLoader(); this.beanFactory = cacheFactoryBean.getBeanFactory(); this.beanName = cacheFactoryBean.getBeanName(); @@ -68,6 +68,7 @@ public class MockCacheFactoryBean extends CacheFactoryBean { } @Override + @SuppressWarnings("unchecked") protected GemFireCache fetchCache() { ((StubCache) cache).setProperties(getProperties()); return cache; diff --git a/src/test/java/org/springframework/data/gemfire/test/StubCache.java b/src/test/java/org/springframework/data/gemfire/test/StubCache.java index c5e4280a..6186a43b 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubCache.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubCache.java @@ -117,6 +117,7 @@ public class StubCache implements Cache, ClientCache { public StubCache(){ allRegions = new HashMap(); gatewayHubs = new ArrayList(); + resourceManager = new StubResourceManager(); } /* (non-Javadoc) diff --git a/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java b/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java new file mode 100644 index 00000000..f4f4d90a --- /dev/null +++ b/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java @@ -0,0 +1,68 @@ +/* + * Copyright 2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.springframework.data.gemfire.test; + +import java.util.Collections; +import java.util.Set; + +import com.gemstone.gemfire.cache.control.RebalanceFactory; +import com.gemstone.gemfire.cache.control.RebalanceOperation; +import com.gemstone.gemfire.cache.control.ResourceManager; + +/** + * The StubResourceManager class... + * + * @author John Blum + * @since 1.0.0 + */ +public class StubResourceManager implements ResourceManager { + + private float criticalHeapPercentage; + private float evictionHeapPercentage; + + @Override + public void setCriticalHeapPercentage(final float heapPercentage) { + this.criticalHeapPercentage = heapPercentage; + } + + @Override + public float getCriticalHeapPercentage() { + return criticalHeapPercentage; + } + + @Override + public void setEvictionHeapPercentage(final float heapPercentage) { + this.evictionHeapPercentage = heapPercentage; + } + + @Override + public float getEvictionHeapPercentage() { + return this.evictionHeapPercentage; + } + + @Override + public RebalanceFactory createRebalanceFactory() { + throw new UnsupportedOperationException("Not Implemented"); + } + + @Override + public Set getRebalanceOperations() { + return Collections.emptySet(); + } + +} diff --git a/src/test/resources/clientcache-with-regions.xml b/src/test/resources/clientcache-with-regions.xml index 621fc9c8..5da078e9 100644 --- a/src/test/resources/clientcache-with-regions.xml +++ b/src/test/resources/clientcache-with-regions.xml @@ -2,10 +2,10 @@ - + - - + + diff --git a/src/test/resources/empty-cache.xml b/src/test/resources/empty-cache.xml new file mode 100644 index 00000000..05998c34 --- /dev/null +++ b/src/test/resources/empty-cache.xml @@ -0,0 +1,5 @@ + + + + diff --git a/src/test/resources/empty-client-cache.xml b/src/test/resources/empty-client-cache.xml new file mode 100644 index 00000000..cae36052 --- /dev/null +++ b/src/test/resources/empty-client-cache.xml @@ -0,0 +1,5 @@ + + + + diff --git a/src/test/resources/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest-context.xml index c6092f23..90954890 100644 --- a/src/test/resources/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest-context.xml @@ -27,8 +27,8 @@ HelloGroup - + diff --git a/src/test/resources/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml b/src/test/resources/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml deleted file mode 100644 index 2f7a2de0..00000000 --- a/src/test/resources/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - springGemFireRegionLookupsTestServer - 0 - warning - - - - - - - - - - - - - diff --git a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml b/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml index 68b74971..27520700 100644 --- a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml +++ b/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml @@ -16,6 +16,6 @@ + enable-auto-reconnect="false"/> diff --git a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml b/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml index 19e7604a..065d023f 100644 --- a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml +++ b/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml @@ -16,6 +16,6 @@ + enable-auto-reconnect="true"/> diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml index 748c6b63..9422deff 100644 --- a/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml +++ b/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml @@ -16,8 +16,8 @@ localhost[20668] - + diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml index c2c42707..f8dd80ea 100644 --- a/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml +++ b/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml @@ -16,8 +16,8 @@ localhost[20668] - + diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml b/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml index fe6d9d55..03b24711 100644 --- a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml @@ -21,10 +21,11 @@ config - + - + - + diff --git a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-context.xml b/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-context.xml index 3e4fa273..39d7bd0c 100644 --- a/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-context.xml @@ -23,12 +23,13 @@ warning - + + + - - - + diff --git a/src/test/resources/org/springframework/data/gemfire/client/client-cache-no-close.xml b/src/test/resources/org/springframework/data/gemfire/client/client-cache-no-close.xml index 28684fc6..95617e52 100644 --- a/src/test/resources/org/springframework/data/gemfire/client/client-cache-no-close.xml +++ b/src/test/resources/org/springframework/data/gemfire/client/client-cache-no-close.xml @@ -1,18 +1,19 @@ - - - - - + + warning + - + + diff --git a/src/test/resources/org/springframework/data/gemfire/config/ClientCacheNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/ClientCacheNamespaceTest-context.xml index 0980dbc1..6698fa35 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/ClientCacheNamespaceTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/ClientCacheNamespaceTest-context.xml @@ -9,6 +9,8 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd "> + + ClientCacheNamespaceTest 0 @@ -21,7 +23,7 @@ - - - - - CacheEagerInitConfig - 0 - warning - - - - - diff --git a/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml index f75a46e6..4111d0c2 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml @@ -9,8 +9,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - - + false diff --git a/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-with-property-placeholders-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-with-property-placeholders-ns.xml index 9adb6832..6ddac601 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-with-property-placeholders-ns.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-with-property-placeholders-ns.xml @@ -19,7 +19,7 @@ testDataSource - XAPoolDataSource + XAPooledDataSource 60 org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource jdbc:derby:testDataStore;create=true @@ -42,7 +42,7 @@ - + - springGemFireNoClientRegionLookupTest - 0 warning - - - - - + - + diff --git a/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-server-context.xml b/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-server-context.xml index 3877bb36..ee449f04 100644 --- a/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-server-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-server-context.xml @@ -25,7 +25,7 @@ warning - + diff --git a/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml b/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml index 7a7f7529..fb0b4ca4 100644 --- a/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml +++ b/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml @@ -10,17 +10,11 @@ "> - springGemFireNoClientRegionLookupTest - 0 warning - - - - - + diff --git a/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml b/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml index aa32b344..b7978d18 100644 --- a/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml +++ b/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml @@ -10,19 +10,13 @@ "> - springGemFireNoClientSubRegionLookupTest - 0 warning - - - - - +