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

+ correctly rename Partition/RegionAttrFactory to XXXFactoryBean

Browse Source
This commit is contained in:
Costin Leau
2010-12-06 17:04:03 +02:00
parent bc769f354d
commit eb9b1d0092
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/gemfire/PartitionAttributesFactory.java → src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java
View File

@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.PartitionResolver;
* @author Costin Leau
*/
@SuppressWarnings("unchecked")
public class PartitionAttributesFactory implements FactoryBean<PartitionAttributes> {
public class PartitionAttributesFactoryBean implements FactoryBean<PartitionAttributes> {
private com.gemstone.gemfire.cache.PartitionAttributesFactory paf = new com.gemstone.gemfire.cache.PartitionAttributesFactory();

2
src/main/java/org/springframework/data/gemfire/RegionAttributesFactory.java → src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java
View File

@@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
*
* @author Costin Leau
*/
public class RegionAttributesFactory extends AttributesFactory implements FactoryBean<RegionAttributes>,
public class RegionAttributesFactoryBean extends AttributesFactory implements FactoryBean<RegionAttributes>,
InitializingBean {
private int[] diskSizes;

4
src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java
View File

@@ -23,7 +23,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.data.gemfire.RegionAttributesFactory;
import org.springframework.data.gemfire.RegionAttributesFactoryBean;
import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
import org.springframework.data.gemfire.client.Interest;
import org.springframework.data.gemfire.client.RegexInterest;
@@ -88,7 +88,7 @@ class ClientRegionParser extends AbstractSingleBeanDefinitionParser {
// eviction + overflow attributes
// client attributes
BeanDefinitionBuilder attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactory.class);
BeanDefinitionBuilder attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactoryBean.class);
boolean overwriteDataPolicy = false;

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

@@ -109,7 +109,7 @@ abstract class ParsingUtils {
* Parses disk store sub-element. Populates the given attribute factory with the proper attributes.
*
* @param element - element enclosing the disk-store definition
* @param beanBuilder - beanbuilder for a RegionAttributesFactory instance
* @param beanBuilder - beanbuilder for a RegionAttributesFactoryBean instance
* @return true if parsing actually occured, false otherwise
*/
static boolean parseDiskStorage(Element element, BeanDefinitionBuilder beanBuilder) {

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

@@ -22,8 +22,8 @@ import java.util.concurrent.ConcurrentMap;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.data.gemfire.PartitionAttributesFactory;
import org.springframework.data.gemfire.RegionAttributesFactory;
import org.springframework.data.gemfire.PartitionAttributesFactoryBean;
import org.springframework.data.gemfire.RegionAttributesFactoryBean;
import org.springframework.data.gemfire.RegionFactoryBean;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
@@ -75,13 +75,13 @@ class PartitionedRegionParser extends AbstractSingleBeanDefinitionParser {
builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
// region attributes
BeanDefinitionBuilder attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactory.class);
BeanDefinitionBuilder attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactoryBean.class);
ParsingUtils.parseEviction(parserContext, element, attrBuilder);
ParsingUtils.parseDiskStorage(element, attrBuilder);
// partition attributes
BeanDefinitionBuilder parAttrBuilder = BeanDefinitionBuilder.genericBeanDefinition(PartitionAttributesFactory.class);
BeanDefinitionBuilder parAttrBuilder = BeanDefinitionBuilder.genericBeanDefinition(PartitionAttributesFactoryBean.class);
attr = element.getAttribute("colocated-with");

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

@@ -21,7 +21,7 @@ import java.util.List;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.data.gemfire.RegionAttributesFactory;
import org.springframework.data.gemfire.RegionAttributesFactoryBean;
import org.springframework.data.gemfire.RegionFactoryBean;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
@@ -63,7 +63,7 @@ class ReplicatedRegionParser extends AbstractSingleBeanDefinitionParser {
builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
// add attributes
BeanDefinitionBuilder attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactory.class);
BeanDefinitionBuilder attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactoryBean.class);
attr = element.getAttribute("publisher");
if (StringUtils.hasText(attr)) {

4
src/test/resources/org/springframework/data/gemfire/client/basic-region.xml
View File

@@ -43,9 +43,9 @@
<!-- region with various attributes -->
<bean id="attr-region" class="org.springframework.data.gemfire.RegionFactoryBean" p:cache-ref="cache" lazy-init="true">
<property name="attributes">
<bean class="org.springframework.data.gemfire.RegionAttributesFactory" p:initial-capacity="1024">
<bean class="org.springframework.data.gemfire.RegionAttributesFactoryBean" p:initial-capacity="1024">
<property name="partitionAttributes">
<bean class="org.springframework.data.gemfire.PartitionAttributesFactory" p:redundant-copies="1" p:local-max-memory="512"/>
<bean class="org.springframework.data.gemfire.PartitionAttributesFactoryBean" p:redundant-copies="1" p:local-max-memory="512"/>
</property>
</bean>
</property>