From c0b929c001b27fb32e4bb1cea668e24b5a4540d7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 14 Jul 2021 12:19:24 -0700 Subject: [PATCH] Optimize imports. --- .../CachingWithGemFireIntegrationTest.java | 4 ++-- .../cache/CallableCacheLoaderAdapterTest.java | 8 ++++---- ...oundCachePutCacheEvictIntegrationTests.java | 12 ++++++------ .../cache/GemfireCacheIntegrationTests.java | 6 +++--- .../cache/GemfireCacheManagerUnitTests.java | 6 +++--- .../gemfire/cache/GemfireCacheUnitTests.java | 4 ++-- .../EnableGemfireCachingIntegrationTests.java | 6 +++--- .../client/ClientCacheIndexingTest.java | 10 +++++----- .../client/ClientCacheIntegrationTests.java | 4 ++-- .../gemfire/client/ClientCachePoolTests.java | 10 +++++----- .../ClientCacheVariableLocatorsTest.java | 10 +++++----- .../client/ClientCacheVariableServersTest.java | 10 +++++----- .../client/ClientRegionFactoryBeanTest.java | 8 ++++---- .../client/ClientRegionIntegrationTests.java | 6 +++--- .../ClientRegionShortcutConverterTest.java | 4 ++-- ...ShortcutToDataPolicyConverterUnitTests.java | 4 ++-- .../ClientRegionShortcutWrapperTest.java | 4 ++-- .../ClientRegionWithCacheLoaderWriterTest.java | 6 +++--- .../ClientSubRegionIntegrationTests.java | 6 +++--- .../DurableClientCacheIntegrationTest.java | 18 +++++++++--------- .../GemFireDataSourceIntegrationTest.java | 6 +++--- .../GemFireDataSourceIntegrationTests.java | 8 ++++---- ...ConfiguredGemFireServerIntegrationTest.java | 11 ++++++----- .../GemfireDataSourcePostProcessorTest.java | 10 +++++----- ...InterestResultPolicyConverterUnitTests.java | 4 ++-- .../client/InterestResultPolicyTypeTest.java | 4 ++-- .../data/gemfire/client/InterestUnitTests.java | 4 ++-- .../LocalOnlyClientCacheIntegrationTests.java | 8 ++++---- ...ressionConfiguredPoolsIntegrationTests.java | 6 +++--- .../ListRegionsOnServerFunctionTest.java | 8 ++++---- .../admin/GemfireAdminOperationsUnitTests.java | 6 +++--- .../CreateIndexFunctionUnitTests.java | 10 +++++----- .../CreateRegionFunctionUnitTests.java | 10 +++++----- .../ListIndexesFunctionUnitTests.java | 8 ++++---- .../FunctionGemfireAdminTemplateUnitTests.java | 12 ++++++------ ...tpGemfireAdminTemplateBuilderUnitTests.java | 4 ++-- ...xpirationConfigurationIntegrationTests.java | 7 +++---- .../ClientRegionCollectorUnitTests.java | 8 ++++---- ...ComposableSchemaObjectDefinerUnitTests.java | 4 ++-- .../support/IndexCollectorUnitTests.java | 8 ++++---- .../schema/support/IndexDefinerUnitTests.java | 6 +++--- .../support/RegionCollectorUnitTests.java | 6 +++--- .../schema/support/RegionDefinerUnitTests.java | 10 +++++----- .../xml/AbstractRegionParserUnitTests.java | 5 +++-- .../config/xml/CacheServerNamespaceTest.java | 6 +++--- .../config/xml/CacheSubscriptionTest.java | 6 +++--- .../config/xml/CacheUsingPdxNamespaceTest.java | 4 ++-- .../config/xml/ClientCacheParserUnitTests.java | 5 +++-- .../config/xml/ClientRegionNamespaceTest.java | 8 ++++---- ...ousQueryListenerContainerNamespaceTest.java | 8 ++++---- .../DiskStoreAndEvictionRegionParsingTest.java | 10 +++++----- .../config/xml/DiskStoreNamespaceTest.java | 4 ++-- .../xml/FunctionServiceNamespaceTest.java | 6 +++--- .../GatewayReceiverAutoStartNamespaceTest.java | 4 ++-- ...tewayReceiverDefaultStartNamespaceTest.java | 4 ++-- ...atewayReceiverManualStartNamespaceTest.java | 4 ++-- .../xml/GemfireV8GatewayNamespaceTest.java | 6 +++--- .../gemfire/config/xml/IndexNamespaceTest.java | 6 +++--- ...egionExpirationAttributesNamespaceTest.java | 7 ++++--- .../JndiBindingsPropertyPlaceholderTest.java | 4 ++-- .../gemfire/config/xml/JndiBindingsTest.java | 6 +++--- .../config/xml/LocalRegionNamespaceTest.java | 6 +++--- ...nWithEvictionPolicyActionNamespaceTest.java | 6 +++--- ...ueuesAndGatewaySendersIntegrationTests.java | 6 +++--- .../config/xml/LuceneNamespaceUnitTests.java | 7 ++++--- .../config/xml/MembershipAttributesTest.java | 6 +++--- .../gemfire/config/xml/MultipleCacheTest.java | 4 ++-- .../xml/PartitionedRegionNamespaceTest.java | 6 +++--- .../gemfire/config/xml/PoolNamespaceTest.java | 4 ++-- .../config/xml/PoolParserUnitTests.java | 5 +++-- ...egionDefinitionUsingBeansNamespaceTest.java | 6 +++--- .../RegionEvictionAttributesNamespaceTest.java | 6 +++--- ...egionExpirationAttributesNamespaceTest.java | 6 +++--- ...ionSubscriptionAttributesNamespaceTest.java | 6 +++--- ...toreAndPersistenceEvictionSettingsTest.java | 6 +++--- .../xml/ReplicatedRegionNamespaceTest.java | 6 +++--- .../config/xml/SubRegionNamespaceTest.java | 6 +++--- .../xml/SubRegionSubElementNamespaceTest.java | 6 +++--- .../SubRegionWithInvalidDataPolicyTest.java | 3 ++- .../xml/TemplateClientRegionNamespaceTest.java | 6 +++--- ...PersistentPartitionRegionNamespaceTest.java | 8 ++++---- .../xml/TemplateRegionsNamespaceTests.java | 6 +++--- .../PoolAlreadyExistsIntegrationTests.java | 6 +++--- .../dao/GemfireDaoSupportUnitTests.java | 4 ++-- .../gemfire/fork/SpringContainerProcess.java | 6 +++--- .../gemfire/test/MockClientRegionFactory.java | 6 +++--- .../data/gemfire/test/MockRegionFactory.java | 6 +++--- .../gemfire/test/MockRegionFactoryTest.java | 4 ++-- .../test/StubGatewayReceiverFactory.java | 6 +++--- .../gemfire/test/StubGatewaySenderFactory.java | 6 +++--- .../data/gemfire/test/model/Book.java | 8 ++++---- .../AbstractRegionFactoryBeanTests.java | 4 ++-- ...ueByIdXmlConfigurationIntegrationTests.java | 10 +++++----- ...cEventQueueWithListenerIntegrationTest.java | 6 +++--- ...ntQueueAndGatewaySenderIntegrationTest.java | 6 +++--- .../wan/GatewayReceiverFactoryBeanTest.java | 4 ++-- ...erByIdXmlConfigurationIntegrationTests.java | 10 +++++----- .../wan/GatewaySenderFactoryBeanTest.java | 4 ++-- ...ualGatewayReceiverStartIntegrationTest.java | 4 ++-- .../wan/OrderPolicyConverterUnitTests.java | 4 ++-- .../data/gemfire/wan/OrderPolicyTypeTest.java | 4 ++-- ...cEventQueuesAndGatewaySendersUnitTests.java | 6 +++--- 102 files changed, 329 insertions(+), 323 deletions(-) diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java index 197cd30d..9e5bcd84 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java @@ -27,11 +27,11 @@ import java.util.Map; import javax.annotation.PostConstruct; import javax.annotation.Resource; -import org.apache.geode.cache.Region; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.Region; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.test.context.ActiveProfiles; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java index cb53abcd..70a44bc0 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java @@ -30,10 +30,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.apache.geode.cache.CacheLoader; -import org.apache.geode.cache.LoaderHelper; -import org.apache.geode.cache.Region; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -43,6 +39,10 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; + /** * Unit tests to test the adaption of the {@link java.util.concurrent.Callable} * into GemFire's {@link org.apache.geode.cache.CacheLoader} interface. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java index 4e662208..5d970856 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java @@ -26,16 +26,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Resource; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - -import org.apache.geode.cache.GemFireCache; - import org.junit.Before; 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.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; @@ -57,6 +53,10 @@ import org.springframework.stereotype.Service; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + /** * Integration tests testing the contractual behavior and combination of using Spring'a {@link CachePut} annotation * followed by a {@link CacheEvict} annotation on an application {@link @Service} component. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java index 4391044f..19fa6b64 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java @@ -27,13 +27,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import edu.umd.cs.mtc.MultithreadedTestCase; import edu.umd.cs.mtc.TestFramework; -import org.apache.geode.cache.CacheFactory; -import org.apache.geode.cache.Region; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; + import org.springframework.cache.Cache; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.test.support.AbstractNativeCacheTests; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java index d86baab5..fd7798ad 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java @@ -34,9 +34,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.Region; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -45,6 +42,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; + import org.springframework.cache.Cache; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java index 076ce6cf..f5c94c85 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java @@ -33,8 +33,6 @@ import static org.mockito.Mockito.when; import java.util.concurrent.Callable; -import org.apache.geode.cache.Region; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -42,6 +40,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.Region; + import org.springframework.cache.Cache; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/config/EnableGemfireCachingIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/config/EnableGemfireCachingIntegrationTests.java index 56eb904a..1d4b9265 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/config/EnableGemfireCachingIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/config/EnableGemfireCachingIntegrationTests.java @@ -19,12 +19,12 @@ import static org.assertj.core.api.Java6Assertions.assertThat; import javax.annotation.Resource; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.Region; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Bean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java index c3642e62..37e43c8f 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java @@ -26,17 +26,17 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.IndexType; import org.apache.geode.cache.query.QueryService; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.process.ProcessExecutor; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java index e6a1fdab..58c25bed 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java @@ -17,13 +17,13 @@ package org.springframework.data.gemfire.client; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Test; + import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; -import org.junit.Test; - import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java index 3ed239e6..98d4065b 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java @@ -23,16 +23,16 @@ import static org.junit.Assert.assertThat; import javax.annotation.Resource; -import org.apache.geode.cache.CacheLoader; -import org.apache.geode.cache.CacheLoaderException; -import org.apache.geode.cache.LoaderHelper; -import org.apache.geode.cache.Region; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; + import org.springframework.data.gemfire.process.ProcessWrapper; import org.springframework.data.gemfire.test.support.AbstractGemFireClientServerIntegrationTest; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java index 1a9353af..bffa3876 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java @@ -29,16 +29,16 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Resource; -import org.apache.geode.cache.CacheLoader; -import org.apache.geode.cache.CacheLoaderException; -import org.apache.geode.cache.LoaderHelper; -import org.apache.geode.cache.Region; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; + import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.process.ProcessExecutor; import org.springframework.data.gemfire.process.ProcessWrapper; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java index df4890ae..db03264b 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java @@ -29,16 +29,16 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Resource; -import org.apache.geode.cache.CacheLoader; -import org.apache.geode.cache.CacheLoaderException; -import org.apache.geode.cache.LoaderHelper; -import org.apache.geode.cache.Region; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; + import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.process.ProcessExecutor; import org.springframework.data.gemfire.process.ProcessWrapper; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java index c6370a2f..449802e2 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java @@ -36,6 +36,10 @@ import static org.mockito.Mockito.when; import java.io.InputStream; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.ExpirationAttributes; @@ -48,10 +52,6 @@ import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; import org.apache.geode.compression.Compressor; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanFactory; import org.springframework.data.gemfire.TestUtils; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java index 17fb3203..a59ebb24 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java @@ -20,13 +20,13 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; +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.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.config.annotation.ClientCacheApplication; import org.springframework.data.gemfire.test.mock.annotation.EnableGemFireMockObjects; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java index 4c8ed5e2..641ab77a 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java @@ -19,10 +19,10 @@ package org.springframework.data.gemfire.client; import static org.junit.Assert.assertEquals; -import org.apache.geode.cache.client.ClientRegionShortcut; - import org.junit.Test; +import org.apache.geode.cache.client.ClientRegionShortcut; + /** * The ClientRegionShortcutConverterTest class is a test suite of test cases testing the contract and functionality * of the ClientRegionShortcutConverter class diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java index 239deb60..0fb64991 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java @@ -18,11 +18,11 @@ package org.springframework.data.gemfire.client; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Test; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.client.ClientRegionShortcut; -import org.junit.Test; - /** * Unit tests for {@link ClientRegionShortcutToDataPolicyConverter}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java index 72977c0c..c5a8cc52 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java @@ -22,10 +22,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.apache.geode.cache.client.ClientRegionShortcut; - import org.junit.Test; +import org.apache.geode.cache.client.ClientRegionShortcut; + /** * The ClientRegionShortcutWrapperTest class is a test suite of test cases testing the contract and functionality of the * ClientRegionShortcutWrapper enum class type. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java index 368d560d..bda0d346 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java @@ -25,6 +25,9 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.CacheWriterException; @@ -33,9 +36,6 @@ import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; import org.apache.geode.cache.util.CacheWriterAdapter; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java index db8c7744..98b10345 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java @@ -20,14 +20,14 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.client.ClientCache; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.fork.ServerProcess; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java index f1e41fbd..8e5b7363 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java @@ -30,6 +30,15 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Resource; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; + import org.apache.geode.cache.CacheClosedException; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.EntryEvent; @@ -40,15 +49,6 @@ import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.util.CacheListenerAdapter; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanPostProcessor; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java index 9c5a0c3d..09bfd12a 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java @@ -24,14 +24,14 @@ import java.util.List; import javax.annotation.Resource; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.client.ClientCache; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.GemfireUtils; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java index b5614e81..fe5be5dc 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java @@ -18,15 +18,15 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import org.apache.geode.cache.DataPolicy; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.client.Pool; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.Pool; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.GemfireUtils; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java index 0dced8e1..4f3f8bb2 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java @@ -24,16 +24,15 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Resource; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.client.ClientCache; -import org.apache.geode.distributed.ServerLauncher; - -import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.distributed.ServerLauncher; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.core.io.ClassPathResource; @@ -49,6 +48,8 @@ import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; import org.springframework.util.StringUtils; +import org.assertj.core.api.Assertions; + /** * The GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest class is a test suite of test cases * testing the contract and functionality of the GemfireDataSourcePostProcessor using the <gfe-data:datasource> diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java index 8fbbb62b..3c8dd0fc 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java @@ -40,6 +40,11 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; @@ -51,11 +56,6 @@ import org.apache.geode.cache.execute.Function; import org.apache.geode.management.internal.cli.domain.RegionInformation; import org.apache.geode.management.internal.cli.functions.GetRegionsFunction; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - import org.springframework.beans.TypeMismatchException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java index d175dea0..4cdd666a 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java @@ -20,13 +20,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import org.apache.geode.cache.InterestResultPolicy; - import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.apache.geode.cache.InterestResultPolicy; + /** * Unit tests for {@link InterestResultPolicyConverter}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java index 90c9b9a8..1c6aaa1d 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java @@ -21,10 +21,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; -import org.apache.geode.cache.InterestResultPolicy; - import org.junit.Test; +import org.apache.geode.cache.InterestResultPolicy; + /** * The InterestResultPolicyTypeTest class is a test suite of test cases testing the contract and functionality * of the InterestResultPolicyType enum. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java index fd0342d7..8fd7d72d 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java @@ -26,12 +26,12 @@ import static org.springframework.data.gemfire.client.Interest.newInterest; import java.util.List; -import org.apache.geode.cache.InterestResultPolicy; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.apache.geode.cache.InterestResultPolicy; + /** * Unit tests for {@link Interest}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java index 442c6bc3..c3590e29 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java @@ -23,15 +23,15 @@ import java.util.Calendar; import javax.annotation.Resource; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.config.annotation.ClientCacheApplication; import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java index 3f530d53..d82a32f0 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java @@ -26,12 +26,12 @@ import java.util.Collections; import java.util.Optional; import java.util.Properties; -import org.apache.geode.cache.client.Pool; -import org.apache.geode.cache.client.PoolFactory; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java index ee48cb0a..b584fca0 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java @@ -35,15 +35,15 @@ import java.util.HashSet; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.ResultSender; -import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - /** * The ListRegionsOnServerFunctionTest class is a test suite of test cases testing the contract and functionality * of the ListRegionsOnServerFunction GemFire Function class. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java index 9fcedc7b..57c7478f 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java @@ -28,15 +28,15 @@ import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.Collections; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.query.Index; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.Index; + import org.springframework.data.gemfire.config.schema.SchemaObjectDefinition; import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java index d48b8c8f..6d45ec89 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java @@ -29,17 +29,17 @@ import static org.mockito.Mockito.when; import java.util.Collections; -import org.apache.geode.cache.Cache; -import org.apache.geode.cache.query.Index; -import org.apache.geode.cache.query.QueryException; -import org.apache.geode.cache.query.QueryService; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.query.Index; +import org.apache.geode.cache.query.QueryException; +import org.apache.geode.cache.query.QueryService; + import org.springframework.data.gemfire.IndexType; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java index 8f876ff8..d9de9c98 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java @@ -28,17 +28,17 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.apache.geode.cache.Cache; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.RegionFactory; -import org.apache.geode.cache.RegionShortcut; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.RegionShortcut; + import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java index a9f0d6bf..311cb0de 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java @@ -25,16 +25,16 @@ import static org.mockito.Mockito.when; import java.util.Arrays; -import org.apache.geode.cache.Cache; -import org.apache.geode.cache.query.Index; -import org.apache.geode.cache.query.QueryService; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.query.Index; +import org.apache.geode.cache.query.QueryService; + /** * Unit tests for {@link ListIndexesFunction}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java index 28ae11ce..b45e4eb8 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java @@ -29,6 +29,12 @@ import static org.mockito.Mockito.when; import static org.springframework.data.gemfire.util.ArrayUtils.asArray; import static org.springframework.data.gemfire.util.CollectionUtils.asSet; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; @@ -39,12 +45,6 @@ import org.apache.geode.cache.query.Index; import org.apache.geode.management.internal.cli.domain.RegionInformation; import org.apache.geode.management.internal.cli.functions.GetRegionsFunction; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - import org.springframework.data.gemfire.client.function.ListRegionsOnServerFunction; import org.springframework.data.gemfire.config.admin.functions.CreateIndexFunction; import org.springframework.data.gemfire.config.admin.functions.CreateRegionFunction; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java index 97352042..8e371953 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java @@ -23,13 +23,13 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.Optional; -import org.apache.geode.cache.client.ClientCache; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.client.ClientCache; + import org.springframework.data.gemfire.util.NetworkUtils; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpRequestInterceptor; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java index b47abafb..4fe4fcce 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java @@ -13,21 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.config.annotation; import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; +import org.junit.After; +import org.junit.Test; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientRegionShortcut; -import org.junit.After; -import org.junit.Test; - import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.gemfire.expiration.AnnotationBasedExpiration; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java index ed40d0cd..addd835e 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java @@ -30,15 +30,15 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.RegionAttributes; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; + import org.springframework.context.ApplicationContext; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java index 62f13c10..dd22a940 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java @@ -31,13 +31,13 @@ import java.util.Arrays; import java.util.Collections; import java.util.Optional; -import org.apache.geode.cache.Region; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.Region; + import org.springframework.data.gemfire.config.schema.SchemaObjectDefiner; import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java index f0c30a5b..ae8360cc 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java @@ -31,16 +31,16 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.query.Index; -import org.apache.geode.cache.query.QueryService; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.query.Index; +import org.apache.geode.cache.query.QueryService; + import org.springframework.context.ApplicationContext; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java index 981ccac7..c2b84219 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java @@ -19,15 +19,15 @@ package org.springframework.data.gemfire.config.schema.support; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.query.Index; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.Index; + import org.springframework.data.gemfire.IndexType; import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java index cb9c3fca..ea78a452 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java @@ -31,14 +31,14 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.Region; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; + import org.springframework.context.ApplicationContext; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java index 69c61d0e..15560ee7 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java @@ -20,17 +20,17 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.RegionAttributes; -import org.apache.geode.cache.RegionShortcut; -import org.apache.geode.cache.query.Index; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionShortcut; +import org.apache.geode.cache.query.Index; + import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java index 2ad9f803..98e4404a 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java @@ -28,13 +28,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.junit.Test; -import org.w3c.dom.Element; -import org.w3c.dom.Node; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.beans.factory.xml.XmlReaderContext; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + /** * Unit tests for {@link AbstractRegionParser}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java index 625c625c..0e22fa37 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java @@ -20,12 +20,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.apache.geode.cache.server.CacheServer; -import org.apache.geode.cache.server.ClientSubscriptionConfig; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.server.ClientSubscriptionConfig; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java index ee24470d..fe1011d1 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java @@ -20,13 +20,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.InterestPolicy; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.SubscriptionAttributes; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.PeerRegionFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java index 57ca46ea..3b09af86 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import org.apache.geode.pdx.PdxSerializer; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.pdx.PdxSerializer; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.CacheFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java index bd93fda8..da06a6d6 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java @@ -29,8 +29,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; import org.springframework.beans.PropertyValues; import org.springframework.beans.factory.config.BeanDefinition; @@ -39,6 +37,9 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + /** * Unit tests for {@link ClientCacheParser}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java index b8dfedca..86dac665 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java @@ -30,6 +30,10 @@ import static org.springframework.data.gemfire.util.ArrayUtils.nullSafeArray; import java.io.File; +import org.junit.AfterClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; @@ -46,10 +50,6 @@ import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.util.CacheWriterAdapter; import org.apache.geode.compression.Compressor; -import org.junit.AfterClass; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.SimpleCacheListener; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java index 69c51671..67684f0d 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java @@ -29,15 +29,15 @@ import java.util.concurrent.Executor; import javax.annotation.Resource; -import org.apache.geode.cache.client.ClientCache; -import org.apache.geode.cache.query.CqListener; -import org.apache.geode.cache.query.CqQuery; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.query.CqListener; +import org.apache.geode.cache.query.CqQuery; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.fork.CqCacheServerProcess; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java index dd73054f..b9fc95c0 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java @@ -26,6 +26,11 @@ import static org.springframework.data.gemfire.util.ArrayUtils.nullSafeArray; import java.io.File; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.CustomExpiry; import org.apache.geode.cache.DataPolicy; @@ -42,11 +47,6 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.Scope; import org.apache.geode.cache.util.ObjectSizer; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java index 0ba385f2..ddad5a9a 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java @@ -22,11 +22,11 @@ import static org.junit.Assert.assertNotNull; import java.io.File; import java.util.Properties; -import org.apache.geode.cache.DiskStore; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.DiskStore; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java index 98ef0815..fdd4a70c 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java @@ -19,13 +19,13 @@ package org.springframework.data.gemfire.config.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.execute.FunctionAdapter; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.FunctionService; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java index 4f315911..38a26dc9 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; -import org.apache.geode.cache.wan.GatewayReceiver; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.wan.GatewayReceiver; + import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.data.gemfire.wan.GatewayReceiverFactoryBean; import org.springframework.test.context.ActiveProfiles; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java index a6f78f5b..7e1486d1 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; -import org.apache.geode.cache.wan.GatewayReceiver; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.wan.GatewayReceiver; + import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.data.gemfire.wan.GatewayReceiverFactoryBean; import org.springframework.test.context.ActiveProfiles; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java index b3488e15..784d7f99 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; -import org.apache.geode.cache.wan.GatewayReceiver; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.wan.GatewayReceiver; + import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.data.gemfire.wan.GatewayReceiverFactoryBean; import org.springframework.test.context.ActiveProfiles; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java index cdde389e..d51785d8 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java @@ -21,13 +21,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.EntryEvent; import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; import org.apache.geode.cache.wan.GatewaySender; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java index 737f6587..b0540fb2 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java @@ -21,12 +21,12 @@ import static org.junit.Assert.assertEquals; import javax.annotation.Resource; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.query.Index; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.Index; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.IndexFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java index 17cf0f9b..be0d17bd 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java @@ -18,16 +18,17 @@ package org.springframework.data.gemfire.config.xml; import static org.assertj.core.api.Assertions.assertThat; -import org.apache.geode.cache.Region; - import org.junit.Test; -import org.xml.sax.SAXParseException; + +import org.apache.geode.cache.Region; import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.data.gemfire.test.GemfireTestBeanPostProcessor; +import org.xml.sax.SAXParseException; + /** * Unit test testing the proper syntax for declaring "custom" expiration attributes on a {@link Region}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java index 32b340a7..abeacbae 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java @@ -24,11 +24,11 @@ import static org.junit.Assert.fail; import java.util.List; import java.util.Map; -import org.apache.geode.internal.datasource.ConfigProperty; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.internal.datasource.ConfigProperty; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.CacheFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java index 337e6b93..96b9c893 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java @@ -19,12 +19,12 @@ package org.springframework.data.gemfire.config.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.apache.geode.cache.Cache; -import org.apache.geode.internal.datasource.GemFireBasicDataSource; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.Cache; +import org.apache.geode.internal.datasource.GemFireBasicDataSource; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java index 33cb8ee0..3a3b81ff 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java @@ -23,6 +23,9 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.DataPolicy; @@ -31,9 +34,6 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.Scope; import org.apache.geode.compression.Compressor; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.PeerRegionFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java index dd9c006b..17986652 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java @@ -21,14 +21,14 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.Region; import org.apache.geode.cache.Scope; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java index 17a60d1f..c6b9d58a 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java @@ -20,14 +20,14 @@ import static org.mockito.Mockito.mock; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.asyncqueue.AsyncEventListener; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.support.AbstractFactoryBeanSupport; import org.springframework.lang.Nullable; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java index 763ac751..f5c88c85 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java @@ -36,6 +36,10 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.stubbing.Answer; + import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneIndexFactory; @@ -43,9 +47,6 @@ import org.apache.geode.cache.lucene.LuceneSerializer; import org.apache.geode.cache.lucene.LuceneService; import org.apache.lucene.analysis.Analyzer; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.stubbing.Answer; import org.springframework.beans.BeansException; import org.springframework.beans.factory.FactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java index c080afd5..1c7ad9d0 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java @@ -19,15 +19,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.LossAction; import org.apache.geode.cache.MembershipAttributes; import org.apache.geode.cache.Region; import org.apache.geode.cache.ResumptionAction; import org.apache.geode.distributed.Role; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java index d0e20c5f..cbdbe265 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java @@ -16,11 +16,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; +import org.junit.Test; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; -import org.junit.Test; - import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java index e949482c..723b36ea 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java @@ -27,6 +27,9 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.FixedPartitionAttributes; @@ -37,9 +40,6 @@ import org.apache.geode.cache.partition.PartitionListener; import org.apache.geode.cache.partition.PartitionListenerAdapter; import org.apache.geode.compression.Compressor; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.PartitionedRegionFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java index bd271df3..bcc5582d 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java @@ -20,11 +20,11 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Iterator; -import org.apache.geode.cache.client.Pool; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.client.Pool; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.TestUtils; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java index d7d9260f..5608571f 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java @@ -35,8 +35,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; import org.springframework.beans.PropertyValues; import org.springframework.beans.factory.config.BeanDefinition; @@ -52,6 +50,9 @@ import org.springframework.data.gemfire.client.PoolFactoryBean; import org.springframework.data.gemfire.support.ConnectionEndpoint; import org.springframework.data.gemfire.support.ConnectionEndpointList; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + /** * Unit tests for {@link PoolParser}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java index 713dfdd9..ff7c1b53 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java @@ -22,14 +22,14 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.PartitionAttributes; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.PeerRegionFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java index 1b90c3b7..90f32554 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java @@ -21,15 +21,15 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAlgorithm; import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.Region; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java index 7cbe59fb..44224705 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java @@ -23,15 +23,15 @@ import static org.mockito.Mockito.mock; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.CustomExpiry; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.ExpirationAction; import org.apache.geode.cache.ExpirationAttributes; import org.apache.geode.cache.Region; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java index 3640f7cf..924386d7 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java @@ -21,13 +21,13 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.InterestPolicy; import org.apache.geode.cache.Region; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java index 1da99989..9837e7b1 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java @@ -22,13 +22,13 @@ import static org.junit.Assert.assertNull; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.Region; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java index e96aab3e..00105bbe 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java @@ -24,6 +24,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.DataPolicy; @@ -32,9 +35,6 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.Scope; import org.apache.geode.compression.Compressor; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.PeerRegionFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java index 161aac3b..d8bf9c56 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java @@ -20,13 +20,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.Region; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.ReplicatedRegionFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java index 8f6492ab..d09241f6 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java @@ -23,15 +23,15 @@ import java.util.List; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.Region; import org.apache.geode.cache.asyncqueue.AsyncEvent; import org.apache.geode.cache.asyncqueue.AsyncEventListener; import org.apache.geode.cache.util.CacheListenerAdapter; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java index 6cb538c4..6a7c687f 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java @@ -20,12 +20,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.xml.sax.SAXParseException; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.xml.sax.SAXParseException; + /** * The SubRegionWithInvalidDataPolicyTest class is a test suite of test cases testing the data-policy and persistent * attributes settings are consistent for GemFire SubRegion bean definitions. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java index 6771173f..5a8fcfe5 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java @@ -27,6 +27,9 @@ import java.util.Arrays; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; @@ -42,9 +45,6 @@ import org.apache.geode.cache.util.CacheListenerAdapter; import org.apache.geode.cache.util.CacheWriterAdapter; import org.apache.geode.cache.util.ObjectSizer; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StringUtils; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java index b6fd67dd..9400c2bc 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java @@ -23,6 +23,10 @@ import java.io.File; import javax.annotation.Resource; +import org.junit.After; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.DiskStore; import org.apache.geode.cache.EntryOperation; @@ -31,10 +35,6 @@ import org.apache.geode.cache.EvictionAlgorithm; import org.apache.geode.cache.PartitionResolver; import org.apache.geode.cache.Region; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.data.gemfire.test.support.FileSystemUtils; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java index 32f97329..8a2de3c8 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java @@ -30,6 +30,9 @@ import java.util.List; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; @@ -58,9 +61,6 @@ import org.apache.geode.cache.util.CacheWriterAdapter; import org.apache.geode.cache.util.ObjectSizer; import org.apache.geode.distributed.Role; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanIsAbstractException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java index a33d5fb1..9245441a 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java @@ -20,13 +20,13 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.function.Function; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.Pool; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.function.annotation.OnRegion; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java index ee627b1c..f37fcbef 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java @@ -20,8 +20,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import org.apache.geode.cache.Region; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -29,6 +27,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.Region; + import org.springframework.data.gemfire.GemfireOperations; import org.springframework.data.gemfire.GemfireTemplate; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java index 566fe94f..4a96facc 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java @@ -16,13 +16,13 @@ package org.springframework.data.gemfire.fork; import java.io.IOException; import java.util.Scanner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.gemfire.ForkUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * {@link SpringContainerProcess} launches a Spring {@link ConfigurableApplicationContext} in this JVM process. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java index 9d4f63dc..73afcccb 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java @@ -25,6 +25,9 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.CustomExpiry; import org.apache.geode.cache.DataPolicy; @@ -35,9 +38,6 @@ import org.apache.geode.cache.client.ClientRegionFactory; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.compression.Compressor; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - import org.springframework.util.StringUtils; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java index e76f1b03..d9bfcedc 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java @@ -23,6 +23,9 @@ import static org.mockito.Mockito.when; import java.io.File; import java.lang.reflect.Field; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + import org.apache.geode.cache.AttributesMutator; import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.CacheLoader; @@ -39,9 +42,6 @@ import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.Scope; import org.apache.geode.cache.SubscriptionAttributes; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - import org.springframework.util.ReflectionUtils; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java index e9006df1..41854623 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java @@ -19,11 +19,11 @@ package org.springframework.data.gemfire.test; import static org.junit.Assert.assertEquals; +import org.junit.Test; + import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.Scope; - -import org.junit.Test; public class MockRegionFactoryTest { @Test public void testBasicAttributes() { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java index 8e396d4a..9f3805c1 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java @@ -22,13 +22,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + import org.apache.geode.cache.wan.GatewayReceiver; import org.apache.geode.cache.wan.GatewayReceiverFactory; import org.apache.geode.cache.wan.GatewayTransportFilter; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - import org.springframework.util.StringUtils; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java index 0b476eeb..57ac1b9b 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java @@ -20,6 +20,9 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + import org.apache.geode.cache.wan.GatewayEventFilter; import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; import org.apache.geode.cache.wan.GatewaySender; @@ -27,9 +30,6 @@ import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; import org.apache.geode.cache.wan.GatewaySenderFactory; import org.apache.geode.cache.wan.GatewayTransportFilter; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - /** * The StubGatewaySenderFactory class for testing purposes. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Book.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Book.java index 94c43cff..57ee60e1 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Book.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/model/Book.java @@ -18,14 +18,14 @@ package org.springframework.data.gemfire.test.model; import java.io.Serializable; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - import org.springframework.data.annotation.Id; import org.springframework.data.gemfire.mapping.annotation.LuceneIndexed; import org.springframework.data.gemfire.mapping.annotation.Region; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + /** * Abstract Data Type (ADT) modeling a {@literal Book} application domain type. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java index 6a254542..cee3e53e 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java @@ -21,13 +21,13 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import org.apache.geode.cache.GemFireCache; - import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; +import org.apache.geode.cache.GemFireCache; + import org.springframework.data.gemfire.PeerRegionFactoryBean; import org.springframework.data.gemfire.test.StubCache; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java index cb1093c0..7fc549bc 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java @@ -22,6 +22,11 @@ import java.io.IOException; import javax.annotation.Resource; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.GemFireCache; @@ -30,11 +35,6 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.asyncqueue.AsyncEventListener; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.PartitionedRegionFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java index 6d3373c1..952ca783 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java @@ -26,14 +26,14 @@ import java.util.List; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.asyncqueue.AsyncEvent; import org.apache.geode.cache.asyncqueue.AsyncEventListener; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; import org.apache.geode.cache.wan.GatewaySender; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java index 27277d60..3baa0117 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java @@ -25,6 +25,9 @@ import java.util.List; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.asyncqueue.AsyncEvent; @@ -32,9 +35,6 @@ import org.apache.geode.cache.asyncqueue.AsyncEventListener; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; import org.apache.geode.cache.wan.GatewaySender; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java index 3da9f343..207bd7fa 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java @@ -24,12 +24,12 @@ import static org.mockito.Mockito.when; import java.util.Collections; +import org.junit.Test; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.wan.GatewayReceiverFactory; import org.apache.geode.cache.wan.GatewayTransportFilter; -import org.junit.Test; - /** * The GatewayReceiverFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the GatewayReceiverFactoryBean class. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java index 73c39a8c..c6e1d48d 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java @@ -21,6 +21,11 @@ import java.io.IOException; import javax.annotation.Resource; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.GemFireCache; @@ -28,11 +33,6 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.wan.GatewaySender; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.ReplicatedRegionFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java index 55f15962..2cc9b08f 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java @@ -23,12 +23,12 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import org.junit.Test; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.wan.GatewaySender; import org.apache.geode.cache.wan.GatewaySenderFactory; -import org.junit.Test; - import org.springframework.data.gemfire.TestUtils; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java index c488e9bf..b6425c11 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java @@ -24,11 +24,11 @@ import java.io.IOException; import javax.annotation.Resource; -import org.apache.geode.cache.wan.GatewayReceiver; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.wan.GatewayReceiver; + import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java index 105a7895..f1d8a802 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java @@ -20,13 +20,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import org.apache.geode.cache.wan.GatewaySender; - import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.apache.geode.cache.wan.GatewaySender; + /** * Unit tests for {@link OrderPolicyConverter}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java index af5aa128..0971cf8b 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java @@ -20,10 +20,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import org.apache.geode.cache.wan.GatewaySender; - import org.junit.Test; +import org.apache.geode.cache.wan.GatewaySender; + /** * The OrderPolicyTypeTest class is a test suite of test cases testing the contract and functionality * of the OrderPolicyType enum. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java index 6cf6d4fd..f64975e9 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java @@ -20,14 +20,14 @@ import static org.mockito.Mockito.mock; import javax.annotation.Resource; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.asyncqueue.AsyncEventListener; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.data.gemfire.support.AbstractFactoryBeanSupport; import org.springframework.lang.Nullable; import org.springframework.test.context.ContextConfiguration;