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

SGF-384 - Issue with partitioned-region-template when persistence is enabled.

Browse Source
This commit is contained in:
John Blum
2015-03-18 17:53:09 -07:00
parent e514b004d8
commit e9251afa1d
10 changed files with 321 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,8 +73,7 @@ abstract class AbstractRegionParser extends AbstractSingleBeanDefinitionParser {
protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
super.doParse(element, builder);
builder.setAbstract(isRegionTemplate(element));
boolean subRegion = isSubRegion(element);
doParseRegion(element, parserContext, builder, subRegion);
doParseRegion(element, parserContext, builder, isSubRegion(element));
}
protected abstract void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
@@ -118,7 +117,7 @@ abstract class AbstractRegionParser extends AbstractSingleBeanDefinitionParser {
// Factory will enable gateway if it is not set and hub-id is set.
if (StringUtils.hasText(enableGateway)) {
if (GemfireUtils.isGemfireVersion7OrAbove()) {
log.warn("'enable-gateway' is deprecated since Gemfire 7.0");
log.warn("'enable-gateway' has been deprecated since Gemfire 7.0");
}
}
@@ -126,11 +125,11 @@ abstract class AbstractRegionParser extends AbstractSingleBeanDefinitionParser {
if (StringUtils.hasText(hubId)) {
if (GemfireUtils.isGemfireVersion7OrAbove()) {
log.warn("'hub-id' is deprecated since Gemfire 7.0");
log.warn("'hub-id' has been deprecated since Gemfire 7.0");
}
if (!CollectionUtils.isEmpty(DomUtils.getChildElementsByTagName(element, "gateway-sender"))) {
parserContext.getReaderContext().error("It is invalid to specify both 'hub-id' and 'gateway-sender'",
element);
parserContext.getReaderContext().error("specifying both 'hub-id' and 'gateway-sender' is invalid",
element);
}
}

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

@@ -20,6 +20,8 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
@@ -28,7 +30,6 @@ import org.springframework.core.Conventions;
import org.springframework.data.gemfire.EvictionAttributesFactoryBean;
import org.springframework.data.gemfire.ExpirationAttributesFactoryBean;
import org.springframework.data.gemfire.GemfireUtils;
import org.springframework.data.gemfire.InterestPolicyType;
import org.springframework.data.gemfire.SubscriptionAttributesFactoryBean;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
@@ -37,7 +38,6 @@ import org.w3c.dom.Element;
import com.gemstone.gemfire.cache.LossAction;
import com.gemstone.gemfire.cache.MembershipAttributes;
import com.gemstone.gemfire.cache.ResumptionAction;
import com.gemstone.gemfire.cache.Scope;
/**
* Utilities used by the Spring Data GemFire XML Namespace parsers.
@@ -51,8 +51,23 @@ abstract class ParsingUtils {
private static final Log log = LogFactory.getLog(ParsingUtils.class);
static void setPropertyValue(Element element, BeanDefinitionBuilder builder,
String attributeName, String propertyName, Object defaultValue) {
static void setPropertyReference(Element element, BeanDefinitionBuilder builder, String attributeName,
String propertyName) {
String attributeValue = element.getAttribute(attributeName);
if (StringUtils.hasText(attributeValue)) {
builder.addPropertyReference(propertyName, attributeValue);
}
}
@SuppressWarnings("unused")
static void setPropertyReference(Element element, BeanDefinitionBuilder builder, String attributeName) {
setPropertyReference(element, builder, attributeName, Conventions.attributeNameToPropertyName(attributeName));
}
static void setPropertyValue(Element element, BeanDefinitionBuilder builder, String attributeName,
String propertyName, Object defaultValue) {
String attributeValue = element.getAttribute(attributeName);
@@ -64,8 +79,8 @@ abstract class ParsingUtils {
}
}
static void setPropertyValue(Element element, BeanDefinitionBuilder builder,
String attributeName, String propertyName) {
static void setPropertyValue(Element element, BeanDefinitionBuilder builder, String attributeName,
String propertyName) {
setPropertyValue(element, builder, attributeName, propertyName, null);
}
@@ -73,16 +88,24 @@ abstract class ParsingUtils {
setPropertyValue(element, builder, attributeName, Conventions.attributeNameToPropertyName(attributeName));
}
static void setPropertyReference(Element element, BeanDefinitionBuilder builder,
String attributeName, String propertyName) {
static void setPropertyValue(BeanDefinitionBuilder builder, BeanDefinition source, String propertyName,
boolean withDependsOn) {
String attributeValue = element.getAttribute(attributeName);
PropertyValue propertyValue = source.getPropertyValues().getPropertyValue(propertyName);
if (StringUtils.hasText(attributeValue)) {
builder.addPropertyReference(propertyName, attributeValue);
if (propertyValue != null) {
builder.addPropertyValue(propertyValue.getName(), propertyValue.getValue());
if (withDependsOn && propertyValue.getValue() instanceof RuntimeBeanReference) {
builder.addDependsOn(((RuntimeBeanReference) propertyValue.getValue()).getBeanName());
}
}
}
static void setPropertyValue(BeanDefinitionBuilder builder, BeanDefinition source, String propertyName) {
setPropertyValue(builder, source, propertyName, false);
}
/**
* Utility method handling parsing of nested definition of the type:
*
@@ -126,7 +149,8 @@ abstract class ParsingUtils {
static Object parseRefOrNestedCustomElement(ParserContext parserContext, Element element,
BeanDefinitionBuilder builder) {
Object beanRef = ParsingUtils.getBeanReference(parserContext, element, "bean");
return (beanRef != null ? beanRef : parserContext.getDelegate().parseCustomElement(element, builder.getBeanDefinition()));
return (beanRef != null ? beanRef : parserContext.getDelegate().parseCustomElement(
element, builder.getBeanDefinition()));
}
static Object parseRefOrSingleNestedBeanDeclaration(ParserContext parserContext, Element element,
@@ -287,10 +311,6 @@ abstract class ParsingUtils {
static void parseOptionalRegionAttributes(ParserContext parserContext, Element element,
BeanDefinitionBuilder regionAttributesBuilder) {
if (!("partitioned-region".equals(element.getLocalName()))) {
setPropertyValue(element, regionAttributesBuilder, "persistent", "persistBackup");
}
setPropertyValue(element, regionAttributesBuilder, "cloning-enabled");
setPropertyValue(element, regionAttributesBuilder, "concurrency-level");
setPropertyValue(element, regionAttributesBuilder, "disk-synchronous");
@@ -309,11 +329,11 @@ abstract class ParsingUtils {
String concurrencyChecksEnabled = element.getAttribute("concurrency-checks-enabled");
if (StringUtils.hasText(concurrencyChecksEnabled)) {
if (!GemfireUtils.isGemfireVersion7OrAbove()) {
log.warn("Setting 'concurrency-checks-enabled' is only available in Gemfire 7.0 or above!");
if (GemfireUtils.isGemfireVersion7OrAbove()) {
ParsingUtils.setPropertyValue(element, regionAttributesBuilder, "concurrency-checks-enabled");
}
else {
ParsingUtils.setPropertyValue(element, regionAttributesBuilder, "concurrency-checks-enabled");
log.warn("Setting 'concurrency-checks-enabled' is only available in Gemfire 7.0 or above!");
}
}
}

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

@@ -58,7 +58,7 @@ class PartitionedRegionParser extends AbstractRegionParser {
BeanDefinitionBuilder regionAttributesBuilder = BeanDefinitionBuilder.genericBeanDefinition(
RegionAttributesFactoryBean.class);
super.doParseCommonRegionConfiguration(element, parserContext, regionBuilder, regionAttributesBuilder, subRegion);
doParseCommonRegionConfiguration(element, parserContext, regionBuilder, regionAttributesBuilder, subRegion);
regionBuilder.addPropertyValue("attributes", regionAttributesBuilder.getBeanDefinition());

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

@@ -47,7 +47,7 @@ class ReplicatedRegionParser extends AbstractRegionParser {
BeanDefinitionBuilder regionAttributesBuilder = BeanDefinitionBuilder.genericBeanDefinition(
RegionAttributesFactoryBean.class);
super.doParseCommonRegionConfiguration(element, parserContext, builder, regionAttributesBuilder, subRegion);
doParseCommonRegionConfiguration(element, parserContext, builder, regionAttributesBuilder, subRegion);
builder.addPropertyValue("attributes", regionAttributesBuilder.getBeanDefinition());
}