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

DATAGEODE-44 - Polish.

Browse Source
This commit is contained in:
John Blum
2017-09-22 20:56:57 -07:00
parent 207f9bbe6b
commit 57ac541dde
22 changed files with 890 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java
View File

@@ -295,7 +295,7 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
/* (non-Javadoc) */
private String resolvePoolName() {
return Optional.of(getPoolName()).filter(this::isPoolResolvable).orElse(DEFAULT_POOL_NAME);
return Optional.of(getPoolName()).filter(this::isPoolResolvable).orElse(null);
}
/* (non-Javadoc) */

8
src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireCacheTypeAwareRegionFactoryBean.java
View File

@@ -108,12 +108,13 @@ public class GemFireCacheTypeAwareRegionFactoryBean<K, V> extends RegionLookupFa
clientRegionFactory.setCache(gemfireCache);
clientRegionFactory.setClose(isClose());
clientRegionFactory.setKeyConstraint(getKeyConstraint());
clientRegionFactory.setPoolName(resolvePoolName());
clientRegionFactory.setRegionConfigurers(this.regionConfigurers);
clientRegionFactory.setRegionName(regionName);
clientRegionFactory.setShortcut(getClientRegionShortcut());
clientRegionFactory.setValueConstraint(getValueConstraint());
resolvePoolName().ifPresent(clientRegionFactory::setPoolName);
clientRegionFactory.afterPropertiesSet();
return clientRegionFactory.getObject();
@@ -204,9 +205,8 @@ public class GemFireCacheTypeAwareRegionFactoryBean<K, V> extends RegionLookupFa
.orElse(ClientRegionFactoryBean.GEMFIRE_POOL_NAME);
}
protected String resolvePoolName() {
return Optional.of(getPoolName()).filter(this::isPoolResolvable)
.orElse(ClientRegionFactoryBean.DEFAULT_POOL_NAME);
protected Optional<String> resolvePoolName() {
return Optional.of(getPoolName()).filter(this::isPoolResolvable);
}
private boolean isPoolResolvable(String poolName) {

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

@@ -27,7 +27,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.stream.Collectors;
import org.apache.commons.logging.Log;
@@ -201,7 +201,7 @@ public class GemFireComponentClassTypeScanner implements Iterable<String> {
*/
public Set<Class<?>> scan() {
Set<Class<?>> componentClasses = new ConcurrentSkipListSet<>();
Set<Class<?>> componentClasses = new CopyOnWriteArraySet<>();
ClassLoader entityClassLoader = getEntityClassLoader();