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

SGF-479 - Remove lazy initialization option for configuring a GemFire cache.

Browse Source
This commit is contained in:
John Blum
2016-03-09 20:19:39 -08:00
parent 6bf5ceeaf6
commit b052f0ac8d
35 changed files with 145 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/resources/clientcache-with-regions.xml
View File

@@ -2,10 +2,10 @@
<!DOCTYPE client-cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
"http://www.gemstone.com/dtd/cache7_0.dtd">
<client-cache>
<region name="NativeClientRegion" refid="PROXY">
<region name="NativeClientRegion" refid="LOCAL">
<region-attributes cloning-enabled="false"/>
</region>
<region name="NativeClientParentRegion" refid="PROXY">
<region name="NativeClientChildRegion" refid="PROXY"/>
<region name="NativeClientParentRegion" refid="LOCAL">
<region name="NativeClientChildRegion" refid="LOCAL"/>
</region>
</client-cache>

5
src/test/resources/empty-cache.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
"http://www.gemstone.com/dtd/cache8_0.dtd">
<cache>
</cache>

5
src/test/resources/empty-client-cache.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE client-cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
"http://www.gemstone.com/dtd/cache8_0.dtd">
<client-cache>
</client-cache>

4
src/test/resources/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest-context.xml
View File

@@ -27,8 +27,8 @@
<prop key="groups">HelloGroup</prop>
</util:properties>
<gfe:cache cache-xml-location="lazy-wiring-declarable-support-function-cache.xml"
properties-ref="gemfireProperties" lazy-init="false" use-bean-factory-locator="true"/>
<gfe:cache cache-xml-location="lazy-wiring-declarable-support-function-cache.xml" properties-ref="gemfireProperties"
use-bean-factory-locator="true"/>
<gfe-data:function-executions base-package="org.springframework.data.gemfire.function.sample">
<gfe-data:include-filter type="assignable" expression="org.springframework.data.gemfire.function.sample.HelloFunctionExecution"/>

28
src/test/resources/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml
View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:gfe="http://www.springframework.org/schema/gemfire"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
">
<util:properties id="gemfireProperties">
<prop key="name">springGemFireRegionLookupsTestServer</prop>
<prop key="mcast-port">0</prop>
<prop key="log-level">warning</prop>
</util:properties>
<gfe:cache properties-ref="gemfireProperties"/>
<gfe:cache-server auto-startup="true" port="54321" max-connections="1"/>
<gfe:replicated-region id="NativeClientRegion" persistent="false"/>
<gfe:replicated-region id="NativeClientParentRegion" persistent="false">
<gfe:replicated-region name="NativeClientChildRegion" persistent="false"/>
</gfe:replicated-region>
</beans>

2
src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml
View File

@@ -16,6 +16,6 @@
</util:properties>
<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"
enable-auto-reconnect="false" lazy-init="false"/>
enable-auto-reconnect="false"/>
</beans>

2
src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml
View File

@@ -16,6 +16,6 @@
</util:properties>
<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"
enable-auto-reconnect="true" lazy-init="false"/>
enable-auto-reconnect="true"/>
</beans>

4
src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml
View File

@@ -16,8 +16,8 @@
<prop key="locators">localhost[20668]</prop>
</util:properties>
<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"
use-cluster-configuration="true" cache-xml-location="/clusterconfig-cache.xml" lazy-init="false"/>
<gfe:cache cache-xml-location="/clusterconfig-cache.xml" properties-ref="gemfireProperties"
use-bean-factory-locator="false" use-cluster-configuration="true"/>
<gfe:lookup-region id="ClusterConfigRegion"/>

4
src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml
View File

@@ -16,8 +16,8 @@
<prop key="locators">localhost[20668]</prop>
</util:properties>
<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"
use-cluster-configuration="false" cache-xml-location="/clusterconfig-cache.xml" lazy-init="false"/>
<gfe:cache cache-xml-location="/clusterconfig-cache.xml" properties-ref="gemfireProperties"
use-bean-factory-locator="false" use-cluster-configuration="false"/>
<!-- Should throw an Exception! -->
<gfe:lookup-region id="ClusterConfigRegion"/>

7
src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml
View File

@@ -21,10 +21,11 @@
<prop key="log-level">config</prop>
</util:properties>
<gfe:pool locators="${gemfire.cache.client.locator.host-and-port}"/>
<gfe:client-cache properties-ref="gemfireProperties" pool-name="locatorPool"/>
<gfe:client-cache properties-ref="gemfireProperties"/>
<gfe:pool id="locatorPool" locators="${gemfire.cache.client.locator.host-and-port}"/>
<gfe:client-region id="Example" shortcut="PROXY" key-constraint="java.lang.String" value-constraint="java.lang.Integer"/>
<gfe:client-region id="Example" pool-name="locatorPool" shortcut="PROXY"
key-constraint="java.lang.String" value-constraint="java.lang.Integer"/>
</beans>

9
src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableServersTest-context.xml
View File

@@ -23,12 +23,13 @@
<prop key="log-level">warning</prop>
</util:properties>
<gfe:pool servers="${gemfire.cache.client.server.hosts-and-ports}">
<gfe:client-cache properties-ref="gemfireProperties" pool-name="serverPool"/>
<gfe:pool id="serverPool" servers="${gemfire.cache.client.server.hosts-and-ports}">
<gfe:server host="${gemfire.cache.client.server.host.3}" port="${gemfire.cache.client.server.port.3}"/>
</gfe:pool>
<gfe:client-cache properties-ref="gemfireProperties"/>
<gfe:client-region id="Example" shortcut="PROXY" key-constraint="java.lang.String" value-constraint="java.lang.Integer"/>
<gfe:client-region id="Example" pool-name="serverPool" shortcut="PROXY"
key-constraint="java.lang.String" value-constraint="java.lang.Integer"/>
</beans>

13
src/test/resources/org/springframework/data/gemfire/client/client-cache-no-close.xml
View File

@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:gfe="http://www.springframework.org/schema/gemfire"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
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
http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
">
<gfe:pool keep-alive="true">
<gfe:server host="localhost" port="40404"/>
</gfe:pool>
<gfe:client-cache close="false" use-bean-factory-locator="false"/>
<util:properties id="gemfireProperties">
<prop key="log-level">warning</prop>
</util:properties>
<gfe:client-region id="r1" data-policy="EMPTY" ignore-if-exists="true"/>
<gfe:client-cache properties-ref="gemfireProperties" close="false"/>
<gfe:client-region id="r1" shortcut="LOCAL" ignore-if-exists="true"/>
</beans>

4
src/test/resources/org/springframework/data/gemfire/config/ClientCacheNamespaceTest-context.xml
View File

@@ -9,6 +9,8 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
">
<bean class="org.springframework.data.gemfire.test.GemfireTestBeanPostProcessor"/>
<util:properties id="gemfireProperties">
<prop key="name">ClientCacheNamespaceTest</prop>
<prop key="mcast-port">0</prop>
@@ -21,7 +23,7 @@
<bean id="reflectionPdxSerializer" class="com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer"/>
<gfe:client-cache cache-xml-location="/path/to/bogus/cache.xml" properties-ref="gemfireProperties" lazy-init="true"
<gfe:client-cache cache-xml-location="empty-client-cache.xml" properties-ref="gemfireProperties"
durable-client-id="TestDurableClientId" durable-client-timeout="600"
copy-on-read="true" critical-heap-percentage="0.85" eviction-heap-percentage="0.65"
pdx-serializer-ref="reflectionPdxSerializer" pdx-ignore-unread-fields="true" pdx-persistent="false"

20
src/test/resources/org/springframework/data/gemfire/config/cache-eager-init.xml
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:gfe="http://www.springframework.org/schema/gemfire"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
">
<util:properties id="gemfireProperties">
<prop key="name">CacheEagerInitConfig</prop>
<prop key="mcast-port">0</prop>
<prop key="log-level">warning</prop>
</util:properties>
<gfe:cache properties-ref="gemfireProperties" lazy-init="false"/>
</beans>

3
src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml
View File

@@ -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">
<!-- all beans are lazy to allow the same config to be used between multiple tests -->
<!-- as there can be only one GemFire cache per VM -->
<bean class="org.springframework.data.gemfire.test.GemfireTestBeanPostProcessor"/>
<util:properties id="gemfireProperties">
<prop key="disable-tcp">false</prop>

4
src/test/resources/org/springframework/data/gemfire/config/jndi-binding-with-property-placeholders-ns.xml
View File

@@ -19,7 +19,7 @@
<util:properties id="jndi-binding-settings">
<prop key="jndi.binding.name">testDataSource</prop>
<prop key="jndi.binding.type">XAPoolDataSource</prop>
<prop key="jndi.binding.type">XAPooledDataSource</prop>
<prop key="jndi.binding.blocking.timeout.seconds">60</prop>
<prop key="jndi.binding.conn.pooled.datasource.class">org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</prop>
<prop key="jndi.binding.connection.url">jdbc:derby:testDataStore;create=true</prop>
@@ -42,7 +42,7 @@
<context:property-placeholder properties-ref="jndi-binding-settings"/>
<gfe:cache properties-ref="gemfireProperties" lazy-init="true">
<gfe:cache properties-ref="gemfireProperties">
<gfe:jndi-binding jndi-name="${jndi.binding.name}"
type="${jndi.binding.type}"
blocking-timeout-seconds="${jndi.binding.blocking.timeout.seconds}"

13
src/test/resources/org/springframework/data/gemfire/enableClientRegionLookupsTest.xml
View File

@@ -10,23 +10,14 @@
">
<util:properties id="gemfireProperties">
<prop key="name">springGemFireNoClientRegionLookupTest</prop>
<prop key="mcast-port">0</prop>
<prop key="log-level">warning</prop>
</util:properties>
<gfe:pool min-connections="1" max-connections="1">
<gfe:server host="localhost" port="54321"/>
</gfe:pool>
<gfe:client-cache cache-xml-location="/clientcache-with-regions.xml" properties-ref="gemfireProperties"/>
<gfe:client-region id="NativeClientRegion" ignore-if-exists="true"
cloning-enabled="true"
persistent="false"
shortcut="LOCAL"/>
<gfe:client-region id="NativeClientRegion" ignore-if-exists="true" cloning-enabled="true" persistent="false" shortcut="LOCAL"/>
<gfe:client-region id="NativeClientParentRegion" ignore-if-exists="true">
<gfe:client-region id="NativeClientParentRegion" ignore-if-exists="true" shortcut="LOCAL">
<gfe:client-region name="NativeClientChildRegion" ignore-if-exists="true" shortcut="LOCAL"/>
</gfe:client-region>

2
src/test/resources/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest-server-context.xml
View File

@@ -25,7 +25,7 @@
<prop key="log-level">warning</prop>
</util:properties>
<gfe:cache properties-ref="gemfireProperties" lazy-init="false"/>
<gfe:cache properties-ref="gemfireProperties"/>
<gfe:cache-server auto-startup="true" bind-address="${server.bind-address}" port="${server.port}"
host-name-for-clients="${server.hostname-for-clients}" max-connections="${server.max-connections}"/>

8
src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml
View File

@@ -10,17 +10,11 @@
">
<util:properties id="gemfireProperties">
<prop key="name">springGemFireNoClientRegionLookupTest</prop>
<prop key="mcast-port">0</prop>
<prop key="log-level">warning</prop>
</util:properties>
<gfe:pool min-connections="1" max-connections="1">
<gfe:server host="localhost" port="54321"/>
</gfe:pool>
<gfe:client-cache cache-xml-location="/clientcache-with-regions.xml" properties-ref="gemfireProperties"/>
<gfe:client-region id="NativeClientRegion" persistent="false" shortcut="PROXY"/>
<gfe:client-region id="NativeClientRegion" shortcut="LOCAL"/>
</beans>

8
src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml
View File

@@ -10,19 +10,13 @@
">
<util:properties id="gemfireProperties">
<prop key="name">springGemFireNoClientSubRegionLookupTest</prop>
<prop key="mcast-port">0</prop>
<prop key="log-level">warning</prop>
</util:properties>
<gfe:pool min-connections="1" max-connections="1">
<gfe:server host="localhost" port="54321"/>
</gfe:pool>
<gfe:client-cache cache-xml-location="/clientcache-with-regions.xml" properties-ref="gemfireProperties"/>
<gfe:lookup-region id="NativeClientParentRegion">
<gfe:client-region name="NativeClientChildRegion" persistent="false" shortcut="PROXY"/>
<gfe:client-region name="NativeClientChildRegion" shortcut="LOCAL"/>
</gfe:lookup-region>
</beans>