diff --git a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java index 64165f2b..82b45320 100644 --- a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java @@ -210,7 +210,6 @@ public class CacheFactoryBean extends AbstractFactoryBeanSupport applyPeerCacheConfigurers(); } - /* (non-Javadoc) */ private void applyPeerCacheConfigurers() { applyPeerCacheConfigurers(getCompositePeerCacheConfigurer()); } @@ -479,12 +478,10 @@ public class CacheFactoryBean extends AbstractFactoryBeanSupport return cache; } - /* (non-Javadoc) */ private boolean isHeapPercentageValid(Float heapPercentage) { return (heapPercentage >= 0.0f && heapPercentage <= 100.0f); } - /* (non-Javadoc) */ private void configureHeapPercentages(GemFireCache cache) { Optional.ofNullable(getCriticalHeapPercentage()).ifPresent(criticalHeapPercentage -> { @@ -504,7 +501,6 @@ public class CacheFactoryBean extends AbstractFactoryBeanSupport }); } - /* (non-Javadoc) */ private void configureOffHeapPercentages(GemFireCache cache) { Optional.ofNullable(getCriticalOffHeapPercentage()).ifPresent(criticalOffHeapPercentage -> { @@ -524,7 +520,6 @@ public class CacheFactoryBean extends AbstractFactoryBeanSupport }); } - /* (non-Javadoc) */ private void registerJndiDataSources() { nullSafeCollection(getJndiDataSources()).forEach(jndiDataSource -> { @@ -542,13 +537,11 @@ public class CacheFactoryBean extends AbstractFactoryBeanSupport }); } - /* (non-Javadoc) */ private void registerTransactionListeners(GemFireCache cache) { nullSafeCollection(getTransactionListeners()) .forEach(transactionListener -> cache.getCacheTransactionManager().addListener(transactionListener)); } - /* (non-Javadoc) */ private void registerTransactionWriter(GemFireCache cache) { Optional.ofNullable(getTransactionWriter()).ifPresent(it -> cache.getCacheTransactionManager().setWriter(it)); } @@ -1280,7 +1273,6 @@ public class CacheFactoryBean extends AbstractFactoryBeanSupport T initialize(T cacheFactory); } - /* (non-Javadoc) */ public static class DynamicRegionSupport { private Boolean persistent = Boolean.TRUE; @@ -1331,7 +1323,6 @@ public class CacheFactoryBean extends AbstractFactoryBeanSupport } } - /* (non-Javadoc) */ public static class JndiDataSource { private List props; diff --git a/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java b/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java index 68947d19..7e47e92c 100644 --- a/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java @@ -94,7 +94,6 @@ public class DiskStoreFactoryBean extends AbstractFactoryBeanSupport this.diskStore = postProcess(newDiskStore(diskStoreFactory, diskStoreName)); } - /* (non-Javadoc) */ private void applyDiskStoreConfigurers(String diskStoreName) { applyDiskStoreConfigurers(diskStoreName, getCompositeDiskStoreConfigurer()); } @@ -128,13 +127,11 @@ public class DiskStoreFactoryBean extends AbstractFactoryBeanSupport .forEach(diskStoreConfigurer -> diskStoreConfigurer.configure(diskStoreName, this)); } - /* (non-Javadoc) */ private GemFireCache resolveCache(String diskStoreName) { return Optional.ofNullable(this.cache) .orElseThrow(() -> newIllegalStateException("Cache is required to create DiskStore [%s]", diskStoreName)); } - /* (non-Javadoc) */ final String resolveDiskStoreName() { return Optional.ofNullable(getBeanName()).filter(StringUtils::hasText) .orElse(DiskStoreFactory.DEFAULT_DISK_STORE_NAME); diff --git a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java b/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java index febe0d28..e30aad9a 100644 --- a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java @@ -119,7 +119,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen registerAlias(getBeanName(), this.indexName); } - /* (non-Javadoc) */ private void applyIndexConfigurers(String indexName) { applyIndexConfigurers(indexName, getCompositeRegionConfigurer()); } @@ -152,7 +151,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen .forEach(indexConfigurer -> indexConfigurer.configure(indexName, this)); } - /* (non-Javadoc) */ private void assertIndexDefinitionConfiguration() { Assert.hasText(this.expression, "Index expression is required"); @@ -163,7 +161,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen } } - /* (non-Javadoc) */ RegionService resolveCache() { return Optional.ofNullable(this.cache) @@ -171,7 +168,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen .orElseThrow(() -> newIllegalStateException("Cache is required"))); } - /* (non-Javadoc) */ String resolveIndexName() { return Optional.ofNullable(this.name).filter(StringUtils::hasText) @@ -179,7 +175,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen .orElseThrow(() -> newIllegalArgumentException("Index name is required"))); } - /* (non-Javadoc) */ QueryService resolveQueryService() { return Optional.ofNullable(this.queryService) @@ -187,7 +182,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen .orElseThrow(() -> newIllegalStateException("QueryService is required to create an Index"))); } - /* (non-Javadoc) */ QueryService lookupQueryService() { String queryServiceBeanName = GemfireConstants.DEFAULT_GEMFIRE_INDEX_DEFINITION_QUERY_SERVICE; @@ -198,7 +192,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen .orElseGet(() -> registerQueryServiceBean(queryServiceBeanName, doLookupQueryService())); } - /* (non-Javadoc) */ QueryService doLookupQueryService() { return Optional.ofNullable(this.queryService).orElseGet(() -> @@ -206,9 +199,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen : this.cache.getQueryService())); } - - - /* (non-Javadoc) */ QueryService registerQueryServiceBean(String beanName, QueryService queryService) { if (isDefine()) { @@ -218,7 +208,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen return queryService; } - /* (non-Javadoc) */ void registerAlias(String beanName, String indexName) { Optional.ofNullable(getBeanFactory()).filter(it -> it instanceof ConfigurableBeanFactory) @@ -226,12 +215,10 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen .ifPresent(it -> ((ConfigurableBeanFactory) it).registerAlias(beanName, indexName)); } - /* (non-Javadoc) */ Index createIndex(QueryService queryService, String indexName) throws Exception { return createIndex(queryService, indexName, false); } - /* (non-Javadoc) */ private Index createIndex(QueryService queryService, String indexName, boolean retryAttempted) throws Exception { IndexType indexType = this.indexType; @@ -339,7 +326,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen } } - /* (non-Javadoc) */ @SuppressWarnings("all") private boolean isIndexDefinitionMatch(Index index) { @@ -357,12 +343,10 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen .orElse(false); } - /* (non-Javadoc) */ private boolean isNotIndexDefinitionMatch(Index index) { return !isIndexDefinitionMatch(index); } - /* (non-Javadoc) */ private Index warnOnIndexDefinitionMismatch(Index existingIndex, String indexName, String action) { if (isNotIndexDefinitionMatch(existingIndex)) { @@ -378,7 +362,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen return existingIndex; } - /* (non-Javadoc) */ private Index handleIgnore(Index existingIndex) { registerAlias(getBeanName(), existingIndex.getName()); @@ -386,7 +369,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen return existingIndex; } - /* (non-Javadoc) */ private Index handleOverride(Index existingIndex, QueryService queryService, String indexName) { try { // No way to tell whether the QueryService.remove(:Index) was successful or not! o.O @@ -404,7 +386,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen } } - /* (non-Javadoc) */ private Index handleSmartOverride(Index existingIndex, QueryService queryService, String indexName) { return Optional.of(existingIndex) @@ -413,18 +394,15 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen .orElseGet(() -> handleOverride(existingIndex, queryService, indexName)); } - /* (non-Javadoc) */ String toBasicIndexDefinition() { return String.format(BASIC_INDEX_DEFINITION, this.expression, this.from, this.indexType); } - /* (non-Javadoc) */ String toDetailedIndexDefinition() { return String.format(DETAILED_INDEX_DEFINITION, this.name, this.expression, this.from, this.imports, this.indexType); } - /* (non-Javadoc) */ Index createKeyIndex(QueryService queryService, String indexName, String expression, String from) throws Exception { if (isDefine()) { @@ -436,7 +414,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen } } - /* (non-Javadoc) */ Index createHashIndex(QueryService queryService, String indexName, String expression, String from, String imports) throws Exception { @@ -462,7 +439,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen } } - /* (non-Javadoc) */ Index createFunctionalIndex(QueryService queryService, String indexName, String expression, String from, String imports) throws Exception { @@ -488,7 +464,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen } } - /* (non-Javadoc) */ Optional tryToFindExistingIndexByDefinition(QueryService queryService, String expression, String fromClause, IndexType indexType) { @@ -504,7 +479,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen return Optional.empty(); } - /* (non-Javadoc) */ Optional tryToFindExistingIndexByName(QueryService queryService, String indexName) { for (Index index : nullSafeCollection(queryService.getIndexes())) { @@ -807,7 +781,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen this.indexType = type; } - /* (non-Javadoc) */ protected static final class IndexWrapper implements Index { private Index index; @@ -825,7 +798,6 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen this.indexName = indexName; } - /* (non-Javadoc) */ protected synchronized Index resolveIndex() { String indexName = getIndexName(); @@ -849,18 +821,15 @@ public class IndexFactoryBean extends AbstractFactoryBeanSupport implemen }); } - /* (non-Javadoc) */ protected Index getIndex() { return this.index; } - /* (non-Javadoc) */ protected String getIndexName() { return Optional.ofNullable(this.indexName).filter(StringUtils::hasText).orElseThrow(() -> newIllegalStateException("Index name is required")); } - /* (non-Javadoc) */ protected QueryService getQueryService() { return this.queryService; } diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java index f7a91daa..00b5021e 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java @@ -134,7 +134,6 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat applyClientCacheConfigurers(); } - /* (non-Javadoc) */ private void applyClientCacheConfigurers() { applyClientCacheConfigurers(getCompositeClientCacheConfigurer()); } @@ -447,22 +446,18 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat return Optional.ofNullable(getCache()).map(Object::getClass).orElse((Class) ClientCache.class); } - /* (non-Javadoc) */ public void addLocators(ConnectionEndpoint... locators) { this.locators.add(locators); } - /* (non-Javadoc) */ public void addLocators(Iterable locators) { this.locators.add(locators); } - /* (non-Javadoc) */ public void addServers(ConnectionEndpoint... servers) { this.servers.add(servers); } - /* (non-Javadoc) */ public void addServers(Iterable servers) { this.servers.add(servers); } @@ -560,22 +555,18 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat return Boolean.FALSE; } - /* (non-Javadoc) */ public void setFreeConnectionTimeout(Integer freeConnectionTimeout) { this.freeConnectionTimeout = freeConnectionTimeout; } - /* (non-Javadoc) */ public Integer getFreeConnectionTimeout() { return freeConnectionTimeout; } - /* (non-Javadoc) */ public void setIdleTimeout(Long idleTimeout) { this.idleTimeout = idleTimeout; } - /* (non-Javadoc) */ public Long getIdleTimeout() { return idleTimeout; } @@ -610,58 +601,47 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat return Boolean.TRUE.equals(getKeepAlive()); } - /* (non-Javadoc) */ public void setLoadConditioningInterval(Integer loadConditioningInterval) { this.loadConditioningInterval = loadConditioningInterval; } - /* (non-Javadoc) */ public Integer getLoadConditioningInterval() { return loadConditioningInterval; } - /* (non-Javadoc) */ public void setLocators(ConnectionEndpoint[] locators) { setLocators(ConnectionEndpointList.from(locators)); } - /* (non-Javadoc) */ public void setLocators(Iterable locators) { getLocators().clear(); addLocators(locators); } - /* (non-Javadoc) */ protected ConnectionEndpointList getLocators() { return locators; } - /* (non-Javadoc) */ public void setMaxConnections(Integer maxConnections) { this.maxConnections = maxConnections; } - /* (non-Javadoc) */ public Integer getMaxConnections() { return maxConnections; } - /* (non-Javadoc) */ public void setMinConnections(Integer minConnections) { this.minConnections = minConnections; } - /* (non-Javadoc) */ public Integer getMinConnections() { return minConnections; } - /* (non-Javadoc) */ public void setMultiUserAuthentication(Boolean multiUserAuthentication) { this.multiUserAuthentication = multiUserAuthentication; } - /* (non-Javadoc) */ public Boolean getMultiUserAuthentication() { return multiUserAuthentication; } @@ -706,32 +686,26 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat return poolName; } - /* (non-Javadoc) */ public void setPingInterval(Long pingInterval) { this.pingInterval = pingInterval; } - /* (non-Javadoc) */ public Long getPingInterval() { return pingInterval; } - /* (non-Javadoc) */ public void setPrSingleHopEnabled(Boolean prSingleHopEnabled) { this.prSingleHopEnabled = prSingleHopEnabled; } - /* (non-Javadoc) */ public Boolean getPrSingleHopEnabled() { return prSingleHopEnabled; } - /* (non-Javadoc) */ public void setReadTimeout(Integer readTimeout) { this.readTimeout = readTimeout; } - /* (non-Javadoc) */ public Integer getReadTimeout() { return readTimeout; } @@ -782,108 +756,87 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat } } - /* (non-Javadoc) */ public void setRetryAttempts(Integer retryAttempts) { this.retryAttempts = retryAttempts; } - /* (non-Javadoc) */ public Integer getRetryAttempts() { return retryAttempts; } - /* (non-Javadoc) */ public void setServerGroup(String serverGroup) { this.serverGroup = serverGroup; } - /* (non-Javadoc) */ public String getServerGroup() { return serverGroup; } - /* (non-Javadoc) */ public void setServers(ConnectionEndpoint[] servers) { setServers(ConnectionEndpointList.from(servers)); } - /* (non-Javadoc) */ public void setServers(Iterable servers) { getServers().clear(); addServers(servers); } - /* (non-Javadoc) */ protected ConnectionEndpointList getServers() { return servers; } - /* (non-Javadoc) */ public void setSocketBufferSize(Integer socketBufferSize) { this.socketBufferSize = socketBufferSize; } - /* (non-Javadoc) */ public Integer getSocketBufferSize() { return socketBufferSize; } - /* (non-Javadoc) */ public void setStatisticsInterval(Integer statisticsInterval) { this.statisticsInterval = statisticsInterval; } - /* (non-Javadoc) */ public Integer getStatisticsInterval() { return statisticsInterval; } - /* (non-Javadoc) */ public void setSubscriptionAckInterval(Integer subscriptionAckInterval) { this.subscriptionAckInterval = subscriptionAckInterval; } - /* (non-Javadoc) */ public Integer getSubscriptionAckInterval() { return subscriptionAckInterval; } - /* (non-Javadoc) */ public void setSubscriptionEnabled(Boolean subscriptionEnabled) { this.subscriptionEnabled = subscriptionEnabled; } - /* (non-Javadoc) */ public Boolean getSubscriptionEnabled() { return subscriptionEnabled; } - /* (non-Javadoc) */ public void setSubscriptionMessageTrackingTimeout(Integer subscriptionMessageTrackingTimeout) { this.subscriptionMessageTrackingTimeout = subscriptionMessageTrackingTimeout; } - /* (non-Javadoc) */ public Integer getSubscriptionMessageTrackingTimeout() { return subscriptionMessageTrackingTimeout; } - /* (non-Javadoc) */ public void setSubscriptionRedundancy(Integer subscriptionRedundancy) { this.subscriptionRedundancy = subscriptionRedundancy; } - /* (non-Javadoc) */ public Integer getSubscriptionRedundancy() { return subscriptionRedundancy; } - /* (non-Javadoc) */ public void setThreadLocalConnections(Boolean threadLocalConnections) { this.threadLocalConnections = threadLocalConnections; } - /* (non-Javadoc) */ public Boolean getThreadLocalConnections() { return threadLocalConnections; } diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java index 1301574e..ae1555e8 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java @@ -159,7 +159,6 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean return region; } - /* (non-Javadoc) */ private void applyRegionConfigurers(String regionName) { applyRegionConfigurers(regionName, getCompositeRegionConfigurer()); } @@ -237,7 +236,6 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean } } - /* (non-Javadoc) */ private Region newRegion(ClientRegionFactory clientRegionFactory, Region parentRegion, String regionName) { @@ -255,7 +253,6 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean }); } - /* (non-Javadoc) */ private ClientCache resolveCache(GemFireCache gemfireCache) { return Optional.ofNullable(gemfireCache) @@ -310,7 +307,6 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean return resolvedShortcut; } - /* (non-Javadoc) */ private String resolvePoolName() { return getPoolName() @@ -320,17 +316,14 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean .orElse(null); } - /* (non-Javadoc) */ boolean isPoolResolvable(String poolName) { return getBeanFactory().containsBean(poolName) || (PoolManager.find(poolName) != null); } - /* (non-Javadoc) */ boolean isNotDefaultPool(String poolName) { return !DEFAULT_POOL_NAME.equals(poolName); } - /* (non-Javadoc) */ private String eagerlyInitializePool(String poolName) { try { @@ -473,7 +466,6 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean return region; } - /* (non-Javadoc) */ @SuppressWarnings("unchecked") private Region registerInterests(Region region) { @@ -575,7 +567,6 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean this.cacheWriter = cacheWriter; } - /* (non-Javadoc) */ final boolean isClose() { return this.close; } @@ -636,7 +627,6 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean setDataPolicy(resolvedDataPolicy); } - /* (non-Javadoc) */ final boolean isDestroy() { return this.destroy; } @@ -685,7 +675,6 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean this.interests = interests; } - /* (non-Javadoc) */ Interest[] getInterests() { return this.interests; } diff --git a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java index 6a662374..c31a314a 100644 --- a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java @@ -128,7 +128,6 @@ public class PoolFactoryBean extends AbstractFactoryBeanSupport implements init(Optional.ofNullable(PoolManager.find(validatePoolName()))); } - /* (non-Javadoc) */ @SuppressWarnings("all") private void init(Optional existingPool) { @@ -148,7 +147,6 @@ public class PoolFactoryBean extends AbstractFactoryBeanSupport implements } } - /* (non-Javadoc) */ private void applyPoolConfigurers() { applyPoolConfigurers(getCompositePoolConfigurer()); } @@ -178,7 +176,6 @@ public class PoolFactoryBean extends AbstractFactoryBeanSupport implements .forEach(poolConfigurer -> poolConfigurer.configure(getName(), this)); } - /* (non-Javadoc) */ private String validatePoolName() { if (!StringUtils.hasText(getName())) { @@ -360,42 +357,34 @@ public class PoolFactoryBean extends AbstractFactoryBeanSupport implements return Optional.ofNullable(this.pool).map(Pool::getClass).orElse((Class) Pool.class); } - /* (non-Javadoc) */ public void addLocators(ConnectionEndpoint... locators) { this.locators.add(locators); } - /* (non-Javadoc) */ public void addLocators(Iterable locators) { this.locators.add(locators); } - /* (non-Javadoc) */ public void addServers(ConnectionEndpoint... servers) { this.servers.add(servers); } - /* (non-Javadoc) */ public void addServers(Iterable servers) { this.servers.add(servers); } - /* (non-Javadoc) */ public void setName(String name) { this.name = name; } - /* (non-Javadoc) */ protected String getName() { return this.name; } - /* (non-Javadoc) */ public void setPool(Pool pool) { this.pool = pool; } - /* (non-Javadoc) */ public Pool getPool() { return Optional.ofNullable(this.pool).orElseGet(() -> new PoolAdapter() { @@ -559,58 +548,47 @@ public class PoolFactoryBean extends AbstractFactoryBeanSupport implements }); } - /* (non-Javadoc) */ public void setFreeConnectionTimeout(int freeConnectionTimeout) { this.freeConnectionTimeout = freeConnectionTimeout; } - /* (non-Javadoc) */ public void setIdleTimeout(long idleTimeout) { this.idleTimeout = idleTimeout; } - /* (non-Javadoc) */ public void setKeepAlive(boolean keepAlive) { this.keepAlive = keepAlive; } - /* (non-Javadoc) */ public void setLoadConditioningInterval(int loadConditioningInterval) { this.loadConditioningInterval = loadConditioningInterval; } - /* (non-Javadoc) */ public void setLocators(ConnectionEndpoint[] connectionEndpoints) { setLocators(ConnectionEndpointList.from(connectionEndpoints)); } - /* (non-Javadoc) */ public void setLocators(Iterable connectionEndpoints) { getLocators().clear(); getLocators().add(connectionEndpoints); } - /* (non-Javadoc) */ ConnectionEndpointList getLocators() { return locators; } - /* (non-Javadoc) */ public void setMaxConnections(int maxConnections) { this.maxConnections = maxConnections; } - /* (non-Javadoc) */ public void setMinConnections(int minConnections) { this.minConnections = minConnections; } - /* (non-Javadoc) */ public void setMultiUserAuthentication(boolean multiUserAuthentication) { this.multiUserAuthentication = multiUserAuthentication; } - /* (non-Javadoc) */ public void setPingInterval(long pingInterval) { this.pingInterval = pingInterval; } @@ -652,73 +630,59 @@ public class PoolFactoryBean extends AbstractFactoryBeanSupport implements this.poolFactoryInitializer = poolFactoryInitializer; } - /* (non-Javadoc) */ public void setPrSingleHopEnabled(boolean prSingleHopEnabled) { this.prSingleHopEnabled = prSingleHopEnabled; } - /* (non-Javadoc) */ public void setReadTimeout(int readTimeout) { this.readTimeout = readTimeout; } - /* (non-Javadoc) */ public void setRetryAttempts(int retryAttempts) { this.retryAttempts = retryAttempts; } - /* (non-Javadoc) */ public void setServerGroup(String serverGroup) { this.serverGroup = serverGroup; } - /* (non-Javadoc) */ public void setServers(ConnectionEndpoint[] connectionEndpoints) { setServers(ConnectionEndpointList.from(connectionEndpoints)); } - /* (non-Javadoc) */ public void setServers(Iterable connectionEndpoints) { getServers().clear(); getServers().add(connectionEndpoints); } - /* (non-Javadoc) */ ConnectionEndpointList getServers() { return servers; } - /* (non-Javadoc) */ public void setSocketBufferSize(int socketBufferSize) { this.socketBufferSize = socketBufferSize; } - /* (non-Javadoc) */ public void setStatisticInterval(int statisticInterval) { this.statisticInterval = statisticInterval; } - /* (non-Javadoc) */ public void setSubscriptionAckInterval(int subscriptionAckInterval) { this.subscriptionAckInterval = subscriptionAckInterval; } - /* (non-Javadoc) */ public void setSubscriptionEnabled(boolean subscriptionEnabled) { this.subscriptionEnabled = subscriptionEnabled; } - /* (non-Javadoc) */ public void setSubscriptionMessageTrackingTimeout(int subscriptionMessageTrackingTimeout) { this.subscriptionMessageTrackingTimeout = subscriptionMessageTrackingTimeout; } - /* (non-Javadoc) */ public void setSubscriptionRedundancy(int subscriptionRedundancy) { this.subscriptionRedundancy = subscriptionRedundancy; } - /* (non-Javadoc) */ public void setThreadLocalConnections(boolean threadLocalConnections) { this.threadLocalConnections = threadLocalConnections; } @@ -727,15 +691,13 @@ public class PoolFactoryBean extends AbstractFactoryBeanSupport implements * (non-Javadoc) * internal framework use only */ - public final void setLocatorsConfiguration(Object locatorsConfiguration) { - } + public final void setLocatorsConfiguration(Object locatorsConfiguration) { } /* * (non-Javadoc) * internal framework use only */ - public final void setServersConfiguration(Object serversConfiguration) { - } + public final void setServersConfiguration(Object serversConfiguration) { } /** * Callback interface to initialize the {@link PoolFactory} used by this {@link PoolFactoryBean} diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java index e3a0c19e..17bc21e6 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java @@ -73,7 +73,6 @@ public class AutoConfiguredAuthenticationConfiguration { return (beanName, beanFactory) -> setAuthenticationCredentials(beanFactory.getProperties(), environment); } - /* (non-Javadoc) */ private void setAuthenticationCredentials(Properties gemfireProperties, Environment environment) { Optional.ofNullable(gemfireProperties) @@ -84,7 +83,6 @@ public class AutoConfiguredAuthenticationConfiguration { }); } - /* (non-Javadoc) */ private static boolean isMatch(Environment environment) { return Optional.ofNullable(environment) @@ -96,7 +94,6 @@ public class AutoConfiguredAuthenticationConfiguration { public static class AutoConfiguredAuthenticationCondition implements Condition { @Override - @SuppressWarnings("all") public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) { return isMatch(conditionContext.getEnvironment()); } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java index 2d7b5cbc..62f73181 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java @@ -67,17 +67,14 @@ public abstract class AbstractAuthInitialize extends WiringDeclarableSupport return Optional.ofNullable(this.environment); } - /* (non-Javadoc */ @Override @SuppressWarnings("deprecation") public final void init(LogWriter logWriter, LogWriter logWriter1) throws AuthenticationFailedException { doInit(); } - protected void doInit() { - } + protected void doInit() { } - /* (non-Javadoc */ @Override public final Properties getCredentials(Properties properties, DistributedMember distributedMember, boolean isPeer) throws AuthenticationFailedException { @@ -87,8 +84,7 @@ public abstract class AbstractAuthInitialize extends WiringDeclarableSupport protected abstract Properties doGetCredentials(Properties properties); - /* (non-Javadoc */ @Override - public void close() { - } + public void close() { } + } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java index 6e5c1dff..7a7dcf23 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java @@ -18,13 +18,16 @@ package org.springframework.data.gemfire.config.annotation.support; import java.util.Properties; +import org.apache.geode.security.AuthInitialize; import org.apache.shiro.util.StringUtils; /** - * The AutoConfiguredAuthenticationInitializer class... + * The {@link AutoConfiguredAuthenticationInitializer} class is an {@link AuthInitialize} implementation, + * which auto-configures security, and specifically authentication, for Apache Geode/Pivotal GemFire. * * @author John Blum - * @since 1.0.0 + * @see org.apache.geode.security.AuthInitialize + * @since 2.0.0 */ @SuppressWarnings("unused") public class AutoConfiguredAuthenticationInitializer extends AbstractAuthInitialize { @@ -53,7 +56,6 @@ public class AutoConfiguredAuthenticationInitializer extends AbstractAuthInitial return authenticationInitializer; } - /* (non-Javadoc) */ @Override protected Properties doGetCredentials(Properties properties) { diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java index a1f48c87..65d175bf 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java @@ -70,7 +70,7 @@ import org.springframework.util.StringUtils; */ @SuppressWarnings("unused") public class LuceneIndexFactoryBean extends AbstractFactoryBeanSupport - implements DisposableBean, InitializingBean { + implements DisposableBean, InitializingBean { protected static final boolean DEFAULT_DESTROY = false; @@ -101,9 +101,6 @@ public class LuceneIndexFactoryBean extends AbstractFactoryBeanSupport cacheServerConfigurer.configure(getBeanName(), this)); } - /* (non-Javadoc) */ private Cache resolveCache() { + return Optional.ofNullable(this.cache) .orElseThrow(() -> newIllegalArgumentException("Cache is required")); } @@ -238,12 +237,10 @@ public class CacheServerFactoryBean extends AbstractFactoryBeanSupport listeners) { this.listeners = listeners; } - /* (non-Javadoc) */ public void setLoadPollInterval(long loadPollInterval) { this.loadPollInterval = loadPollInterval; } - /* (non-Javadoc) */ public void setMaxConnections(int maxConnections) { this.maxConnections = maxConnections; } - /* (non-Javadoc) */ public void setMaxMessageCount(int maxMessageCount) { this.maxMessageCount = maxMessageCount; } - /* (non-Javadoc) */ public void setMaxThreads(int maxThreads) { this.maxThreads = maxThreads; } - /* (non-Javadoc) */ public void setMaxTimeBetweenPings(int maxTimeBetweenPings) { this.maxTimeBetweenPings = maxTimeBetweenPings; } - /* (non-Javadoc) */ public void setMessageTimeToLive(int messageTimeToLive) { this.messageTimeToLive = messageTimeToLive; } - /* (non-Javadoc) */ public void setNotifyBySubscription(boolean notifyBySubscription) { this.notifyBySubscription = notifyBySubscription; } - /* (non-Javadoc) */ public void setPort(int port) { this.port = port; } - /* (non-Javadoc) */ public void setServerGroups(String[] serverGroups) { this.serverGroups = serverGroups; } - /* (non-Javadoc) */ public void setServerLoadProbe(ServerLoadProbe serverLoadProbe) { this.serverLoadProbe = serverLoadProbe; } - /* (non-Javadoc) */ public void setSocketBufferSize(int socketBufferSize) { this.socketBufferSize = socketBufferSize; } - /* (non-Javadoc) */ public void setSubscriptionCapacity(int subscriptionCapacity) { this.subscriptionCapacity = subscriptionCapacity; } - /* (non-Javadoc) */ public void setSubscriptionDiskStore(String diskStoreName) { this.subscriptionDiskStore = diskStoreName; } - /* (non-Javadoc) */ SubscriptionEvictionPolicy getSubscriptionEvictionPolicy() { return Optional.ofNullable(this.subscriptionEvictionPolicy).orElse(SubscriptionEvictionPolicy.DEFAULT); } - /* (non-Javadoc) */ public void setSubscriptionEvictionPolicy(SubscriptionEvictionPolicy evictionPolicy) { this.subscriptionEvictionPolicy = evictionPolicy; } - /* (non-Javadoc) */ public void setTcpNoDelay(boolean tcpNoDelay) { this.tcpNoDelay = tcpNoDelay; } diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java index a4262fb8..f490f8a2 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java @@ -62,7 +62,6 @@ public class EnableSslConfigurationIntegrationTests extends ClientServerIntegrat @Resource(name = "Echo") private Region echo; - @BeforeClass public static void setupGemFireServer() throws Exception {