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

SGF-185 - Removed default value for OnServers.cache

Browse Source
This commit is contained in:
David Turanski
2013-08-06 10:47:47 -04:00
parent db51dec448
commit 872fb4f913
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java
View File

@@ -45,5 +45,5 @@ public @interface OnServers {
/**
* A reference to the cache
*/
String cache() default "gemfireCache";
String cache() default "";
}

26
src/main/java/org/springframework/data/gemfire/function/config/ServerBasedExecutionBeanDefinitionBuilder.java
View File

@@ -32,37 +32,33 @@ abstract class ServerBasedExecutionBeanDefinitionBuilder extends AbstractFunctio
super(configuration);
}
/* (non-Javadoc)
* @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder#getGemfireOperationsBeanDefinitionBuilder(org.springframework.beans.factory.support.BeanDefinitionRegistry)
*/
@Override
protected BeanDefinitionBuilder getGemfireOperationsBeanDefinitionBuilder(BeanDefinitionRegistry registry) {
BeanDefinitionBuilder functionTemplateBuilder = BeanDefinitionBuilder.genericBeanDefinition(getGemfireOperationsClass());
String pool = (String)configuration.getAttribute("pool");
String cache = (String)configuration.getAttribute("cache");
Assert.state(!(StringUtils.hasText(pool) && StringUtils.hasText(cache)),
String.format("invalid configuration for interface %s. Cannot specify both 'pool' and 'cache'",
configuration.getFunctionExecutionInterface().getName()));
BeanDefinitionBuilder functionTemplateBuilder = BeanDefinitionBuilder
.genericBeanDefinition(getGemfireOperationsClass());
String pool = (String) configuration.getAttribute("pool");
String cache = (String) configuration.getAttribute("cache");
Assert.state(!(StringUtils.hasText(pool) && StringUtils.hasText(cache)), String.format(
"invalid configuration for interface %s. Cannot specify both 'pool' and 'cache'", configuration
.getFunctionExecutionInterface().getName()));
if (StringUtils.hasText(pool)) {
functionTemplateBuilder.addConstructorArgReference(pool);
} else {
if (!StringUtils.hasText(cache)) {
cache = GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME;
}
functionTemplateBuilder.addConstructorArgReference(cache);
}
return functionTemplateBuilder;
}
/* (non-Javadoc)
* @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder#getFunctionProxyFactoryBeanClass()
*/