DATAGEODE-224 - Optimize imports.

src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java

@@ -24,6 +24,7 @@ import javax.annotation.Resource;
 
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Region;
+
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.dao.support.DaoSupport;
 import org.springframework.stereotype.Repository;

src/test/java/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests.java

@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
 
 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;

src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java

@@ -24,8 +24,10 @@ import javax.annotation.Resource;
 
 import org.apache.geode.cache.DataPolicy;
 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.stereotype.Component;
 import org.springframework.test.context.ContextConfiguration;

src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests.java

@@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue;
 
 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;

src/test/java/org/springframework/data/gemfire/CacheAutoReconnectIntegrationTests.java

@@ -24,8 +24,10 @@ import static org.junit.Assume.assumeNotNull;
 import java.io.File;
 
 import org.apache.geode.cache.Cache;
+
 import org.junit.After;
 import org.junit.Test;
+
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.data.gemfire.config.xml.GemfireConstants;

src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java

@@ -31,6 +31,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.Scope;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -40,10 +44,6 @@ import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.Scope;
-
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.context.ConfigurableApplicationContext;

src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java

@@ -62,11 +62,13 @@ import org.apache.geode.cache.util.GatewayConflictResolver;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.pdx.PdxSerializer;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.core.io.Resource;
 import org.springframework.data.gemfire.support.GemfireBeanFactoryLocator;

src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java

@@ -19,9 +19,11 @@ package org.springframework.data.gemfire;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.geode.cache.Cache;
+
 import org.junit.After;
 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;

src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTest.java

@@ -25,10 +25,12 @@ import java.io.File;
 import javax.annotation.Resource;
 
 import org.apache.geode.cache.server.CacheServer;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java

@@ -22,8 +22,10 @@ import static org.junit.Assert.assertNotNull;
 import javax.annotation.Resource;
 
 import org.apache.geode.cache.Region;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java

@@ -19,6 +19,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import org.apache.geode.cache.DataPolicy;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTest.java

@@ -24,8 +24,10 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.apache.geode.cache.DiskStore;
+
 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.test.context.ContextConfiguration;

src/test/java/org/springframework/data/gemfire/ForkUtil.java

@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.data.gemfire.fork.CqCacheServerProcess;
 import org.springframework.data.gemfire.fork.FunctionCacheServerProcess;
 import org.springframework.data.gemfire.test.support.IOUtils;

src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java

@@ -33,9 +33,11 @@ import javax.annotation.Resource;
 import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.query.SelectResults;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java

@@ -27,14 +27,20 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.client.ClientRegionShortcut;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -56,10 +62,6 @@ import org.springframework.data.gemfire.util.PropertiesBuilder;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import lombok.Data;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
 /**
  * Integrations tests for {@link GemfireTemplate} testing proper function and behavior of executing (OQL) queries
  * from a cache client application using the {@link GemfireTemplate} to a cluster of GemFire servers that have

src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java

@@ -42,11 +42,13 @@ import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.query.Query;
 import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.cache.query.SelectResults;
+
 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.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.gemfire.test.support.AbstractUnitAndIntegrationTestsWithMockSupport;
 

src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java

@@ -30,6 +30,7 @@ import java.util.Properties;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.distributed.DistributedSystem;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java

@@ -27,9 +27,11 @@ import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.Scope;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import org.springframework.data.gemfire.test.support.FileSystemUtils;
 import org.springframework.data.gemfire.util.CacheUtils;
 

src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java

@@ -27,9 +27,11 @@ import org.apache.geode.cache.query.Index;
 import org.apache.geode.cache.query.IndexExistsException;
 import org.apache.geode.cache.query.IndexNameConflictException;
 import org.apache.geode.cache.query.QueryService;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;

src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java

@@ -44,6 +44,7 @@ import org.apache.geode.cache.query.IndexExistsException;
 import org.apache.geode.cache.query.IndexNameConflictException;
 import org.apache.geode.cache.query.IndexStatistics;
 import org.apache.geode.cache.query.QueryService;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -52,6 +53,7 @@ import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.data.gemfire.config.xml.GemfireConstants;

src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java

@@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify;
 
 import org.apache.geode.cache.AttributesFactory;
 import org.apache.geode.cache.RegionFactory;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/Init.java

@@ -17,6 +17,7 @@
 package org.springframework.data.gemfire;
 
 import org.apache.geode.cache.server.CacheServer;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;

src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java

@@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
 import org.apache.geode.cache.InterestPolicy;
+
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;

src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java

@@ -22,6 +22,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 import org.apache.geode.cache.InterestPolicy;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java

@@ -22,13 +22,13 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import org.junit.Test;
-
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionFactory;
 import org.apache.geode.cache.RegionShortcut;
 
+import org.junit.Test;
+
 import org.springframework.data.gemfire.test.support.AbstractRegionFactoryBeanTests;
 
 /**

src/test/java/org/springframework/data/gemfire/LocatorFactoryBeanUnitTests.java

@@ -35,10 +35,12 @@ import java.util.Properties;
 
 import org.apache.geode.distributed.Locator;
 import org.apache.geode.distributed.LocatorLauncher;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
+
 import org.springframework.data.gemfire.config.annotation.LocatorConfigurer;
 
 /**

src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java

@@ -39,6 +39,7 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
 import org.apache.geode.cache.wan.GatewaySender;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java

@@ -47,8 +47,10 @@ import org.apache.geode.cache.RegionEvent;
 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.BeanNameAware;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;

src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java

@@ -21,8 +21,10 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
 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.test.context.ContextConfiguration;

src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java

@@ -23,6 +23,7 @@ import static org.mockito.Mockito.when;
 
 import org.apache.geode.cache.PartitionAttributes;
 import org.apache.geode.cache.PartitionResolver;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java

@@ -21,11 +21,11 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import org.junit.Test;
-
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.RegionFactory;
 
+import org.junit.Test;
+
 /**
  * Unit Tests for {@link PartitionedRegionFactoryBean}.
  *

src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java

@@ -26,11 +26,13 @@ import java.io.Serializable;
 import javax.annotation.Resource;
 
 import org.apache.geode.cache.Region;
+
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java

@@ -51,8 +51,10 @@ import org.apache.geode.cache.RegionFactory;
 import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.cache.SubscriptionAttributes;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
+
 import org.junit.After;
 import org.junit.Test;
+
 import org.springframework.data.gemfire.test.support.AbstractRegionFactoryBeanTests;
 import org.springframework.data.gemfire.util.ArrayUtils;
 

src/test/java/org/springframework/data/gemfire/RecreatingSpringApplicationContextTest.java

@@ -18,6 +18,7 @@ package org.springframework.data.gemfire;
 
 import org.junit.After;
 import org.junit.Before;
+
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
 

src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java

@@ -27,8 +27,10 @@ import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.EvictionAction;
 import org.apache.geode.cache.EvictionAlgorithm;
 import org.apache.geode.cache.Region;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java

@@ -28,7 +28,9 @@ import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionExistsException;
 import org.apache.geode.cache.Scope;
+
 import org.junit.Test;
+
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;

src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java

@@ -19,6 +19,7 @@ package org.springframework.data.gemfire;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.geode.cache.RegionShortcut;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java

@@ -20,6 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.RegionShortcut;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java

@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.geode.cache.RegionShortcut;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java

@@ -21,11 +21,11 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import org.junit.Test;
-
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.RegionFactory;
 
+import org.junit.Test;
+
 /**
  * Unit Tests for {@link ReplicatedRegionFactoryBean}.
  *

src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java

@@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
 import org.apache.geode.cache.Scope;
+
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;

src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire;
 
 import static org.junit.Assert.assertEquals;
@@ -22,6 +21,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 import org.apache.geode.cache.Scope;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java

@@ -36,8 +36,10 @@ import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.ResumptionAction;
 import org.apache.geode.cache.Scope;
 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.data.gemfire.test.GemfireTestApplicationContextInitializer;
 import org.springframework.test.context.ContextConfiguration;

src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java

@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.apache.geode.cache.InterestPolicy;
 import org.apache.geode.cache.SubscriptionAttributes;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java

@@ -25,6 +25,7 @@ import javax.annotation.Resource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java

@@ -28,8 +28,10 @@ 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.test.context.ActiveProfiles;

src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java

@@ -17,16 +17,23 @@
 
 package org.springframework.data.gemfire.cache;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.*;
+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;

src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java

@@ -20,6 +20,7 @@ import static org.junit.Assert.assertNotNull;
 
 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;

src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java

@@ -26,10 +26,16 @@ 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
@@ -51,10 +57,6 @@ 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.

src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java

@@ -29,9 +29,11 @@ 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.springframework.cache.Cache;
 import org.springframework.data.gemfire.GemfireUtils;
 import org.springframework.data.gemfire.test.support.AbstractNativeCacheTests;

src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java

@@ -17,10 +17,17 @@
 
 package org.springframework.data.gemfire.cache;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.hamcrest.Matchers.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -29,6 +36,7 @@ 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;
@@ -36,6 +44,7 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+
 import org.springframework.cache.Cache;
 
 /**

src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java

@@ -34,12 +34,14 @@ 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;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+
 import org.springframework.cache.Cache;
 
 /**

src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java

@@ -52,7 +52,9 @@ import org.apache.geode.cache.client.ClientCacheFactory;
 import org.apache.geode.cache.client.Pool;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.pdx.PdxSerializer;
+
 import org.junit.Test;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.data.gemfire.GemfireUtils;

src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java

@@ -31,10 +31,12 @@ 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;

src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java

@@ -21,7 +21,9 @@ 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;

src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java

@@ -27,10 +27,12 @@ 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.springframework.data.gemfire.process.ProcessWrapper;
 import org.springframework.data.gemfire.test.support.AbstractGemFireClientServerIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;

src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java

@@ -32,10 +32,12 @@ 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.springframework.data.gemfire.fork.ServerProcess;
 import org.springframework.data.gemfire.process.ProcessExecutor;
 import org.springframework.data.gemfire.process.ProcessWrapper;

src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java

@@ -33,10 +33,12 @@ 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.springframework.data.gemfire.fork.ServerProcess;
 import org.springframework.data.gemfire.process.ProcessExecutor;
 import org.springframework.data.gemfire.process.ProcessWrapper;

src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java

@@ -33,10 +33,12 @@ 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.springframework.data.gemfire.fork.ServerProcess;
 import org.springframework.data.gemfire.process.ProcessExecutor;
 import org.springframework.data.gemfire.process.ProcessWrapper;

src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java

@@ -47,9 +47,11 @@ import org.apache.geode.cache.client.ClientRegionFactory;
 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;

src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java

@@ -23,8 +23,10 @@ import javax.annotation.Resource;
 import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.ClientRegionShortcut;
+
 import org.junit.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;

src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java

@@ -20,6 +20,7 @@ package org.springframework.data.gemfire.client;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.geode.cache.client.ClientRegionShortcut;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java

@@ -20,6 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.client.ClientRegionShortcut;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java

@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.geode.cache.client.ClientRegionShortcut;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java

@@ -32,8 +32,10 @@ import org.apache.geode.cache.EntryEvent;
 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;

src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java

@@ -22,10 +22,12 @@ 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.gemfire.GemfireTemplate;
 import org.springframework.data.gemfire.fork.ServerProcess;

src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java

@@ -39,6 +39,7 @@ import org.apache.geode.cache.client.ClientCacheFactory;
 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;
@@ -47,6 +48,7 @@ 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;

src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java

@@ -27,10 +27,12 @@ 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.gemfire.GemfireUtils;

src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java

@@ -22,10 +22,12 @@ 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.gemfire.GemfireUtils;

src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java

@@ -28,11 +28,13 @@ 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.ClassPathResource;

src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java

@@ -51,10 +51,12 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
 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.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.data.gemfire.client.function.ListRegionsOnServerFunction;
 import org.springframework.data.gemfire.util.RegionUtils;

src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java

@@ -21,6 +21,7 @@ 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;

src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java

@@ -22,6 +22,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 import org.apache.geode.cache.InterestResultPolicy;
+
 import org.junit.Test;
 
 /**

src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java

@@ -27,6 +27,7 @@ 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;

src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java

@@ -27,9 +27,11 @@ 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;

src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java

@@ -42,9 +42,11 @@ import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.client.Pool;
 import org.apache.geode.cache.client.PoolFactory;
 import org.apache.geode.cache.query.QueryService;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.data.gemfire.TestUtils;
 import org.springframework.data.gemfire.support.ConnectionEndpoint;

src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java

@@ -28,8 +28,10 @@ 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.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java

@@ -27,6 +27,7 @@ import javax.annotation.Resource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java

@@ -17,10 +17,17 @@
 
 package org.springframework.data.gemfire.client.function;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -32,6 +39,7 @@ 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;

src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java

@@ -36,6 +36,7 @@ import java.util.function.Supplier;
 
 import org.apache.geode.cache.client.Pool;
 import org.apache.geode.cache.query.QueryService;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -43,6 +44,7 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+
 import org.springframework.data.gemfire.GemfireUtils;
 
 /**

src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java

@@ -35,6 +35,7 @@ import java.util.Collections;
 import org.apache.geode.cache.client.Pool;
 import org.apache.geode.cache.client.PoolFactory;
 import org.apache.geode.cache.query.QueryService;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -42,6 +43,7 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+
 import org.springframework.data.gemfire.GemfireUtils;
 
 /**

src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java

@@ -26,9 +26,11 @@ import java.net.InetSocketAddress;
 import java.util.Collections;
 
 import org.apache.geode.cache.client.PoolFactory;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+
 import org.springframework.data.gemfire.GemfireUtils;
 
 /**

src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java

@@ -30,11 +30,13 @@ 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.springframework.data.gemfire.config.schema.SchemaObjectDefinition;
 import org.springframework.data.gemfire.config.schema.SchemaObjectType;
 import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition;

src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java

@@ -33,11 +33,13 @@ 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.springframework.data.gemfire.IndexType;
 import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition;
 

src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java

@@ -32,11 +32,13 @@ 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.springframework.data.gemfire.config.schema.definitions.RegionDefinition;
 
 /**

src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java

@@ -28,6 +28,7 @@ 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;

src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java

@@ -38,11 +38,13 @@ import org.apache.geode.cache.execute.Function;
 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;

src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java

@@ -24,10 +24,12 @@ 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.springframework.data.gemfire.util.NetworkUtils;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpRequestInterceptor;

src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateUnitTests.java

@@ -35,11 +35,13 @@ import java.util.Optional;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.ClientCache;
 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.springframework.data.gemfire.IndexType;
 import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition;
 import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition;

src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationIntegrationTests.java

@@ -23,8 +23,10 @@ import java.util.Optional;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.client.ClientCache;
+
 import org.junit.After;
 import org.junit.Test;
+
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.core.env.MutablePropertySources;

src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java

@@ -32,6 +32,11 @@ import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
 import org.apache.geode.cache.CacheLoader;
 import org.apache.geode.cache.CacheLoaderException;
 import org.apache.geode.cache.GemFireCache;
@@ -41,6 +46,7 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.cache.client.ServerOperationException;
 import org.apache.geode.security.NotAuthorizedException;
 import org.apache.geode.security.ResourcePermission;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
@@ -48,6 +54,7 @@ import org.junit.Test;
 import org.junit.runners.MethodSorters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
@@ -63,11 +70,6 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
 /**
  * Abstract base test class for implementing Apache Geode Integrated Security Integration Tests.
  *

src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java

@@ -25,12 +25,12 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-
 import org.apache.geode.security.AuthenticationFailedException;
 import org.apache.geode.security.ResourcePermission;
 
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.test.context.ActiveProfiles;

src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java

@@ -18,12 +18,12 @@ package org.springframework.data.gemfire.config.annotation;
 
 import java.io.IOException;
 
+import org.apache.geode.internal.security.shiro.GeodePermissionResolver;
+
+import org.apache.shiro.realm.text.PropertiesRealm;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 
-import org.apache.geode.internal.security.shiro.GeodePermissionResolver;
-import org.apache.shiro.realm.text.PropertiesRealm;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;

src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java

@@ -28,10 +28,12 @@ import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.LoaderHelper;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.ClientRegionShortcut;
+
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;

src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurerIntegrationTests.java

@@ -25,6 +25,7 @@ import java.util.Set;
 
 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.annotation.Bean;

src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerPropertiesIntegrationTests.java

@@ -22,8 +22,10 @@ import java.util.Optional;
 
 import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.cache.server.ClientSubscriptionConfig;
+
 import org.junit.After;
 import org.junit.Test;
+
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;

src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsAppliesRegionConfigurersIntegrationTests.java

@@ -27,8 +27,10 @@ import java.util.stream.Collectors;
 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.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.Bean;

src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplicationIntegrationTests.java

@@ -26,8 +26,10 @@ import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.LoaderHelper;
 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.client.ClientRegionFactoryBean;
 import org.springframework.test.context.ContextConfiguration;

src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurerIntegrationTests.java

@@ -23,12 +23,12 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.geode.cache.client.ClientCache;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.apache.geode.cache.client.ClientCache;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;

src/test/java/org/springframework/data/gemfire/config/annotation/ClientCachePropertiesIntegrationTests.java

@@ -27,8 +27,10 @@ import org.apache.geode.cache.client.Pool;
 import org.apache.geode.cache.client.PoolFactory;
 import org.apache.geode.cache.control.ResourceManager;
 import org.apache.geode.pdx.PdxSerializer;
+
 import org.junit.After;
 import org.junit.Test;
+
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;