diff --git a/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java index 944e41e6..74854abe 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java @@ -23,9 +23,9 @@ import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.RegionAttributes; /** - * Spring-friendly bean for creating {@link RegionAttributes}. Eliminates the - * need of using a XML 'factory-method' tag. - * + * Spring-friendly bean for creating {@link RegionAttributes}. Eliminates the need of using + * a XML 'factory-method' tag. + *

* @author Costin Leau */ public class RegionAttributesFactoryBean extends AttributesFactory implements FactoryBean, @@ -33,11 +33,6 @@ public class RegionAttributesFactoryBean extends AttributesFactory implements Fa private RegionAttributes attributes; - @Override - public void afterPropertiesSet() throws Exception { - attributes = super.create(); - } - @Override public RegionAttributes getObject() throws Exception { return attributes; @@ -52,4 +47,10 @@ public class RegionAttributesFactoryBean extends AttributesFactory implements Fa public boolean isSingleton() { return true; } -} \ No newline at end of file + + @Override + public void afterPropertiesSet() throws Exception { + attributes = super.create(); + } + +} diff --git a/src/main/java/org/springframework/data/gemfire/RegionLookupFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionLookupFactoryBean.java index f21843d7..dfdcadb3 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionLookupFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/RegionLookupFactoryBean.java @@ -49,15 +49,15 @@ public class RegionLookupFactoryBean implements FactoryBean>, public void afterPropertiesSet() throws Exception { Assert.notNull(cache, "Cache property must be set"); - name = (!StringUtils.hasText(name) ? beanName : name); - Assert.hasText(name, "Name (or beanName) property must be set"); + name = (StringUtils.hasText(name) ? name : beanName); + Assert.hasText(name, "The 'name' or 'beanName' property must be set."); synchronized (cache) { region = cache.getRegion(name); - if (region != null) { - log.info("Retrieved region [" + name + "] from cache"); - } + if (region != null) { + log.info(String.format("Retrieved region [%1$s] from cache [%2$s].", name, cache.getName())); + } else { region = lookupFallback(cache, name); } diff --git a/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java index c0b7a612..479e14d6 100644 --- a/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java @@ -89,7 +89,8 @@ class PartitionedRegionParser extends AbstractRegionParser { @SuppressWarnings("rawtypes") ManagedList fixedPartitionAttributes = new ManagedList(); for (Element fp: fixedPartitions) { - BeanDefinitionBuilder fpaBuilder = BeanDefinitionBuilder.genericBeanDefinition(FixedPartitionAttributesFactoryBean.class); + BeanDefinitionBuilder fpaBuilder = BeanDefinitionBuilder.genericBeanDefinition( + FixedPartitionAttributesFactoryBean.class); ParsingUtils.setPropertyValue(fp, fpaBuilder, "partition-name"); ParsingUtils.setPropertyValue(fp, fpaBuilder, "num-buckets"); ParsingUtils.setPropertyValue(fp, fpaBuilder, "primary"); @@ -123,7 +124,8 @@ class PartitionedRegionParser extends AbstractRegionParser { } } - private Object parsePartitionResolver(ParserContext parserContext, Element subElement, BeanDefinitionBuilder builder) { + private Object parsePartitionResolver(ParserContext parserContext, Element subElement, + BeanDefinitionBuilder builder) { return ParsingUtils.parseRefOrSingleNestedBeanDeclaration(parserContext, subElement, builder); }