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

DATAGEODE-109 - Format source code.

Browse Source
This commit is contained in:
John Blum
2018-08-17 21:22:43 -07:00
parent 77cee2a974
commit 26581799bb
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,10 +382,13 @@ public class ClientCacheConfiguration extends AbstractCacheConfiguration {
resolveProperty(poolProperty("servers"), (String) null));
if (StringUtils.hasText(serversFromProperty)) {
String[] serverHostsPorts = serversFromProperty.split(",");
poolServers = ConnectionEndpointList.parse(CacheServer.DEFAULT_PORT, serverHostsPorts);
}
else {
poolServers = new ConnectionEndpointList();
AnnotationAttributes[] servers = (AnnotationAttributes[]) clientCacheApplicationAttributes.get("servers");

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

@@ -87,7 +87,9 @@ public class CompressionConfiguration extends AbstractAnnotationConfigSupport im
}
protected String resolveCompressorBeanName() {
return Optional.ofNullable(this.compressorBeanName).filter(StringUtils::hasText)
return Optional.ofNullable(this.compressorBeanName)
.filter(StringUtils::hasText)
.orElse(SNAPPY_COMPRESSOR_BEAN_NAME);
}

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

@@ -854,12 +854,15 @@ public abstract class AbstractAnnotationConfigSupport
*/
protected Optional<Class<?>> resolveBeanClass(BeanDefinition beanDefinition, ClassLoader classLoader) {
Class<?> beanClass = (beanDefinition instanceof AbstractBeanDefinition
? safeResolveType(() -> ((AbstractBeanDefinition) beanDefinition).resolveBeanClass(classLoader)) : null);
Class<?> beanClass = beanDefinition instanceof AbstractBeanDefinition
? safeResolveType(() -> ((AbstractBeanDefinition) beanDefinition).resolveBeanClass(classLoader))
: null;
if (beanClass == null) {
beanClass = resolveBeanClassName(beanDefinition).map(beanClassName ->
safeResolveType(() -> ClassUtils.forName(beanClassName, classLoader))).orElse(null);
beanClass = resolveBeanClassName(beanDefinition)
.map(beanClassName ->
safeResolveType(() ->
ClassUtils.forName(beanClassName, classLoader))).orElse(null);
}
return Optional.ofNullable(beanClass);
@@ -895,8 +898,9 @@ public abstract class AbstractAnnotationConfigSupport
*/
protected Optional<String> resolveBeanClassName(BeanDefinition beanDefinition) {
Optional<String> beanClassName =
Optional.ofNullable(beanDefinition).map(BeanDefinition::getBeanClassName).filter(StringUtils::hasText);
Optional<String> beanClassName = Optional.ofNullable(beanDefinition)
.map(BeanDefinition::getBeanClassName)
.filter(StringUtils::hasText);
if (!beanClassName.isPresent()) {
beanClassName = Optional.ofNullable(beanDefinition)