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

SGF-673 - Refactor API names used in the Annotation config and GemFire Mock Objects support.

Browse Source
This commit is contained in:
John Blum
2017-09-22 21:49:27 -07:00
parent fd3d318d9e
commit cbc655cd3d
26 changed files with 107 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java
View File

@@ -324,11 +324,11 @@ public abstract class AbstractCacheConfiguration extends AbstractAnnotationConfi
* @return the resolved {@link PdxSerializer} from configuration.
* @see org.apache.geode.pdx.PdxSerializer
* @see #newPdxSerializer(BeanFactory)
* @see #beanFactory()
* @see #getBeanFactory()
*/
protected PdxSerializer resolvePdxSerializer(String pdxSerializerBeanName) {
BeanFactory beanFactory = beanFactory();
BeanFactory beanFactory = getBeanFactory();
return Optional.ofNullable(pdxSerializerBeanName)
.filter(beanFactory::containsBean)
@@ -346,7 +346,7 @@ public abstract class AbstractCacheConfiguration extends AbstractAnnotationConfi
*/
@SuppressWarnings("unchecked")
protected <T extends PdxSerializer> T newPdxSerializer() {
return newPdxSerializer(beanFactory());
return newPdxSerializer(getBeanFactory());
}
/**
@@ -443,8 +443,8 @@ public abstract class AbstractCacheConfiguration extends AbstractAnnotationConfi
*/
protected <T extends CacheFactoryBean> T configureCacheFactoryBean(T gemfireCache) {
gemfireCache.setBeanClassLoader(beanClassLoader());
gemfireCache.setBeanFactory(beanFactory());
gemfireCache.setBeanClassLoader(getBeanClassLoader());
gemfireCache.setBeanFactory(getBeanFactory());
gemfireCache.setCacheXml(getCacheXml());
gemfireCache.setClose(isClose());
gemfireCache.setCopyOnRead(getCopyOnRead());

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

@@ -189,7 +189,7 @@ public class AddCacheServerConfiguration extends AbstractAnnotationConfigSupport
return Optional.ofNullable(this.cacheServerConfigurers)
.filter(cacheServerConfigurers -> !cacheServerConfigurers.isEmpty())
.orElseGet(() ->
Optional.of(this.beanFactory())
Optional.of(this.getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {
Map<String, CacheServerConfigurer> beansOfType = ((ListableBeanFactory) beanFactory)

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

@@ -204,7 +204,7 @@ public class AddPoolConfiguration extends AbstractAnnotationConfigSupport
return Optional.ofNullable(this.poolConfigurers)
.filter(poolConfigurers -> !poolConfigurers.isEmpty())
.orElseGet(() ->
Optional.of(this.beanFactory())
Optional.of(this.getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {
Map<String, PoolConfigurer> beansOfType = ((ListableBeanFactory) beanFactory)

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

@@ -117,7 +117,7 @@ public class ApacheShiroSecurityConfiguration extends AbstractAnnotationConfigSu
* @see org.springframework.beans.factory.BeanFactory
*/
protected ListableBeanFactory getListableBeanFactory() {
return (ListableBeanFactory) beanFactory();
return (ListableBeanFactory) getBeanFactory();
}
/**

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

@@ -146,7 +146,7 @@ public class AutoRegionLookupConfiguration extends AbstractAnnotationConfigSuppo
}
catch (ParseException ignore) {
// try resolving as a Spring property placeholder expression...
return environment().getProperty(enabled, Boolean.TYPE, false);
return getEnvironment().getProperty(enabled, Boolean.TYPE, false);
}
}

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

@@ -145,7 +145,7 @@ public class CacheServerConfiguration extends PeerCacheConfiguration {
return Optional.ofNullable(this.cacheServerConfigurers)
.filter(cacheServerConfigurers -> !cacheServerConfigurers.isEmpty())
.orElseGet(() ->
Optional.of(this.beanFactory())
Optional.of(this.getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {

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

@@ -160,7 +160,7 @@ public class ClientCacheConfiguration extends AbstractCacheConfiguration {
return Optional.ofNullable(this.clientCacheConfigurers)
.filter(clientCacheConfigurers -> !clientCacheConfigurers.isEmpty())
.orElseGet(() ->
Optional.of(this.beanFactory())
Optional.of(this.getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {

6
src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java
View File

@@ -173,7 +173,7 @@ public class ContinuousQueryConfiguration extends AbstractAnnotationConfigSuppor
return Optional.ofNullable(this.configurers)
.filter(configurers -> !configurers.isEmpty())
.orElseGet(() ->
Optional.of(this.beanFactory())
Optional.of(this.getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {
@@ -191,7 +191,7 @@ public class ContinuousQueryConfiguration extends AbstractAnnotationConfigSuppor
return Optional.ofNullable(getErrorHandlerBeanName())
.filter(StringUtils::hasText)
.map(errorHandlerBeanName -> beanFactory().getBean(errorHandlerBeanName, ErrorHandler.class));
.map(errorHandlerBeanName -> getBeanFactory().getBean(errorHandlerBeanName, ErrorHandler.class));
}
protected Optional<Integer> resolvePhase() {
@@ -206,7 +206,7 @@ public class ContinuousQueryConfiguration extends AbstractAnnotationConfigSuppor
return Optional.ofNullable(getTaskExecutorBeanName())
.filter(StringUtils::hasText)
.map(taskExecutorBeanName -> beanFactory().getBean(taskExecutorBeanName, Executor.class));
.map(taskExecutorBeanName -> getBeanFactory().getBean(taskExecutorBeanName, Executor.class));
}
public void setErrorHandlerBeanName(String errorHandlerBeanName) {

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

@@ -211,7 +211,7 @@ public class DiskStoreConfiguration extends AbstractAnnotationConfigSupport
return Optional.ofNullable(this.diskStoreConfigurers)
.filter(diskStoreConfigurers -> !diskStoreConfigurers.isEmpty())
.orElseGet(() ->
Optional.of(this.beanFactory())
Optional.of(this.getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {

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

@@ -330,7 +330,7 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
return Optional.ofNullable(this.mappingContext).orElseGet(() -> {
try {
this.mappingContext = beanFactory().getBean(GemfireMappingContext.class);
this.mappingContext = getBeanFactory().getBean(GemfireMappingContext.class);
}
catch (Throwable ignore) {
this.mappingContext = new GemfireMappingContext();
@@ -382,7 +382,7 @@ public class EntityDefinedRegionsConfiguration extends AbstractAnnotationConfigS
return Optional.ofNullable(this.regionConfigurers)
.filter(regionConfigurers -> !regionConfigurers.isEmpty())
.orElseGet(() ->
Optional.ofNullable(beanFactory())
Optional.of(getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {
Map<String, RegionConfigurer> beansOfType = ((ListableBeanFactory) beanFactory)

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

@@ -276,7 +276,7 @@ public class IndexConfiguration extends EntityDefinedRegionsConfiguration {
return Optional.ofNullable(this.indexConfigurers)
.filter(indexConfigurers -> !indexConfigurers.isEmpty())
.orElseGet(() ->
Optional.of(beanFactory())
Optional.of(getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {
Map<String, IndexConfigurer> beansOfType = ((ListableBeanFactory) beanFactory)

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

@@ -97,7 +97,7 @@ public class PeerCacheConfiguration extends AbstractCacheConfiguration {
return Optional.ofNullable(this.peerCacheConfigurers)
.filter(peerCacheConfigurers -> !peerCacheConfigurers.isEmpty())
.orElseGet(() ->
Optional.of(this.beanFactory())
Optional.of(this.getBeanFactory())
.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
.map(beanFactory -> {
Map<String, PeerCacheConfigurer> beansOfType = ((ListableBeanFactory) beanFactory)

28
src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java
View File

@@ -148,7 +148,7 @@ public abstract class AbstractAnnotationConfigSupport
* @return a new {@link EvaluationContext}.
* @see org.springframework.beans.factory.BeanFactory
* @see org.springframework.expression.EvaluationContext
* @see #beanFactory()
* @see #getBeanFactory()
*/
protected EvaluationContext newEvaluationContext(BeanFactory beanFactory) {
@@ -157,7 +157,7 @@ public abstract class AbstractAnnotationConfigSupport
evaluationContext.addPropertyAccessor(new BeanFactoryAccessor());
evaluationContext.addPropertyAccessor(new EnvironmentAccessor());
evaluationContext.addPropertyAccessor(new MapAccessor());
evaluationContext.setTypeLocator(new StandardTypeLocator(beanClassLoader()));
evaluationContext.setTypeLocator(new StandardTypeLocator(getBeanClassLoader()));
configureTypeConverter(evaluationContext, beanFactory);
@@ -265,7 +265,7 @@ public abstract class AbstractAnnotationConfigSupport
* @return the {@link ClassLoader} used by the Spring {@link BeanFactory} to load classes for bean definitions.
* @see #setBeanClassLoader(ClassLoader)
*/
protected ClassLoader beanClassLoader() {
protected ClassLoader getBeanClassLoader() {
return this.beanClassLoader;
}
@@ -276,10 +276,10 @@ public abstract class AbstractAnnotationConfigSupport
* @return the configured {@link ClassLoader} or the
* {@link Thread#getContextClassLoader() Thread Context ClassLoader}.
* @see java.lang.Thread#getContextClassLoader()
* @see #beanClassLoader()
* @see #getBeanClassLoader()
*/
protected ClassLoader resolveBeanClassLoader() {
return Optional.ofNullable(beanClassLoader()).orElseGet(() -> Thread.currentThread().getContextClassLoader());
return Optional.ofNullable(getBeanClassLoader()).orElseGet(() -> Thread.currentThread().getContextClassLoader());
}
/**
@@ -288,7 +288,7 @@ public abstract class AbstractAnnotationConfigSupport
@Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
this.beanFactory = beanFactory;
configureTypeConverter(evaluationContext(), beanFactory);
configureTypeConverter(getEvaluationContext(), beanFactory);
}
/**
@@ -298,7 +298,7 @@ public abstract class AbstractAnnotationConfigSupport
* @throws IllegalStateException if the Spring {@link BeanFactory} was not properly configured.
* @see org.springframework.beans.factory.BeanFactory
*/
protected BeanFactory beanFactory() {
protected BeanFactory getBeanFactory() {
return Optional.ofNullable(this.beanFactory)
.orElseThrow(() -> newIllegalStateException("BeanFactory is required"));
}
@@ -321,7 +321,7 @@ public abstract class AbstractAnnotationConfigSupport
* @return a reference to the Spring {@link Environment}.
* @see org.springframework.core.env.Environment
*/
protected Environment environment() {
protected Environment getEnvironment() {
return this.environment;
}
@@ -331,7 +331,7 @@ public abstract class AbstractAnnotationConfigSupport
* @return a reference to the {@link EvaluationContext} used to evaluate SpEL expressions.
* @see org.springframework.expression.EvaluationContext
*/
protected EvaluationContext evaluationContext() {
protected EvaluationContext getEvaluationContext() {
return this.evaluationContext;
}
@@ -454,11 +454,11 @@ public abstract class AbstractAnnotationConfigSupport
* @see org.springframework.beans.factory.support.AbstractBeanDefinition
* @see org.springframework.beans.factory.support.BeanDefinitionRegistry
* @see org.springframework.beans.factory.support.BeanDefinitionReaderUtils#registerWithGeneratedName(AbstractBeanDefinition, BeanDefinitionRegistry)
* @see #beanFactory()
* @see #getBeanFactory()
*/
protected AbstractBeanDefinition register(AbstractBeanDefinition beanDefinition) {
BeanFactory beanFactory = beanFactory();
BeanFactory beanFactory = getBeanFactory();
return (beanFactory instanceof BeanDefinitionRegistry
? register(beanDefinition, (BeanDefinitionRegistry) beanFactory)
@@ -500,7 +500,7 @@ public abstract class AbstractAnnotationConfigSupport
String propertyName = asArrayProperty(propertyNamePrefix, index, propertyNameSuffix);
found = environment().containsProperty(propertyName);
found = getEnvironment().containsProperty(propertyName);
if (found) {
propertyNames.add(propertyName);
@@ -766,11 +766,11 @@ public abstract class AbstractAnnotationConfigSupport
* @param defaultValue default value to return if the property is not defined or not set.
* @return the value of the property identified by {@link String name} or default value if the property
* is not defined or not set.
* @see #environment()
* @see #getEnvironment()
*/
protected <T> T resolveProperty(String propertyName, Class<T> targetType, T defaultValue) {
return Optional.ofNullable(environment())
return Optional.ofNullable(getEnvironment())
.filter(environment -> environment.containsProperty(propertyName))
.map(environment -> environment.getProperty(environment.resolveRequiredPlaceholders(propertyName),
targetType, defaultValue))

10
src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java
View File

@@ -78,7 +78,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
* @see org.springframework.data.gemfire.config.annotation.AbstractCacheConfiguration
*/
@SuppressWarnings("unchecked")
protected <T extends AbstractCacheConfiguration> T cacheConfiguration() {
protected <T extends AbstractCacheConfiguration> T getCacheConfiguration() {
return Optional.ofNullable((T) this.cacheConfiguration)
.orElseThrow(() -> newIllegalStateException("AbstractCacheConfiguration is required"));
}
@@ -111,7 +111,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
if (hasProperties(gemfireProperties)) {
try {
cacheConfiguration().add(gemfireProperties);
getCacheConfiguration().add(gemfireProperties);
}
catch (Exception ignore) {
registerGemFirePropertiesBeanPostProcessor(registry, gemfireProperties);
@@ -179,15 +179,17 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
* @return a Spring managed bean instance for the given, required {@link Class} type, or {@literal null}
* if no bean instance of the given, required {@link Class} type could be found.
* @throws BeansException if the Spring manage bean of the required {@link Class} type could not be resolved.
* @see #beanFactory()
* @see #getBeanFactory()
*/
@SuppressWarnings("unchecked")
protected <T> T resolveBean(Class<T> beanType) {
BeanFactory beanFactory = beanFactory();
BeanFactory beanFactory = getBeanFactory();
if (beanFactory instanceof AutowireCapableBeanFactory) {
AutowireCapableBeanFactory autowiringBeanFactory = (AutowireCapableBeanFactory) beanFactory;
NamedBeanHolder<T> beanHolder = autowiringBeanFactory.resolveNamedBean(beanType);
return (T) autowiringBeanFactory.configureBean(beanHolder.getBeanInstance(), beanHolder.getBeanName());