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

Completed changes for client ready-for-events attribute implementation.

Browse Source
This commit is contained in:
Lyndon Adams
2013-02-12 10:03:15 +00:00
parent b4bfda1b9b
commit d5edd33fcd
6 changed files with 124 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

7
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",GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME);
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");
}
}

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

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

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

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

@@ -0,0 +1,44 @@
/*
* 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.GemfireTestRunner;
import org.springframework.test.context.ContextConfiguration;
/**
* @author Lyndon Adams
*
*/
@RunWith(GemfireTestRunner.class)
@ContextConfiguration("client-readyforevents-cache.xml")
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 );
}
}

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>