From 19847910c882242d1b16ccd1adf26caf743b7fc8 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 23 Jan 2020 14:10:27 -0800 Subject: [PATCH] Optimize imports. --- ...ingClientServerIntegrationTestsSupport.java | 4 ++-- ...entServerIntegrationTestsConfiguration.java | 6 +++--- ...ySpiesConfiguresMockCacheNameUnitTests.java | 6 +++--- ...EagerlyInitializesDefaultPoolUnitTests.java | 6 +++--- ...ePropertyConfigurationIntegrationTests.java | 4 ++-- ...PoolRegisteredWithPoolManagerUnitTests.java | 8 ++++---- ...DataAccessOperationsAndEventsUnitTests.java | 18 +++++++++--------- .../ClientServerIntegrationTests.java | 8 ++++---- .../SslConfigurationIntegrationTests.java | 4 ++-- .../slf4j/logback/TestAppenderUnitTests.java | 1 + ...FireMockObjectsSupportIntegrationTests.java | 6 +++--- 11 files changed, 36 insertions(+), 35 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 2d24705..91ceb90 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 @@ -23,11 +23,11 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +import org.junit.AfterClass; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.client.ClientCache; -import org.junit.AfterClass; - import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.gemfire.config.annotation.CacheServerApplication; import org.springframework.data.gemfire.config.annotation.ClientCacheApplication; 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 6ae773e..36fbc41 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 @@ -24,9 +24,6 @@ import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.server.CacheServer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; @@ -44,6 +41,9 @@ import org.springframework.data.gemfire.config.annotation.EnableManager; import org.springframework.data.gemfire.support.ConnectionEndpoint; import org.springframework.util.ClassUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * The {@link ClientServerIntegrationTestsConfiguration} class is a Spring {@link Configuration} class that registers * a {@link ClientCacheConfigurer} used to configure the {@link ClientCache} {@literal DEFAULT} {@link Pool} port diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/CacheAndClientCacheFactorySpiesConfiguresMockCacheNameUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/CacheAndClientCacheFactorySpiesConfiguresMockCacheNameUnitTests.java index 6262e10..73ba106 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/CacheAndClientCacheFactorySpiesConfiguresMockCacheNameUnitTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/CacheAndClientCacheFactorySpiesConfiguresMockCacheNameUnitTests.java @@ -19,6 +19,9 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Properties; +import org.junit.After; +import org.junit.Test; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.client.ClientCache; @@ -26,9 +29,6 @@ import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.internal.cache.GemFireCacheImpl; -import org.junit.After; -import org.junit.Test; - import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport; /** diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/ClientCacheFactorySpyEagerlyInitializesDefaultPoolUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/ClientCacheFactorySpyEagerlyInitializesDefaultPoolUnitTests.java index ecc97cc..ef2339e 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/ClientCacheFactorySpyEagerlyInitializesDefaultPoolUnitTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/ClientCacheFactorySpyEagerlyInitializesDefaultPoolUnitTests.java @@ -17,14 +17,14 @@ package org.springframework.data.gemfire.tests; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.After; +import org.junit.Test; + import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolManager; -import org.junit.After; -import org.junit.Test; - import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport; /** diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java index c906df6..10c78bb 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java @@ -19,11 +19,11 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Properties; -import org.apache.geode.cache.GemFireCache; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.GemFireCache; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.config.annotation.EnableSecurity; import org.springframework.data.gemfire.config.annotation.PeerCacheApplication; diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockClientCacheDefaultPoolRegisteredWithPoolManagerUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockClientCacheDefaultPoolRegisteredWithPoolManagerUnitTests.java index dc8113f..dc4b1e1 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockClientCacheDefaultPoolRegisteredWithPoolManagerUnitTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockClientCacheDefaultPoolRegisteredWithPoolManagerUnitTests.java @@ -20,15 +20,15 @@ import static org.assertj.core.api.Assertions.assertThat; import java.net.InetSocketAddress; import java.util.Collections; -import org.apache.geode.cache.client.ClientCache; -import org.apache.geode.cache.client.Pool; -import org.apache.geode.cache.client.PoolManager; - import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolManager; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java index e70a1a3..c830561 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java @@ -32,6 +32,15 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI import java.util.concurrent.atomic.AtomicInteger; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InOrder; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.stubbing.Answer; + import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheWriter; @@ -43,15 +52,6 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.RegionService; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InOrder; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.mockito.stubbing.Answer; - import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport; /** diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTests.java index 0ba9191..713c36c 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTests.java @@ -21,14 +21,14 @@ import java.io.IOException; import javax.annotation.Resource; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.client.ClientRegionShortcut; - import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientRegionShortcut; + import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.PartitionedRegionFactoryBean; diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/SslConfigurationIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/SslConfigurationIntegrationTests.java index 8d39b1a..04dd14e 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/SslConfigurationIntegrationTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/SslConfigurationIntegrationTests.java @@ -20,10 +20,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; import java.util.Optional; -import org.apache.geode.internal.net.SSLConfigurationFactory; - import org.junit.Test; +import org.apache.geode.internal.net.SSLConfigurationFactory; + import org.springframework.util.ReflectionUtils; /** diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/logging/slf4j/logback/TestAppenderUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/logging/slf4j/logback/TestAppenderUnitTests.java index 9b4ee37..51ce01f 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/logging/slf4j/logback/TestAppenderUnitTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/logging/slf4j/logback/TestAppenderUnitTests.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.tests.logging.slf4j.logback; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java index b266515..9b251d7 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java @@ -20,12 +20,12 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.geode.cache.Cache; -import org.apache.geode.cache.CacheFactory; - import org.junit.After; import org.junit.Test; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; + import org.springframework.beans.factory.DisposableBean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.support.AbstractSecurityManager;