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

DATAGEODE-184 - Apply RegionConfigurers to Caching-defined Regions.

Browse Source
This commit is contained in:
John Blum
2019-05-09 22:53:29 -07:00
parent 8bc682a0c0
commit 1bd20457ee
4 changed files with 162 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsConfiguration.java
View File

@@ -20,6 +20,7 @@ import static java.util.Arrays.asList;
import static java.util.Arrays.stream;
import static org.springframework.data.gemfire.util.ArrayUtils.asArray;
import static org.springframework.data.gemfire.util.ArrayUtils.nullSafeArray;
import static org.springframework.data.gemfire.util.CollectionUtils.nullSafeMap;
import static org.springframework.data.gemfire.util.StreamUtils.concat;
import java.lang.annotation.Annotation;
@@ -30,6 +31,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -47,6 +49,8 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.Pool;
import org.springframework.beans.BeanInstantiationException;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.cache.annotation.CacheEvict;
@@ -113,6 +117,9 @@ public class CachingDefinedRegionsConfiguration extends AbstractAnnotationConfig
private ClientRegionShortcut clientRegionShortcut = ClientRegionShortcut.PROXY;
@Autowired(required = false)
private List<RegionConfigurer> regionConfigurers = Collections.emptyList();
private RegionShortcut serverRegionShortcut = RegionShortcut.PARTITION;
private String poolName = ClientRegionFactoryBean.DEFAULT_POOL_NAME;
@@ -303,6 +310,7 @@ public class CachingDefinedRegionsConfiguration extends AbstractAnnotationConfig
regionFactoryBean.setCache(gemfireCache);
regionFactoryBean.setClientRegionShortcut(resolveClientRegionShortcut());
regionFactoryBean.setRegionConfigurers(resolveRegionConfigurers());
regionFactoryBean.setRegionName(cacheName);
regionFactoryBean.setServerRegionShortcut(resolveServerRegionShortcut());
@@ -327,6 +335,25 @@ public class CachingDefinedRegionsConfiguration extends AbstractAnnotationConfig
return beanFactory;
}
protected List<RegionConfigurer> resolveRegionConfigurers() {
return Optional.ofNullable(this.regionConfigurers)
.filter(regionConfigurers -> !regionConfigurers.isEmpty())
.orElseGet(() ->
Optional.of(getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {
Map<String, RegionConfigurer> beansOfType = ((ListableBeanFactory) beanFactory)
.getBeansOfType(RegionConfigurer.class, true, false);
return nullSafeMap(beansOfType).values().stream().collect(Collectors.toList());
})
.orElseGet(Collections::emptyList)
);
}
/**
* {@link CacheNameResolver} is a {@link FunctionalInterface} declaring a contract for all implementations
* used to resolve all cache names declared and used by a Spring application. A resolver typically inspects

13
src/main/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsConfiguration.java
View File

@@ -169,7 +169,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
}
}
/* (non-Javadoc) */
protected GemFireComponentClassTypeScanner newGemFireComponentClassTypeScanner(
AnnotationMetadata importingClassMetadata, AnnotationAttributes enableEntityDefinedRegionsAttributes) {
@@ -182,7 +181,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
.withIncludes(resolveRegionAnnotatedPersistentEntityTypeFilters());
}
/* (non-Javadoc) */
protected Set<String> resolveBasePackages(AnnotationMetadata importingClassMetaData,
AnnotationAttributes enableEntityDefinedRegionAttributes) {
@@ -205,17 +203,14 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
return resolvedBasePackages;
}
/* (non-Javadoc) */
protected Iterable<TypeFilter> resolveExcludes(AnnotationAttributes enableEntityDefinedRegionsAttributes) {
return parseFilters(enableEntityDefinedRegionsAttributes.getAnnotationArray("excludeFilters"));
}
/* (non-Javadoc) */
protected Iterable<TypeFilter> resolveIncludes(AnnotationAttributes enableEntityDefinedRegionsAttributes) {
return parseFilters(enableEntityDefinedRegionsAttributes.getAnnotationArray("includeFilters"));
}
/* (non-Javadoc) */
@SuppressWarnings("unchecked")
protected Iterable<TypeFilter> resolveRegionAnnotatedPersistentEntityTypeFilters() {
@@ -353,7 +348,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
registry.registerBeanDefinition(regionMetadata.getRegionName(), regionFactoryBeanBuilder.getBeanDefinition());
}
/* (non-Javadoc) */
protected List<RegionConfigurer> resolveRegionConfigurers() {
return Optional.ofNullable(this.regionConfigurers)
@@ -373,7 +367,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
);
}
/* (non-Javadoc) */
protected BeanDefinitionBuilder setRegionAttributes(BeanDefinitionBuilder regionFactoryBeanBuilder,
RegionBeanDefinitionMetadata regionMetadata) {
@@ -464,7 +457,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
: regionMetadata.resolveServerRegionShortcut(DEFAULT_SERVER_REGION_SHORTCUT);
}
/* (non-Javadoc) */
protected BeanDefinitionBuilder setClientRegionAttributes(RegionBeanDefinitionMetadata regionMetadata,
AnnotationAttributes regionAnnotationAttributes, BeanDefinitionBuilder regionFactoryBeanBuilder) {
@@ -478,7 +470,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
return regionFactoryBeanBuilder;
}
/* (non-Javadoc) */
protected BeanDefinitionBuilder setPartitionRegionAttributes(RegionBeanDefinitionMetadata regionMetadata,
AnnotationAttributes regionAnnotationAttributes, BeanDefinitionBuilder regionFactoryBeanBuilder,
BeanDefinitionBuilder regionAttributesFactoryBeanBuilder) {
@@ -512,7 +503,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
return regionAttributesFactoryBeanBuilder;
}
/* (non-Javadoc) */
protected BeanDefinitionBuilder setFixedPartitionRegionAttributes(AnnotationAttributes regionAnnotationAttributes,
BeanDefinitionBuilder partitionAttributesFactoryBeanBuilder) {
@@ -549,7 +539,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
return partitionAttributesFactoryBeanBuilder;
}
/* (non-Javadoc) */
protected BeanDefinitionBuilder setReplicateRegionAttributes(RegionBeanDefinitionMetadata regionMetadata,
AnnotationAttributes regionAnnotationAttributes, BeanDefinitionBuilder regionFactoryBeanBuilder) {
@@ -562,7 +551,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
return regionFactoryBeanBuilder;
}
/* (non-Javadoc) */
private <T> BeanDefinitionBuilder setPropertyReferenceIfSet(BeanDefinitionBuilder beanDefinitionBuilder,
String propertyName, String beanName) {
@@ -571,7 +559,6 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
: beanDefinitionBuilder);
}
/* (non-Javadoc) */
private <T> BeanDefinitionBuilder setPropertyValueIfNotDefault(BeanDefinitionBuilder beanDefinitionBuilder,
String propertyName, T value, T defaultValue) {