From 868d168b5b1e81f57032ef2de07c88b100973d17 Mon Sep 17 00:00:00 2001 From: John Blum Date: Sun, 9 Jun 2019 18:30:47 -0700 Subject: [PATCH] Polish and format source code. --- .../ForkingClientServerIntegrationTestsSupport.java | 8 +++----- .../ClientServerIntegrationTestsConfiguration.java | 10 ++++++++-- .../gemfire/tests/mock/annotation/GemFireUnitTest.java | 1 - .../config/GemFireMockObjectsBeanPostProcessor.java | 10 ++++++---- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java index d6c86d2..d224990 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java @@ -60,18 +60,16 @@ public abstract class ForkingClientServerIntegrationTestsSupport extends ClientS int availablePort = setAndGetPoolPortProperty(setAndGetCacheServerPortProperty(findAvailablePort())); - List argumentList = new ArrayList<>(); + List argumentList = new ArrayList<>(Arrays.asList(nullSafeArray(arguments, String.class))); - argumentList.addAll(Arrays.asList(nullSafeArray(arguments, String.class))); argumentList.add(String.format("-D%s=%d", GEMFIRE_CACHE_SERVER_PORT_PROPERTY, availablePort)); - setGemFireServerProcess(run(gemfireServerConfigurationClass, - argumentList.toArray(new String[argumentList.size()]))); + setGemFireServerProcess(run(gemfireServerConfigurationClass, argumentList.toArray(new String[0]))); waitForServerToStart("localhost", availablePort); } - protected static int setAndGetCacheServerPortProperty(int port) throws IOException { + protected static int setAndGetCacheServerPortProperty(int port) { System.setProperty(GEMFIRE_CACHE_SERVER_PORT_PROPERTY, String.valueOf(port)); diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java index ec7309f..1d003f3 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.tests.integration.config; import static org.springframework.data.gemfire.tests.integration.ClientServerIntegrationTestsSupport.GEMFIRE_CACHE_SERVER_PORT_PROPERTY; import java.util.Collections; +import java.util.List; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.Pool; @@ -96,8 +97,13 @@ public class ClientServerIntegrationTestsConfiguration { ClientCacheConfigurer clientCachePoolPortConfigurer( @Value("${" + GEMFIRE_CACHE_SERVER_PORT_PROPERTY + ":" + DEFAULT_PORT + "}") int port) { - return (beanName, clientCacheFactoryBean) -> clientCacheFactoryBean.setServers( - Collections.singletonList(new ConnectionEndpoint("localhost", port))); + return (beanName, clientCacheFactoryBean) -> { + + List servers = + Collections.singletonList(new ConnectionEndpoint("localhost", port)); + + clientCacheFactoryBean.setServers(servers); + }; } @Configuration diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java index b0520da..5e7ec82 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.data.gemfire.tests.mock.annotation; import java.lang.annotation.Documented; diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java index e1f29a6..f896267 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java @@ -77,10 +77,10 @@ public class GemFireMockObjectsBeanPostProcessor implements BeanPostProcessor { @Nullable @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { - return (isGemFireProperties(bean, beanName) ? set((Properties) bean) - : (bean instanceof CacheFactoryBean ? spyOnCacheFactoryBean((CacheFactoryBean) bean, this.useSingletonCache) - : (bean instanceof PoolFactoryBean ? mockThePoolFactoryBean((PoolFactoryBean) bean) - : bean))); + return isGemFireProperties(bean, beanName) ? set((Properties) bean) + : bean instanceof CacheFactoryBean ? spyOnCacheFactoryBean((CacheFactoryBean) bean, this.useSingletonCache) + : bean instanceof PoolFactoryBean ? mockThePoolFactoryBean((PoolFactoryBean) bean) + : bean; } @Nullable @Override @@ -101,7 +101,9 @@ public class GemFireMockObjectsBeanPostProcessor implements BeanPostProcessor { } private Object set(Properties gemfireProperties) { + this.gemfireProperties.set(gemfireProperties); + return gemfireProperties; }