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

fixed ClientCacheParser

Browse Source
This commit is contained in:
David Turanski
2013-02-12 09:14:18 -05:00
parent 9b9bc5dbb4 d5edd33fcd
commit 7bce8b649c
9 changed files with 138 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/src/reference/docbook/appendix/appendix-schema.xml
View File

@@ -3,14 +3,14 @@
<title>Spring Data GemFire Schema</title>
<para>Spring Data GemFire Core Schema (gfe)</para>
<programlisting language="xml"><xi:include href="../../../src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude">
<programlisting language="xml"><xi:include href="../../../src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.3.xsd" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:fallback>
<para><emphasis>FIXME: SGF SCHEMA LOCATION/NAME CHANGED</emphasis></para>
</xi:fallback>
</xi:include>
</programlisting>
<para>Spring Data GemFire Data Access Schema (gfe-data)</para>
<programlisting language="xml"><xi:include href="../../../src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-1.2.xsd" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude">
<programlisting language="xml"><xi:include href="../../../src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-1.3.xsd" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:fallback>
<para><emphasis>FIXME: SGF SCHEMA LOCATION/NAME CHANGED</emphasis></para>
</xi:fallback>

11
docs/src/reference/docbook/index.xml
View File

@@ -25,6 +25,11 @@
<surname>Turanski</surname>
<affiliation>SpringSource, a division of VMware</affiliation>
</author>
<author>
<firstname>Lyndon</firstname>
<surname>Adams</surname>
<affiliation>VMware</affiliation>
</author>
</authorgroup>
@@ -62,12 +67,8 @@
<xi:include href="reference/data.xml"/>
<xi:include href="reference/serialization.xml"/>
<xi:include href="reference/mapping.xml"/>
<!--
<xi:include href="https://github.com/SpringSource/spring-data-commons/raw/master/src/docbkx/repositories.xml">
<xi:fallback href="../../../../../../spring-data-commons/src/docbkx/repositories.xml" />
</xi:include>
-->
<xi:include href="reference/repositories.xml"/>
<xi:include href="reference/function-annotations.xml"/>
<xi:include href="reference/samples.xml"/>
</part>

3
docs/src/reference/docbook/reference/introduction.xml
View File

@@ -27,6 +27,9 @@
<para><xref linkend="gemfire-repositories"/> describes how to create and
use GemFire Repositories using Spring Data</para>
<para><xref linkend="function-annotations"/> describes how to create and
use GemFire Functions using Spring Data</para>
<para><xref linkend="samples"/> describes the samples provided with the
distribution to illustrate the various features available in Spring
GemFire.</para>

42
src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java
View File

@@ -27,6 +27,7 @@ import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.GemFireCache;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.client.PoolManager;
@@ -38,6 +39,7 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
* configuration of the generic cache).
*
* @author Costin Leau
* @author Lyndon Adams
*/
public class ClientCacheFactoryBean extends CacheFactoryBean {
@@ -78,12 +80,22 @@ public class ClientCacheFactoryBean extends CacheFactoryBean {
private String poolName;
private Pool pool;
protected Boolean readyForEvents = false;
@Override
protected GemFireCache createCache(Object factory) {
ClientCacheFactory ccf = (ClientCacheFactory) factory;
initializePool(ccf);
return ccf.create();
// Now create the cache
GemFireCache cache = ccf.create();
// Register for events after pool/regions been created and iff non-durable client
readyForEvents();
// Return the cache
return cache;
}
@Override
@@ -176,6 +188,20 @@ public class ClientCacheFactoryBean extends CacheFactoryBean {
}
}
/**
* Inform cluster client cache is ready to receive events.
*/
private void readyForEvents(){
ClientCache clientCache = ClientCacheFactory.getAnyInstance();
if( readyForEvents != null && readyForEvents.booleanValue() && !clientCache.isClosed()){
try {
clientCache.readyForEvents();
}catch(IllegalStateException ex){
// Cannot be called for a non-durable client so exception is throw
}
}
}
/**
* Sets the pool name used by this client.
*
@@ -186,6 +212,19 @@ public class ClientCacheFactoryBean extends CacheFactoryBean {
this.poolName = poolName;
}
/**
* Set the readyForEvents event flag.
*
* @param readyForEvents
*/
public void setReadyForEvents(Boolean readyForEvents){
this.readyForEvents = readyForEvents;
}
public Boolean getReadyForEvents(){
return this.readyForEvents;
}
/**
* Sets the pool used by this client.
*
@@ -202,4 +241,5 @@ public class ClientCacheFactoryBean extends CacheFactoryBean {
new PdxOptions((ClientCacheFactory) factory).run();
}
}
}

9
src/main/java/org/springframework/data/gemfire/config/ClientCacheParser.java
View File

@@ -26,6 +26,7 @@ import org.w3c.dom.Element;
*
* @author Costin Leau
* @author David Turanski
* @author Lyndon Adams
*/
class ClientCacheParser extends CacheParser {
@@ -37,12 +38,12 @@ class ClientCacheParser extends CacheParser {
@Override
protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
super.doParse(element, parserContext, builder);
//ParsingUtils.setPropertyValue(element, builder, "pool-name","poolName",GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME);
ParsingUtils.setPropertyValue(element, builder, "pool-name", "poolName");
ParsingUtils.setPropertyValue(element, builder, "ready-for-events");
}
@Override
protected void postProcessDynamicRegionSupport(Element element, BeanDefinitionBuilder dynamicRegionSupport) {
ParsingUtils.setPropertyValue(element, dynamicRegionSupport, "pool-name");
ParsingUtils.setPropertyValue(element, dynamicRegionSupport, "pool-name");
}
}
}

28
src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.3.xsd
View File

@@ -322,18 +322,26 @@ Defines a GemFire Client Cache instance used for creating or retrieving 'regions
</xsd:appinfo>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="cacheBaseType">
<xsd:attribute name="pool-name" type="xsd:string"
use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[
<xsd:complexContent>
<xsd:extension base="cacheBaseType">
<xsd:attribute name="pool-name" type="xsd:string"
use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[
The name of the pool used by this client.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="ready-for-events"
type="xsd:string" use="optional" default="false">
<xsd:annotation>
<xsd:documentation><![CDATA[
Notifies the server that this durable client is ready to receive updates.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<!-- -->

46
src/test/java/org/springframework/data/gemfire/client/ClientReadyForEventsTest.java Normal file
View File

@@ -0,0 +1,46 @@
/*
* 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.client;
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.TestUtils;
import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Lyndon Adams
*
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations="client-readyforevents-cache.xml",
initializers=GemfireTestApplicationContextInitializer.class)
public class ClientReadyForEventsTest {
@Autowired ApplicationContext ctx;
@Test
public void testReadyForEvents() throws Exception {
ClientCacheFactoryBean cfb = (ClientCacheFactoryBean) ctx.getBean("&gemfireCache");
Boolean readyforevents = (Boolean) TestUtils.readField("readyForEvents", cfb);
assertTrue( readyforevents );
}
}

2
src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java
View File

@@ -20,6 +20,7 @@ import com.gemstone.gemfire.cache.client.ClientCacheFactory;
/**
* @author David Turanski
* @author Lyndon Adams
*
*/
public class MockClientCacheFactoryBean extends ClientCacheFactoryBean {
@@ -56,6 +57,7 @@ public class MockClientCacheFactoryBean extends ClientCacheFactoryBean {
this.searchTimeout = cacheFactoryBean.getSearchTimeout();
this.transactionListeners = cacheFactoryBean.getTransactionListeners();
this.transactionWriter = cacheFactoryBean.getTransactionWriter();
this.readyForEvents = cacheFactoryBean.getReadyForEvents();
}
}

15
src/test/resources/org/springframework/data/gemfire/client/client-readyforevents-cache.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:gfe="http://www.springframework.org/schema/gemfire"
xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<gfe:client-cache ready-for-events="true"/>
<gfe:client-region id="simple"/>
<gfe:pool id="gemfire-pool" subscription-enabled="false">
<gfe:locator host="localhost" port="40403"/>
</gfe:pool>
</beans>