From b2e38904bb7e30575455956d29aee618011d6f7d Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 14 Jul 2021 12:03:57 -0700 Subject: [PATCH] Refactor the ClientCacheFactoryBean class. Apply Spring @NonNull and @Nullable annotations appropriately. Remove static import on java.util.stream.StreamSupport. --- .../data/gemfire/client/ClientCacheFactoryBean.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java index 99ad6d70..767ad6e3 100644 --- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java +++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java @@ -15,7 +15,6 @@ */ package org.springframework.data.gemfire.client; -import static java.util.stream.StreamSupport.stream; import static org.springframework.data.gemfire.util.CollectionUtils.nullSafeCollection; import java.net.InetSocketAddress; @@ -155,7 +154,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * @see #applyClientCacheConfigurers(Iterable) */ protected void applyClientCacheConfigurers(ClientCacheConfigurer... clientCacheConfigurers) { - applyClientCacheConfigurers(Arrays.asList(ArrayUtils.nullSafeArray(clientCacheConfigurers, ClientCacheConfigurer.class))); + applyClientCacheConfigurers(Arrays.asList(ArrayUtils.nullSafeArray(clientCacheConfigurers, + ClientCacheConfigurer.class))); } /** @@ -320,7 +320,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat Iterable servers = pool.getServers(getServers().toInetSocketAddresses()); - stream(servers.spliterator(), false).forEach(server -> { + StreamSupport.stream(servers.spliterator(), false).forEach(server -> { clientCacheFactory.addPoolServer(server.getHostName(), server.getPort()); noServers.set(false); }); @@ -330,7 +330,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat Iterable locators = pool.getLocators(getLocators().toInetSocketAddresses()); - stream(locators.spliterator(), false).forEach(locator -> + StreamSupport.stream(locators.spliterator(), false).forEach(locator -> clientCacheFactory.addPoolLocator(locator.getHostName(), locator.getPort())); } @@ -421,7 +421,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * @see #fetchCache() */ @Override - public void onApplicationEvent(ContextRefreshedEvent event) { + public void onApplicationEvent(@NonNull ContextRefreshedEvent event) { if (isReadyForEvents()) { try { @@ -442,7 +442,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * @see #isKeepAlive() */ @Override - protected void close(GemFireCache cache) { + protected void close(@NonNull GemFireCache cache) { ((ClientCache) cache).close(isKeepAlive()); }