You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/04/30 20:23:55 UTC
[geode] branch develop updated: GEODE-2953: Expand wildcard imports
in geode-core:test.internal.cache... subpackages. (#1884)
This is an automated email from the ASF dual-hosted git repository.
prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 4fd83d7 GEODE-2953: Expand wildcard imports in geode-core:test.internal.cache... subpackages. (#1884)
4fd83d7 is described below
commit 4fd83d7e73dd66674a82b34adeaeedbd024dde70
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Mon Apr 30 13:23:50 2018 -0700
GEODE-2953: Expand wildcard imports in geode-core:test.internal.cache... subpackages. (#1884)
---
.../cache/control/FilterByPathJUnitTest.java | 3 ++-
.../cache/control/MemoryMonitorJUnitTest.java | 5 +++--
.../cache/control/MemoryMonitorOffHeapJUnitTest.java | 14 +++++++++++---
.../cache/control/MemoryThresholdsJUnitTest.java | 5 ++++-
.../cache/control/RebalanceOperationDUnitTest.java | 11 ++++++++---
.../DiskRegOverflowAsyncJUnitPerformanceTest.java | 2 +-
.../DiskRegOverflowSyncJUnitPerformanceTest.java | 2 +-
.../DiskRegionOverflowSyncRollingOpLogJUnitTest.java | 15 +++++++++------
.../diskPerf/DiskRegionPerfJUnitPerformanceTest.java | 2 +-
.../diskPerf/DiskRegionPersistOnlySyncJUnitTest.java | 3 ++-
.../DiskRegionRollOpLogJUnitPerformanceTest.java | 2 +-
.../MultiThreadedOplogPerJUnitPerformanceTest.java | 13 +++++++++++--
.../cache/event/DistributedEventTrackerTest.java | 11 +++++++++--
.../internal/cache/event/EventTrackerDUnitTest.java | 4 +++-
.../cache/event/NonDistributedEventTrackerTest.java | 5 ++++-
.../cache/eviction/EvictionListBuilderTest.java | 2 +-
.../internal/cache/eviction/EvictionTestBase.java | 5 ++++-
.../cache/eviction/OffHeapEvictionDUnitTest.java | 5 +++--
.../cache/eviction/TransactionsWithOverflowTest.java | 14 +++++++++++++-
.../cache/execute/ColocationFailoverDUnitTest.java | 2 +-
.../DistributedRegionFunctionExecutionDUnitTest.java | 11 +++++++++--
.../execute/FunctionServiceClientAccessorPRBase.java | 3 ++-
.../cache/execute/FunctionServiceStatsDUnitTest.java | 8 ++++++--
.../cache/execute/LocalDataSetDUnitTest.java | 3 ++-
.../execute/LocalFunctionExecutionDUnitTest.java | 3 ++-
.../execute/MemberFunctionExecutionDUnitTest.java | 7 +++++--
.../MultiRegionFunctionExecutionDUnitTest.java | 2 +-
.../execute/OnGroupsFunctionExecutionDUnitTest.java | 8 ++++++--
...RClientServerFunctionExecutionNoAckDUnitTest.java | 4 +++-
...ClientServerRegionFunctionExecutionDUnitTest.java | 6 +++++-
...rverRegionFunctionExecutionFailoverDUnitTest.java | 7 +++++--
...rRegionFunctionExecutionNoSingleHopDUnitTest.java | 5 ++++-
...verRegionFunctionExecutionSingleHopDUnitTest.java | 5 ++++-
.../cache/execute/PRClientServerTestBase.java | 7 +++++--
.../cache/execute/PRTransactionDUnitTest.java | 5 ++++-
.../PRTransactionWithSizeOperationDUnitTest.java | 2 +-
.../execute/PRTransactionWithVersionsDUnitTest.java | 2 --
.../cache/execute/PerformanceTestFunction.java | 2 +-
.../execute/SingleHopGetAllPutAllDUnitTest.java | 4 +++-
.../extension/SimpleExtensionPointJUnitTest.java | 6 +++++-
.../mock/AlterMockCacheExtensionFunction.java | 4 +++-
.../mock/CreateMockCacheExtensionFunction.java | 4 +++-
.../mock/DestroyMockCacheExtensionFunction.java | 4 +++-
.../mock/MockCacheExtensionXmlGenerator.java | 8 ++++++--
.../cache/extension/mock/MockExtensionXmlParser.java | 3 ++-
.../mock/MockRegionExtensionXmlGenerator.java | 8 ++++++--
.../functions/FireAndForgetFunctionOnAllServers.java | 6 +++++-
.../internal/cache/ha/BlockingHARegionJUnitTest.java | 6 ++++--
.../cache/ha/EventIdOptimizationDUnitTest.java | 8 +++++---
.../cache/ha/EventIdOptimizationJUnitTest.java | 2 +-
.../geode/internal/cache/ha/FailoverDUnitTest.java | 8 ++++++--
.../geode/internal/cache/ha/HABugInPutDUnitTest.java | 5 +++--
.../geode/internal/cache/ha/HAClearDUnitTest.java | 8 ++++++--
.../internal/cache/ha/HAConflationDUnitTest.java | 6 ++++--
.../internal/cache/ha/HADuplicateDUnitTest.java | 6 ++++--
.../cache/ha/HAEventIdPropagationDUnitTest.java | 8 ++++++--
.../geode/internal/cache/ha/HAExpiryDUnitTest.java | 2 +-
.../geode/internal/cache/ha/HAGIIBugDUnitTest.java | 3 ++-
.../geode/internal/cache/ha/HAGIIDUnitTest.java | 8 ++++++--
.../internal/cache/ha/HARQAddOperationJUnitTest.java | 9 +++++++--
.../internal/cache/ha/HARQueueNewImplDUnitTest.java | 14 ++++++++++----
.../geode/internal/cache/ha/HARegionDUnitTest.java | 3 ++-
.../geode/internal/cache/ha/HARegionJUnitTest.java | 5 +++--
.../internal/cache/ha/HARegionQueueDUnitTest.java | 6 +++++-
.../cache/ha/HARegionQueueStartStopJUnitTest.java | 5 +++--
.../cache/ha/HARegionQueueStatsJUnitTest.java | 6 +++++-
.../cache/ha/OperationsPropagationDUnitTest.java | 5 +++--
.../geode/internal/cache/ha/PutAllDUnitTest.java | 8 ++++++--
.../geode/internal/cache/ha/StatsBugDUnitTest.java | 5 +++--
.../internal/cache/ha/ThreadIdentifierJUnitTest.java | 4 +++-
.../partitioned/DeposePrimaryBucketMessageTest.java | 6 ++++--
.../cache/partitioned/ElidedPutAllDUnitTest.java | 2 +-
.../partitioned/FetchEntriesMessageJUnitTest.java | 7 +++++--
.../cache/partitioned/FetchEntryMessageTest.java | 8 ++++++--
.../FetchPartitionDetailsMessageTest.java | 6 ++++--
.../cache/partitioned/MoveBucketMessageTest.java | 6 ++++--
.../partitioned/PartitionResolverDUnitTest.java | 2 +-
.../PartitionedRegionLoaderWriterDUnitTest.java | 4 +++-
.../PartitionedRegionMetaDataCleanupDUnitTest.java | 2 +-
...ersistentPartitionedRegionOldConfigDUnitTest.java | 2 --
...entPartitionedRegionWithTransactionDUnitTest.java | 2 +-
.../cache/partitioned/RemoveAllPRMessageTest.java | 6 +++---
.../cache/partitioned/RemoveBucketMessageTest.java | 6 ++++--
.../cache/partitioned/ShutdownAllDUnitTest.java | 6 ++++--
.../internal/cache/partitioned/SizeMessageTest.java | 5 +++--
.../StreamingPartitionOperationManyDUnitTest.java | 3 ++-
.../StreamingPartitionOperationOneDUnitTest.java | 2 +-
.../fixed/FixedPartitioningDUnitTest.java | 2 +-
...tioningWithColocationAndPersistenceDUnitTest.java | 2 +-
.../persistence/PersistentRVVRecoveryDUnitTest.java | 4 +++-
.../PersistentRecoveryOrderDUnitTest.java | 10 +++++++---
.../PersistentRecoveryOrderOldConfigDUnitTest.java | 2 --
.../query/TemporaryResultSetFactoryJUnitTest.java | 2 +-
.../entry/RegionEntryFactoryBuilderJUnitTest.java | 2 +-
.../internal/cache/snapshot/GFSnapshotDUnitTest.java | 6 ++++--
.../cache/tier/sockets/AcceptorImplDUnitTest.java | 3 ++-
...ardCompatibilityHigherVersionClientDUnitTest.java | 6 ++++--
.../cache/tier/sockets/Bug36269DUnitTest.java | 5 +++--
.../cache/tier/sockets/Bug36457DUnitTest.java | 6 ++++--
.../cache/tier/sockets/Bug36805DUnitTest.java | 7 +++++--
.../cache/tier/sockets/Bug36829DUnitTest.java | 8 ++++++--
.../cache/tier/sockets/Bug36995DUnitTest.java | 7 +++++--
.../cache/tier/sockets/Bug37210DUnitTest.java | 7 +++++--
.../cache/tier/sockets/Bug37805DUnitTest.java | 7 +++++--
.../sockets/CacheServerMaxConnectionsJUnitTest.java | 6 ++++--
.../cache/tier/sockets/CacheServerTestUtil.java | 13 +++++++++++--
.../sockets/CacheServerTransactionsDUnitTest.java | 8 ++++++--
.../CacheServerTransactionsSelectorDUnitTest.java | 2 --
.../tier/sockets/ClearPropagationDUnitTest.java | 8 ++++++--
.../tier/sockets/ClientConflationDUnitTest.java | 9 +++++++--
.../tier/sockets/ClientInterestNotifyDUnitTest.java | 8 ++++++--
.../ClientServerForceInvalidateDUnitTest.java | 8 +++++---
.../cache/tier/sockets/ConflationDUnitTest.java | 8 ++++++--
.../cache/tier/sockets/ConnectionProxyJUnitTest.java | 13 +++++++++++--
.../sockets/DestroyEntryPropagationDUnitTest.java | 8 ++++++--
.../tier/sockets/DurableClientBug39997DUnitTest.java | 6 ++++--
.../sockets/DurableClientQueueSizeDUnitTest.java | 7 ++++---
.../sockets/DurableClientReconnectDUnitTest.java | 10 ++++++++--
.../tier/sockets/DurableClientStatsDUnitTest.java | 9 +++++++--
.../tier/sockets/DurableResponseMatrixDUnitTest.java | 9 +++++++--
.../tier/sockets/EventIDVerificationDUnitTest.java | 8 ++++++--
.../sockets/EventIDVerificationInP2PDUnitTest.java | 5 ++++-
.../sockets/ForceInvalidateEvictionDUnitTest.java | 2 +-
.../ForceInvalidateOffHeapEvictionDUnitTest.java | 2 +-
.../cache/tier/sockets/HABug36738DUnitTest.java | 9 +++++----
.../cache/tier/sockets/HAInterestPart1DUnitTest.java | 2 --
.../cache/tier/sockets/HAInterestTestCase.java | 9 +++++++--
.../sockets/InstantiatorPropagationDUnitTest.java | 11 ++++++++---
.../cache/tier/sockets/InterestListDUnitTest.java | 8 ++++++--
.../tier/sockets/InterestListEndpointDUnitTest.java | 10 ++++++++--
.../sockets/InterestListEndpointPRDUnitTest.java | 7 ++++---
.../InterestListEndpointSelectorDUnitTest.java | 2 --
.../tier/sockets/InterestListFailoverDUnitTest.java | 4 +++-
.../tier/sockets/InterestListRecoveryDUnitTest.java | 9 +++++++--
.../tier/sockets/InterestRegrListenerDUnitTest.java | 6 ++++--
.../tier/sockets/InterestResultPolicyDUnitTest.java | 5 +++--
.../cache/tier/sockets/MessageJUnitTest.java | 10 ++++++++--
.../tier/sockets/NewRegionAttributesDUnitTest.java | 4 +++-
.../cache/tier/sockets/ObjectPartListJUnitTest.java | 3 ++-
.../cache/tier/sockets/RedundancyLevelJUnitTest.java | 4 +++-
.../tier/sockets/RedundancyLevelPart1DUnitTest.java | 4 +++-
.../tier/sockets/RedundancyLevelPart2DUnitTest.java | 4 +++-
.../tier/sockets/RedundancyLevelPart3DUnitTest.java | 3 ++-
.../cache/tier/sockets/RedundancyLevelTestBase.java | 9 +++++++--
.../cache/tier/sockets/RegionCloseDUnitTest.java | 6 ++++--
...egisterInterestBeforeRegionCreationDUnitTest.java | 5 +++--
.../tier/sockets/RegisterInterestKeysDUnitTest.java | 7 +++++--
.../sockets/RegisterInterestKeysPRDUnitTest.java | 6 +++---
.../tier/sockets/ReliableMessagingDUnitTest.java | 9 +++++++--
.../cache/tier/sockets/TcpServerFactoryTest.java | 2 +-
.../tier/sockets/UnregisterInterestDUnitTest.java | 5 +++--
.../tier/sockets/UpdatePropagationDUnitTest.java | 3 ++-
.../VerifyEventIDGenerationInP2PDUnitTest.java | 4 +++-
...erifyUpdatesFromNonInterestEndPointDUnitTest.java | 7 +++++--
.../tier/sockets/command/CommitCommandTest.java | 3 ++-
.../GetClientPartitionAttributesCommand66Test.java | 4 +++-
.../GetClientPartitionAttributesCommandTest.java | 4 +++-
.../cache/tx/AbstractPeerTXRegionStubTest.java | 5 +++--
.../cache/tx/RemoteOperationMessageTest.java | 13 ++++++++++++-
.../cache/tx/RemoteOperationResponseTest.java | 8 +++++++-
.../cache/versions/AbstractVersionTagTestBase.java | 2 +-
.../cache/versions/RVVExceptionJUnitTest.java | 2 +-
.../versions/RegionVersionHolder2JUnitTest.java | 3 ++-
.../cache/versions/RegionVersionHolderJUnitTest.java | 4 +++-
.../versions/RegionVersionHolderRandomJUnitTest.java | 2 +-
.../internal/cache/versions/TombstoneDUnitTest.java | 2 +-
...ntilGatewaySenderFlushedCoordinatorJUnitTest.java | 2 +-
.../ParallelGatewaySenderQueueJUnitTest.java | 8 ++++++--
...ntSerialGatewaySenderEventProcessorJUnitTest.java | 5 +++--
.../cache/wan/serial/DestroyMessageTest.java | 6 ++++--
.../cache/xmlcache/AbstractEntityResolverTest.java | 5 ++++-
.../cache/xmlcache/AbstractXmlParserJUnitTest.java | 2 +-
.../cache/xmlcache/CacheCreationJUnitTest.java | 12 ++++++++++--
.../cache/xmlcache/CacheXmlVersionJUnitTest.java | 20 ++++++++++++++++++--
.../cache/xmlcache/DefaultEntityResolver2Test.java | 6 ++++--
.../cache/xmlcache/RegionCreationJUnitTest.java | 3 ++-
.../cache/xmlcache/XmlGeneratorUtilsJUnitTest.java | 5 +++--
177 files changed, 722 insertions(+), 293 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
index 0fe2ca3..1e26d28 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.control;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
index b2b4b63..a91b9df 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.control;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryPoolMXBean;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
index 6b431f2..8d6536e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.control;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Properties;
@@ -25,7 +29,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.EvictionAlgorithm;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.EvictionAttributesImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
index 3cb59ca..9dc3488 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.cache.control;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
index 6224379..0cdc4e6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -14,13 +14,18 @@
*/
package org.apache.geode.internal.cache.control;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.ENFORCE_UNIQUE_HOST;
+import static org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
import java.util.Collection;
import java.util.Collections;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java
index c2e0960..d4456b5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.diskPerf;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.Arrays;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java
index 6c8bd99..b1d74e0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.diskPerf;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.Arrays;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
index fb11f95..b04508e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
@@ -14,16 +14,19 @@
*/
package org.apache.geode.internal.cache.diskPerf;
-import static org.junit.Assert.*;
-
-import java.util.*;
+import java.util.Arrays;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.*;
-import org.apache.geode.cache.*;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.Region;
+import org.apache.geode.internal.cache.CacheObserverAdapter;
+import org.apache.geode.internal.cache.CacheObserverHolder;
+import org.apache.geode.internal.cache.DiskRegionHelperFactory;
+import org.apache.geode.internal.cache.DiskRegionProperties;
+import org.apache.geode.internal.cache.DiskRegionTestingBase;
+import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.eviction.EvictionCounters;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
index 8c017b2..325f379 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.diskPerf;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
import java.io.File;
import java.util.Arrays;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
index 0dd2774..09041c4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.diskPerf;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Arrays;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java
index 208dd06..0428c83 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.diskPerf;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
import java.io.File;
import java.util.Arrays;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
index f989114..9396e62 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.diskPerf;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import java.io.File;
import java.util.Properties;
@@ -24,7 +26,14 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.cache.EvictionAction;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.DiskStoreFactoryImpl;
import org.apache.geode.test.dunit.ThreadUtils;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
index bebf994..abedd25 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
@@ -14,8 +14,15 @@
*/
package org.apache.geode.internal.cache.event;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+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.Collections;
import java.util.Map;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java
index b85827c..e3159fe 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.event;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
index 7ba531f..6f8e072 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.cache.event;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
index 7def3f6..2a2d233 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.cache.eviction;
import static org.apache.geode.internal.lang.SystemPropertyHelper.EVICTION_SCAN_ASYNC;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java
index 401e339..b455f48 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.cache.eviction;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.File;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
index 1587d1e..1eb047e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.eviction;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java
index aa25460..3063197 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java
@@ -30,7 +30,19 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheTransactionManager;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.EvictionAction;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.ExpirationAction;
+import org.apache.geode.cache.ExpirationAttributes;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.VMLRURegionMap;
import org.apache.geode.test.junit.categories.IntegrationTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java
index 795f0eb..4e036be 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
import java.io.DataInput;
import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index e0e681d..3842c27 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -14,8 +14,15 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTH_INIT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.Serializable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java
index 6bc332a..b3b38d8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java
@@ -15,7 +15,8 @@
package org.apache.geode.internal.cache.execute;
import static org.apache.geode.test.dunit.Wait.pause;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index cbc6894..c8565cd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
index e1fb155..2adbe78 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.io.DataInput;
import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
index 6cebb7e..65ac3ab 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 9eebcc1..0178b1a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
index bfb2a7b..d2f1dc8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
import java.util.HashSet;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index 8590598..7dc5503 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.DataInput;
import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index 2d398ca..07f6caa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import java.io.Serializable;
import java.util.HashSet;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 16a81eb..100045e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.DataInput;
import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index 11d47d6..44f5728 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.io.File;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 59807bc..2c5e4f9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.EOFException;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index 2c5b422..53552dd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.EOFException;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java
index d2199bd..60f90bc 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.io.Serializable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
index bfb53d5..5a021ec 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
@@ -16,7 +16,10 @@ package org.apache.geode.internal.cache.execute;
import static com.googlecode.catchexception.CatchException.catchException;
import static com.googlecode.catchexception.CatchException.caughtException;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java
index 1ba5d90..e0062a8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
index 804465a..bfda290 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
-
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerformanceTestFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerformanceTestFunction.java
index 125e2d2..639027e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerformanceTestFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerformanceTestFunction.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
index 34a684c..1953978 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.execute;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
index 4d34332..1d97503 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.cache.extension;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Iterator;
import java.util.NoSuchElementException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
index 7f11e00..464475a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
@@ -15,7 +15,9 @@
package org.apache.geode.internal.cache.extension.mock;
-import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.*;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.ELEMENT_CACHE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.NAMESPACE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.PREFIX;
import java.io.DataInput;
import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
index bb8a12f..b74554d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
@@ -15,7 +15,9 @@
package org.apache.geode.internal.cache.extension.mock;
-import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.*;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.ELEMENT_CACHE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.NAMESPACE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.PREFIX;
import java.io.DataInput;
import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
index a414442..535bff5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
@@ -15,7 +15,9 @@
package org.apache.geode.internal.cache.extension.mock;
-import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.*;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.ELEMENT_CACHE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.NAMESPACE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.PREFIX;
import java.io.DataInput;
import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
index 66a3d38..699a6a9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
@@ -15,8 +15,12 @@
package org.apache.geode.internal.cache.extension.mock;
-import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.*;
-import static org.apache.geode.internal.cache.xmlcache.XmlGeneratorUtils.*;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.ATTRIBUTE_VALUE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.ELEMENT_CACHE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.NAMESPACE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.PREFIX;
+import static org.apache.geode.internal.cache.xmlcache.XmlGeneratorUtils.addAttribute;
+import static org.apache.geode.internal.cache.xmlcache.XmlGeneratorUtils.emptyElement;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
index 5ff664a..169f604 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
@@ -15,7 +15,8 @@
package org.apache.geode.internal.cache.extension.mock;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
index 56eec44..511f0e6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
@@ -15,8 +15,12 @@
package org.apache.geode.internal.cache.extension.mock;
-import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.*;
-import static org.apache.geode.internal.cache.xmlcache.XmlGeneratorUtils.*;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.ATTRIBUTE_VALUE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.ELEMENT_REGION;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.NAMESPACE;
+import static org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser.PREFIX;
+import static org.apache.geode.internal.cache.xmlcache.XmlGeneratorUtils.addAttribute;
+import static org.apache.geode.internal.cache.xmlcache.XmlGeneratorUtils.emptyElement;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/FireAndForgetFunctionOnAllServers.java b/geode-core/src/test/java/org/apache/geode/internal/cache/functions/FireAndForgetFunctionOnAllServers.java
index f2937bf..5f31778 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/FireAndForgetFunctionOnAllServers.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/functions/FireAndForgetFunctionOnAllServers.java
@@ -20,7 +20,11 @@ import java.io.IOException;
import org.apache.geode.DataSerializable;
import org.apache.geode.LogWriter;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedSystem;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
index 233b3a1..ef75f61 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
index 12c3c2d..5748f36 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
@@ -14,11 +14,13 @@
*/
package org.apache.geode.internal.cache.ha;
-import static java.util.concurrent.TimeUnit.*;
+import static java.util.concurrent.TimeUnit.MINUTES;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.awaitility.Awaitility.*;
-import static org.junit.Assert.*;
+import static org.awaitility.Awaitility.await;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Iterator;
import java.util.Map;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
index aa46a16..ca60799 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
index 2b07821..68d364a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.util.Iterator;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
index c146eaa..57d7725 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
index 6d2ad69..1c8ff2c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
index 881d444..53ca625 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
index e3f86a2..02e3702 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Map;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index daed2d0..62bd2b2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.util.Iterator;
import java.util.LinkedHashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
index c15d33c..a1c47a2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
index 63f117e..ec5051c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
index d497b77..d71ccf1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.util.Collections;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
index 8c24c9c..e2c0890 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
index e9e53de..36abb8b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -14,10 +14,16 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.NetworkUtils.*;
-import static org.apache.geode.test.dunit.Wait.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DELTA_PROPAGATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.NetworkUtils.getServerHostName;
+import static org.apache.geode.test.dunit.Wait.waitForCriterion;
import java.io.File;
import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
index 93ec1ce..0f95325 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
index a1a1321..822636a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
index db05a60..290b713 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
index 0dde6ac..8f8675a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
index a76d3b2..145df33 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
@@ -25,7 +25,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.InternalCache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
index 26d919a..ed8b5aa 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
index 7992f35..94b7254 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Iterator;
import java.util.LinkedHashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
index e039b46..91b324e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.util.Iterator;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
index 3457de5..32a8f13 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.ha;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.net.InetAddress;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
index eb01b1f..9d7bb7d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
index 14cfa3b..50a1b6e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import java.util.HashMap;
import java.util.Map;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
index 7f207d0..e539868 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
index 0655bc2..4aaf7dd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.eq;
+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 org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
index 2918ad6..8e0b588 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
index 2aa8b32..06c378d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
index 6505638..822c4c5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.Serializable;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
index fa79fa1..fce425a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.Serializable;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
index 4805585..0cc7faf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionOldConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionOldConfigDUnitTest.java
index f3b4bbe..ff3d81c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionOldConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionOldConfigDUnitTest.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
-
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
index 135bbca..f9c86dc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
index e253b65..7be39db 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
index 29a1015..87e1a7e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
index 062c6e8..961c8fe 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.apache.geode.internal.lang.ThrowableUtils.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.internal.lang.ThrowableUtils.getRootCause;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.Set;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
index 5f27391..f18863f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
index e38f123..f9c6516 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
@@ -17,7 +17,8 @@
//
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
index f0eb2b9..336db3e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
@@ -18,7 +18,7 @@
//
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
index fdbbc95..8bc7a21 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.partitioned.fixed;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
index 5ae2cd2..f00c0be 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.partitioned.fixed;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
index dd4246a..35ab496 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.persistence;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
index 2346bc4..576a458 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
@@ -14,9 +14,13 @@
*/
package org.apache.geode.internal.cache.persistence;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.lang.ThrowableUtils.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.ACK_WAIT_THRESHOLD;
+import static org.apache.geode.internal.lang.ThrowableUtils.getRootCause;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
index 37140e7..c9702a9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.cache.persistence;
-import static org.junit.Assert.*;
-
import java.io.File;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
index 1fce75d..d9bcb81 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.persistence.query;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
index 6bd97c1..29272ed 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.region.entry;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
index 392420f..6d19233 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.snapshot;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
index c78607c..9610ad1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
@@ -17,7 +17,8 @@ package org.apache.geode.internal.cache.tier.sockets;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.List;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index eb5c1d9..32747e4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java
index f041a1d..bf79492 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java
index c825dae..d13fd4d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java
index 3e0f2ac..6acab64 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java
index 9e408ec..2407f35 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
index 8cf667b..3d55202 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.util.Iterator;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
index 1fafa58..5dbb20f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.Iterator;
import java.util.Map;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
index a6c4b5f..f20ecd5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.util.Iterator;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
index f164453..bf77c8a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
index 51ac63b..59b7e6c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
@@ -14,8 +14,17 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.io.File;
import java.net.InetSocketAddress;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index 72aadf8..d747628 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
index 3b67989..81ccae5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
-
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
index cb15d74..1138dc0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 542d089..10cd4cb 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CONFLATE_EVENTS;
+import static org.apache.geode.distributed.ConfigurationProperties.DELTA_PROPAGATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Iterator;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index 3c59199..df4dac4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DELTA_PROPAGATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Iterator;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
index 0d00d59..f132313 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
@@ -14,9 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.awaitility.Awaitility.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.awaitility.Awaitility.with;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
index 3284afa..6044d06 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index c67743d..1f061c4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -20,7 +20,10 @@ package org.apache.geode.internal.cache.tier.sockets;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Map;
import java.util.Properties;
@@ -31,7 +34,13 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.Scope;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.client.internal.Connection;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index 84d5a0d..358802e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertNull;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
index cb38115..04befe8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index 6612c72..6797ac4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.cache.query.functional.QueryREUpdateInProgressJUnitTest.regionName;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.junit.Assert.assertEquals;
import java.io.Serializable;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index 2630b9e..bc9330b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -14,8 +14,14 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.net.SocketException;
import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
index 52f5d81..398a184 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.util.ArrayList;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
index 05728f2..94fbbe0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index 9fd57b7..aee385a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
index b1eb802..4cd57e0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
index e725661..1921386 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
import java.io.IOException;
import java.io.Serializable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
index 6183be8..a080ad6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
index c76dd4a..040215f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
@@ -14,10 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.test.dunit.Invoke.*;
-import static org.awaitility.Awaitility.*;
-import static org.awaitility.Duration.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.Duration.TEN_SECONDS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
index 81767b1..eb32922 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
-
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
index c36b111..46be750 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
index 4ffbfc7..324dd9f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
@@ -14,9 +14,14 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.DistributedTestUtils.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.DistributedTestUtils.unregisterInstantiatorsInThisVM;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.DataInput;
import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
index 331ed4f..2b92c7b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DELTA_PROPAGATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index da325e2..67ac550 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
@@ -14,8 +14,14 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
index 98e5937..8f28978 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
@@ -14,11 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
-
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
index 5086731..899033a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
-
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
index d8ee138..9b75e36 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index 12f880b..5b9c711 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.EOFException;
import java.net.SocketException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
index db5c8e3..e4b139c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.io.IOException;
import java.net.InetAddress;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index 19a719d..c103c70 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
index 60b45fd..dee0d7d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
@@ -14,8 +14,14 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+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.io.IOException;
import java.net.InetAddress;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
index 915d543..f65e071 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
index 6994139..d032d35 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import java.io.IOException;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
index 5d5a885..923f4dc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index 7af1972..d9f3eb9 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.BeforeClass;
import org.junit.Ignore;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
index 304926d..732fd58 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
index bd8415d..9aa8091 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index 864ef80..792d5af 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index bc67f1a..5e2a14f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.util.Iterator;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
index 4f453fc..d926f73 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertNotNull;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index 704b220..16de418 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
index 9fcfa09..bf34486 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
-
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index b217de1..2aed4af 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Iterator;
import java.util.Map;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java
index f79613b..1cc86d3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
index 2469358..da75316 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index dd0df21..c218691 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -15,7 +15,8 @@
package org.apache.geode.internal.cache.tier.sockets;
import static junit.framework.TestCase.assertNotNull;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
index b967443..0e51413 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index 8d73452..ddf328d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
index 3dbee32..4da081d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
index 4c6b971..fb99ff5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
@@ -16,7 +16,9 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
index 0c4d0aa..b5fb324 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
@@ -16,7 +16,9 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
index 1918346..48cad7a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
@@ -15,8 +15,9 @@
package org.apache.geode.internal.cache.tx;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
index c98f651..2c80582 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
@@ -16,7 +16,18 @@ package org.apache.geode.internal.cache.tx;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
index eb4906b..7d6d83e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
@@ -16,7 +16,13 @@ package org.apache.geode.internal.cache.tx;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.junit.After;
import org.junit.Before;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/AbstractVersionTagTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/AbstractVersionTagTestBase.java
index 76a18fd..82a15fa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/AbstractVersionTagTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/AbstractVersionTagTestBase.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.versions;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
index f5d3ded..f078142 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.versions;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
index 0dbf334..0ee2401 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.versions;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
index 61b85ac..b093fb0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.cache.versions;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.net.InetAddress;
import java.util.BitSet;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
index 8612d3f..e1755dc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.versions;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.BitSet;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 945994f..295f9db 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.versions;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.concurrent.TimeUnit;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinatorJUnitTest.java
index 408dfd6..57accda 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/WaitUntilGatewaySenderFlushedCoordinatorJUnitTest.java
@@ -16,7 +16,7 @@ package org.apache.geode.internal.cache.wan;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.spy;
import org.junit.After;
import org.junit.Before;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
index dc25d23..9fd74d6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.cache.wan.parallel;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.any;
+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.Collections;
import java.util.LinkedList;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
index 4bc2316..b7a726a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
index 21bdeb1..9d8301a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.wan.serial;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractEntityResolverTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractEntityResolverTest.java
index 30068d9..eb9d66e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractEntityResolverTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractEntityResolverTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.cache.xmlcache;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.ServiceLoader;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
index 66df3cf..1510426 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.xmlcache;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertSame;
import java.util.Stack;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
index 0c51878..76fd803 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
@@ -14,9 +14,17 @@
*/
package org.apache.geode.internal.cache.xmlcache;
-import static com.googlecode.catchexception.CatchException.*;
+import static com.googlecode.catchexception.CatchException.catchException;
+import static com.googlecode.catchexception.CatchException.caughtException;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.inOrder;
+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.ArrayList;
import java.util.Collections;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
index eee7bc2..a95b43a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
@@ -14,8 +14,24 @@
*/
package org.apache.geode.internal.cache.xmlcache;
-import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_3_0;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_4_0;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_4_1;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_5_0;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_5_1;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_5_5;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_5_7;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_5_8;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_6_0;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_6_1;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_6_5;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_6_6;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_7_0;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_8_0;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEMFIRE_8_1;
+import static org.apache.geode.internal.cache.xmlcache.CacheXmlVersion.GEODE_1_0;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
index 7aec5de..bc77c9f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.xmlcache;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
index 941ee97..31b6739 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.xmlcache;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
index 882b9c6..cf5b1dc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.cache.xmlcache;
-import static javax.xml.XMLConstants.*;
-import static org.junit.Assert.*;
+import static javax.xml.XMLConstants.NULL_NS_URI;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import java.util.concurrent.atomic.AtomicReference;
--
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.