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

added membership attributes support

Browse Source
This commit is contained in:
David Turanski
2012-07-03 12:18:33 -04:00
parent bb34beb224
commit e9d1173b05
8 changed files with 146 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java
View File

@@ -89,8 +89,8 @@ abstract class AbstractRegionParser extends AliasReplacingBeanDefinitionParser {
this.registerBeanDefinition(new BeanDefinitionHolder(subRegionDef, regionPath), parserContext.getRegistry());
}
protected void doParseRegionCommon(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
BeanDefinitionBuilder attrBuilder, boolean subRegion) {
protected void doParseCommonRegionConfiguration(Element element, ParserContext parserContext,
BeanDefinitionBuilder builder, BeanDefinitionBuilder attrBuilder, boolean subRegion) {
if (!subRegion) {
String cacheRef = element.getAttribute("cache-ref");
@@ -110,6 +110,7 @@ abstract class AbstractRegionParser extends AliasReplacingBeanDefinitionParser {
ParsingUtils.parseExpiration(parserContext, element, attrBuilder);
ParsingUtils.parseEviction(parserContext, element, attrBuilder);
ParsingUtils.parseMembershipAttributes(parserContext, element, attrBuilder);
List<Element> subElements = DomUtils.getChildElements(element);

2
src/main/java/org/springframework/data/gemfire/config/LocalRegionParser.java
View File

@@ -50,7 +50,7 @@ class LocalRegionParser extends AbstractRegionParser {
BeanDefinitionBuilder attrBuilder = subRegion ? builder : BeanDefinitionBuilder
.genericBeanDefinition(RegionAttributesFactoryBean.class);
super.doParseRegionCommon(element, parserContext, builder, attrBuilder, subRegion);
super.doParseCommonRegionConfiguration(element, parserContext, builder, attrBuilder, subRegion);
if (!subRegion) {
builder.addPropertyValue("attributes", attrBuilder.getBeanDefinition());
}

30
src/main/java/org/springframework/data/gemfire/config/ParsingUtils.java
View File

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedArray;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
@@ -34,6 +35,9 @@ import org.w3c.dom.Element;
import com.gemstone.gemfire.cache.ExpirationAction;
import com.gemstone.gemfire.cache.ExpirationAttributes;
import com.gemstone.gemfire.cache.LossAction;
import com.gemstone.gemfire.cache.MembershipAttributes;
import com.gemstone.gemfire.cache.ResumptionAction;
import com.gemstone.gemfire.cache.Scope;
/**
@@ -243,7 +247,33 @@ abstract class ParsingUtils {
if (StringUtils.hasText(indexUpdateType)) {
attrBuilder.addPropertyValue("indexMaintenanceSynchronous", "synchronous".equals(indexUpdateType));
}
}
static void parseMembershipAttributes(ParserContext parserContext, Element element,
BeanDefinitionBuilder attrBuilder) {
Element membershipAttributes = DomUtils.getChildElementByTagName(element, "membership-attributes");
if (membershipAttributes != null) {
String requiredRoles[] = StringUtils.commaDelimitedListToStringArray(membershipAttributes
.getAttribute("required-roles"));
String lossActionAttr = membershipAttributes.getAttribute("loss-action");
LossAction lossAction = StringUtils.hasText(lossActionAttr) ? LossAction.fromName(lossActionAttr
.toUpperCase().replace("-", "_")) : null;
String resumptionActionAttr = membershipAttributes.getAttribute("resumption-action");
ResumptionAction resumptionAction = StringUtils.hasText(resumptionActionAttr) ? ResumptionAction
.fromName(resumptionActionAttr.toUpperCase().replace("-", "_")) : null;
ManagedArray requiredRolesArray = new ManagedArray("java.lang.String", requiredRoles.length);
for (int i = 0; i < requiredRoles.length; i++) {
requiredRolesArray.add(requiredRoles[i]);
}
BeanDefinitionBuilder membershipAttributesBuilder = BeanDefinitionBuilder
.genericBeanDefinition(MembershipAttributes.class);
membershipAttributesBuilder.addConstructorArgValue(requiredRolesArray);
membershipAttributesBuilder.addConstructorArgValue(lossAction);
membershipAttributesBuilder.addConstructorArgValue(resumptionAction);
attrBuilder.addPropertyValue("membershipAttributes", membershipAttributesBuilder.getRawBeanDefinition());
}
}
static void parseScope(Element element, BeanDefinitionBuilder builder) {

2
src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java
View File

@@ -68,7 +68,7 @@ class PartitionedRegionParser extends AbstractRegionParser {
BeanDefinitionBuilder attrBuilder = subRegion ? builder : BeanDefinitionBuilder
.genericBeanDefinition(RegionAttributesFactoryBean.class);
super.doParseRegionCommon(element, parserContext, builder, attrBuilder, subRegion);
super.doParseCommonRegionConfiguration(element, parserContext, builder, attrBuilder, subRegion);
//
// partition attributes
BeanDefinitionBuilder parAttrBuilder = BeanDefinitionBuilder

2
src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
View File

@@ -48,7 +48,7 @@ class ReplicatedRegionParser extends AbstractRegionParser {
BeanDefinitionBuilder attrBuilder = subRegion ? builder : BeanDefinitionBuilder
.genericBeanDefinition(RegionAttributesFactoryBean.class);
super.doParseRegionCommon(element, parserContext, builder, attrBuilder, subRegion);
super.doParseCommonRegionConfiguration(element, parserContext, builder, attrBuilder, subRegion);
if (!subRegion) {
builder.addPropertyValue("attributes", attrBuilder.getBeanDefinition());
}

32
src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd
View File

@@ -389,6 +389,38 @@ use inner bean declarations.
</xsd:attribute>
</xsd:complexType>
</xsd:element>
<xsd:element name="membership-attributes" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation><![CDATA[
Configures a Region to require one or more membership roles to be present in the system for reliable access to the Region
]]></xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:attribute name="required-roles" type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation><![CDATA[
A comma delimited list of required role names
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="loss-action" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[
Specifies the behavior when one or more required roles are missing:
(full-access, limited-access, no-access, or reconnect)
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="resumption-action" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[
Specifies how the region is affected by resumption of reliability
when one or more missing required roles is restored to the distributed membership (none or reinitialize)
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="persistent" type="xsd:string" default="false">
<xsd:annotation>

57
src/test/java/org/springframework/data/gemfire/config/MembershipAttributesTest.java Normal file
View File

@@ -0,0 +1,57 @@
/*
* Copyright 2010-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.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.springframework.data.gemfire.RecreatingContextTest;
import com.gemstone.gemfire.cache.LossAction;
import com.gemstone.gemfire.cache.MembershipAttributes;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.ResumptionAction;
import com.gemstone.gemfire.distributed.Role;
/**
* @author David Turanski
*
*/
public class MembershipAttributesTest extends RecreatingContextTest {
@Override
protected String location() {
return "org/springframework/data/gemfire/config/membership-attributes-ns.xml";
}
@Test
public void testMembershipAttributes() {
Region<?, ?> simple = ctx.getBean("simple", Region.class);
MembershipAttributes ma = simple.getAttributes().getMembershipAttributes();
assertFalse(ma.hasRequiredRoles());
Region<?, ?> secure = ctx.getBean("secure", Region.class);
ma = secure.getAttributes().getMembershipAttributes();
assertTrue(ma.hasRequiredRoles());
assertEquals(ResumptionAction.REINITIALIZE, ma.getResumptionAction());
assertEquals(LossAction.LIMITED_ACCESS, ma.getLossAction());
for (Role role : ma.getRequiredRoles()) {
assertTrue("ROLE1".equals(role.getName()) || "ROLE2".equals(role.getName()));
}
}
}

21
src/test/resources/org/springframework/data/gemfire/config/membership-attributes-ns.xml Normal file
View File

@@ -0,0 +1,21 @@
<?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"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:util="http://www.springframework.org/schema/util"
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
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" default-lazy-init="true">
<gfe:cache />
<gfe:replicated-region id="secure">
<gfe:membership-attributes
required-roles="ROLE1,ROLE2"
loss-action="limited-access"
resumption-action="reinitialize"/>
</gfe:replicated-region>
<gfe:replicated-region id="simple"/>
</beans>