geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prhomb...@apache.org
Subject [geode] branch develop updated: GEODE-2953: Expand wildcard imports in geode-core:test.cache. (#1907)
Date Thu, 03 May 2018 23:16:40 GMT
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 82b7910  GEODE-2953: Expand wildcard imports in geode-core:test.cache.  (#1907)
82b7910 is described below

commit 82b79107a93e8c08da85e53eba635dec7adc3d79
Author: Patrick Rhomberg <prhomberg@pivotal.io>
AuthorDate: Thu May 3 16:16:33 2018 -0700

    GEODE-2953: Expand wildcard imports in geode-core:test.cache.  (#1907)
---
 .../geode/cache/AttributesFactoryJUnitTest.java    |  7 ++++-
 .../apache/geode/cache/CacheListenerJUnitTest.java |  5 ++-
 .../geode/cache/ClientServerTimeSyncDUnitTest.java |  9 +++++-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java    |  6 ++--
 .../geode/cache/ConnectionPoolAutoDUnitTest.java   |  2 +-
 .../cache/ConnectionPoolFactoryJUnitTest.java      | 10 ++++--
 .../org/apache/geode/cache/OperationJUnitTest.java |  3 +-
 .../org/apache/geode/cache/ProxyJUnitTest.java     | 12 ++++++--
 .../apache/geode/cache/RegionFactoryJUnitTest.java | 34 ++++++++++++++++++--
 .../apache/geode/cache/RoleExceptionJUnitTest.java | 15 ++++++---
 .../cache/client/ClientRegionFactoryJUnitTest.java | 29 +++++++++++++++--
 .../CacheServerSSLConnectionDUnitTest.java         | 36 ++++++++++++++++++++--
 .../internal/LocatorLoadBalancingDUnitTest.java    |  2 --
 .../client/internal/OpExecutorImplJUnitTest.java   |  3 +-
 .../client/internal/QueueManagerJUnitTest.java     | 13 ++++++--
 .../client/internal/SSLNoClientAuthDUnitTest.java  | 16 ++++++++--
 .../client/internal/ServerBlackListJUnitTest.java  |  3 +-
 .../locator/LocatorStatusResponseJUnitTest.java    |  5 ++-
 .../cache/execute/FunctionAdapterJUnitTest.java    |  4 ++-
 .../management/MXMemoryPoolListenerExample.java    |  6 +++-
 .../management/MemoryThresholdsDUnitTest.java      | 10 ++++--
 .../cache/management/ResourceManagerDUnitTest.java |  6 +++-
 .../mapInterface/ExceptionHandlingJUnitTest.java   | 14 +++++++--
 .../cache/mapInterface/MapFunctionalJUnitTest.java | 13 ++++++--
 .../mapInterface/PutAllGlobalLockJUnitTest.java    |  5 +--
 .../partition/PartitionRegionHelperDUnitTest.java  |  7 ++++-
 .../BaseLineAndCompareQueryPerfJUnitTest.java      | 25 ++++++++++-----
 .../org/apache/geode/cache/query/CacheUtils.java   |  5 +--
 .../apache/geode/cache/query/IndexTypeTest.java    |  2 +-
 .../apache/geode/cache/query/QueryJUnitTest.java   |  6 ++--
 .../QueryWithBucketParameterIntegrationTest.java   |  6 ++--
 .../org/apache/geode/cache/query/data/City.java    |  2 +-
 .../geode/cache/query/data/CollectionHolder.java   |  8 +++--
 .../org/apache/geode/cache/query/data/Country.java |  5 +--
 .../apache/geode/cache/query/data/District.java    |  2 +-
 .../apache/geode/cache/query/data/Inventory.java   |  4 +--
 .../geode/cache/query/data/PortfolioPdx.java       |  2 --
 .../apache/geode/cache/query/data/Position.java    |  8 +++--
 .../cache/query/data/ProhibitedSecurityQuote.java  |  4 +--
 .../org/apache/geode/cache/query/data/Quote.java   |  3 +-
 .../geode/cache/query/data/SecurityMaster.java     |  4 +--
 .../org/apache/geode/cache/query/data/State.java   |  2 +-
 .../org/apache/geode/cache/query/data/Village.java |  2 +-
 .../query/dunit/CompactRangeIndexDUnitTest.java    |  3 +-
 .../cache/query/dunit/GroupByQueryDUnitTest.java   |  3 +-
 .../geode/cache/query/dunit/HelperTestCase.java    |  5 +--
 .../query/dunit/NonDistinctOrderByDUnitImpl.java   |  2 +-
 .../query/dunit/OrderByPartitionedDUnitTest.java   |  2 +-
 .../geode/cache/query/dunit/PDXQueryTestBase.java  |  3 +-
 ...artitionedRegionCompactRangeIndexDUnitTest.java |  6 ++--
 .../cache/query/dunit/PdxLocalQueryDUnitTest.java  |  4 ++-
 .../cache/query/dunit/PdxStringQueryDUnitTest.java |  4 ++-
 .../cache/query/dunit/PositionPdxVersion.java      |  3 +-
 .../cache/query/dunit/QueryAuthorization.java      |  3 +-
 .../cache/query/dunit/QueryIndexDUnitTest.java     |  3 +-
 .../query/dunit/QueryIndexUsingXMLDUnitTest.java   | 14 ++++-----
 .../dunit/QueryUsingFunctionContextDUnitTest.java  |  3 +-
 .../cache/query/dunit/QueryUsingPoolDUnitTest.java |  6 +++-
 .../cache/query/dunit/RemoteQueryDUnitTest.java    |  8 +++--
 .../query/dunit/SelectStarQueryDUnitTest.java      | 11 ++++---
 .../geode/cache/query/facets/lang/Employee.java    |  5 ++-
 .../geode/cache/query/facets/lang/Faculty.java     |  6 +++-
 .../geode/cache/query/facets/lang/G_Student.java   |  3 +-
 .../geode/cache/query/facets/lang/Person.java      |  3 +-
 .../geode/cache/query/facets/lang/Student.java     |  6 +++-
 .../geode/cache/query/facets/lang/UG_Student.java  |  3 +-
 .../geode/cache/query/facets/lang/Utils.java       |  5 ++-
 .../cache/query/functional/ConstantsJUnitTest.java |  2 +-
 .../cache/query/functional/CountStarJUnitTest.java |  4 ++-
 ...tinctResultsWithDupValuesInRegionJUnitTest.java | 11 +++++--
 .../cache/query/functional/FunctionJUnitTest.java  |  3 +-
 .../cache/query/functional/GroupByTestImpl.java    |  5 ++-
 .../functional/IUMRSingleRegionJUnitTest.java      | 26 +++++++++++++---
 .../functional/IndexCreationDeadLockJUnitTest.java |  4 ++-
 .../query/functional/IndexOnEntrySetJUnitTest.java | 13 ++++++--
 .../IndexUsageWithAliasAsProjAtrbtJUnitTest.java   |  2 +-
 .../functional/JavaSerializationJUnitTest.java     |  2 --
 .../functional/MultiRegionIndexUsageJUnitTest.java | 26 +++++++++++++---
 .../functional/NegativeNumberQueriesJUnitTest.java | 13 ++++++--
 .../query/functional/NestedQueryJUnitTest.java     |  6 +++-
 .../NonDistinctOrderByTestImplementation.java      |  6 +++-
 .../query/functional/NumericQueryJUnitTest.java    |  5 ++-
 .../query/functional/SelectToDateJUnitTest.java    | 11 +++++--
 .../TestNewFunctionSSorRSIntegrationTest.java      |  2 +-
 .../CompiledAggregateFunctionJUnitTest.java        |  3 +-
 .../cache/query/internal/CompiledInJUnitTest.java  |  9 ++++--
 .../query/internal/NWayMergeResultsJUnitTest.java  |  4 ++-
 .../QueryObjectSerializationJUnitTest.java         |  2 +-
 .../cache/query/internal/ResultsBagJUnitTest.java  |  4 ++-
 .../ResultsBagLimitBehaviourJUnitTest.java         |  5 ++-
 .../ResultsCollectionWrapperLimitJUnitTest.java    |  5 ++-
 .../internal/SelectResultsComparatorJUnitTest.java |  2 +-
 .../internal/StructBagLimitBehaviourJUnitTest.java |  4 ++-
 .../cache/query/internal/StructSetJUnitTest.java   |  3 +-
 .../internal/aggregate/AggregatorJUnitTest.java    |  2 +-
 .../internal/cq/CqAttributesImplJUnitTest.java     |  3 +-
 .../AsyncIndexUpdaterThreadShutdownJUnitTest.java  | 10 ++++--
 .../index/AsynchIndexMaintenanceJUnitTest.java     |  2 +-
 .../index/CompactRangeIndexIndexMapJUnitTest.java  | 12 ++++++--
 .../internal/index/CompactRangeIndexJUnitTest.java |  6 ++--
 ...ncurrentIndexInitOnOverflowRegionDUnitTest.java |  5 ++-
 ...ntIndexOperationsOnOverflowRegionDUnitTest.java |  6 +++-
 ...exUpdateWithInplaceObjectModFalseDUnitTest.java |  3 +-
 .../ConcurrentIndexUpdateWithoutWLDUnitTest.java   |  3 +-
 .../internal/index/CopyOnReadIndexDUnitTest.java   |  5 +--
 .../internal/index/CopyOnReadIndexJUnitTest.java   |  6 +++-
 .../index/DeclarativeIndexCreationJUnitTest.java   |  6 ++--
 .../internal/index/EquiJoinIntegrationTest.java    |  2 +-
 .../internal/index/HashIndexSetJUnitTest.java      |  8 +++--
 .../internal/index/IndexElemArrayJUnitTest.java    |  6 +++-
 .../query/internal/index/IndexHintJUnitTest.java   | 13 ++++++--
 .../index/IndexTrackingQueryObserverDUnitTest.java |  4 ++-
 .../index/IndexTrackingQueryObserverJUnitTest.java |  7 ++++-
 .../internal/index/MemoryIndexStoreJUnitTest.java  |  7 +++--
 ...IndexStoreWithInplaceModificationJUnitTest.java |  3 +-
 .../index/MultiIndexCreationDUnitTest.java         |  5 ++-
 .../index/PdxCopyOnReadQueryJUnitTest.java         |  4 +--
 .../index/PutAllWithIndexPerfDUnitTest.java        |  5 +--
 .../internal/ConnectionCountProbeJUnitTest.java    |  2 +-
 .../cache/server/internal/LoadMonitorTest.java     |  6 ++--
 .../cache/snapshot/RegionSnapshotJUnitTest.java    | 10 ++++--
 .../geode/cache/snapshot/SnapshotDUnitTest.java    |  4 ++-
 .../geode/cache/snapshot/SnapshotTestCase.java     |  2 +-
 .../StringPrefixPartitionResolverJUnitTest.java    |  2 +-
 124 files changed, 624 insertions(+), 196 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
index 98bb6dc..f81eed0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
@@ -14,7 +14,12 @@
  */
 package org.apache.geode.cache;
 
-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.assertNull;
+import static org.junit.Assert.assertTrue;
+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/cache/CacheListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
index ac2cbed..12bfa57 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
@@ -16,7 +16,10 @@ package org.apache.geode.cache;
 
 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.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
index c2341ef..82baa22 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
@@ -31,7 +31,14 @@ import org.apache.geode.cache30.CacheTestCase;
 import org.apache.geode.distributed.internal.DSClock;
 import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.dunit.*;
+import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.dunit.NetworkUtils;
+import org.apache.geode.test.dunit.SerializableCallable;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.Wait;
+import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.apache.geode.test.junit.categories.DistributedTest;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
index 8c08ada..c5c7d2a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -14,8 +14,10 @@
  */
 package org.apache.geode.cache;
 
-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/cache/ConnectionPoolAutoDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
index 551d5e4..d0863f7 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache;
 
-import static org.junit.runners.MethodSorters.*;
+import static org.junit.runners.MethodSorters.NAME_ASCENDING;
 
 import org.junit.FixMethodOrder;
 import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
index 866b7b4..baa1e97 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
@@ -14,8 +14,14 @@
  */
 package org.apache.geode.cache;
 
-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.LOG_LEVEL;
+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.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.Map;
 import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
index d56a11e..5198205 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+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/cache/ProxyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
index 161d0a7..f7cbf9b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
@@ -16,9 +16,15 @@ package org.apache.geode.cache;
 
 import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
 import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
-
-import java.util.*;
+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.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
index 66dcf37..7494fb1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
@@ -14,9 +14,37 @@
  */
 package org.apache.geode.cache;
 
-import static org.apache.geode.cache.RegionShortcut.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.cache.RegionShortcut.LOCAL;
+import static org.apache.geode.cache.RegionShortcut.LOCAL_HEAP_LRU;
+import static org.apache.geode.cache.RegionShortcut.LOCAL_OVERFLOW;
+import static org.apache.geode.cache.RegionShortcut.LOCAL_PERSISTENT;
+import static org.apache.geode.cache.RegionShortcut.LOCAL_PERSISTENT_OVERFLOW;
+import static org.apache.geode.cache.RegionShortcut.PARTITION;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_HEAP_LRU;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_OVERFLOW;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_PERSISTENT;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_PERSISTENT_OVERFLOW;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_PROXY;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_PROXY_REDUNDANT;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_REDUNDANT;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_REDUNDANT_HEAP_LRU;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_REDUNDANT_PERSISTENT;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE_HEAP_LRU;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE_OVERFLOW;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE_PERSISTENT;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE_PERSISTENT_OVERFLOW;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE_PROXY;
+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.apache.geode.distributed.ConfigurationProperties.MCAST_TTL;
+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.io.FileWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
index 2471612..ad14528 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
@@ -14,10 +14,17 @@
  */
 package org.apache.geode.cache;
 
-import static org.junit.Assert.*;
-
-import java.io.*;
-import java.util.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
index 6ee1a58..39b3bb3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
@@ -14,10 +14,21 @@
  */
 package org.apache.geode.cache.client;
 
-import static org.apache.geode.cache.client.ClientRegionShortcut.*;
+import static org.apache.geode.cache.client.ClientRegionShortcut.CACHING_PROXY;
+import static org.apache.geode.cache.client.ClientRegionShortcut.CACHING_PROXY_HEAP_LRU;
+import static org.apache.geode.cache.client.ClientRegionShortcut.CACHING_PROXY_OVERFLOW;
+import static org.apache.geode.cache.client.ClientRegionShortcut.LOCAL;
+import static org.apache.geode.cache.client.ClientRegionShortcut.LOCAL_HEAP_LRU;
+import static org.apache.geode.cache.client.ClientRegionShortcut.LOCAL_OVERFLOW;
+import static org.apache.geode.cache.client.ClientRegionShortcut.LOCAL_PERSISTENT;
+import static org.apache.geode.cache.client.ClientRegionShortcut.LOCAL_PERSISTENT_OVERFLOW;
+import static org.apache.geode.cache.client.ClientRegionShortcut.PROXY;
 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.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.net.InetAddress;
 import java.util.Arrays;
@@ -29,7 +40,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.CacheListener;
+import org.apache.geode.cache.CustomExpiry;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.EvictionAction;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.ExpirationAttributes;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionDestroyedException;
+import org.apache.geode.cache.RegionExistsException;
+import org.apache.geode.cache.RegionService;
+import org.apache.geode.cache.Scope;
 import org.apache.geode.cache.client.internal.ProxyRegion;
 import org.apache.geode.cache.query.Query;
 import org.apache.geode.cache.query.QueryService;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index b2f3be5..65f5c04 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -14,8 +14,40 @@
  */
 package org.apache.geode.cache.client.internal;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
+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.io.PrintWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index 423a5b4..889896a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.cache.client.internal;
 
-import static org.junit.Assert.*;
-
 import java.io.IOException;
 import java.io.Serializable;
 import java.net.InetAddress;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
index f2ad63a..5478292 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.client.internal;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
index 799ffd5..b6cdb40 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
@@ -16,7 +16,9 @@ package org.apache.geode.cache.client.internal;
 
 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.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -24,7 +26,14 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
index 2e7bdaf..e28d345 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -14,8 +14,20 @@
  */
 package org.apache.geode.cache.client.internal;
 
-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.SERVER_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE_PASSWORD;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
index ca27506..8b5d52c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.client.internal;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;
 import java.util.concurrent.Executors;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
index f6ba8ba..c757da9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.cache.client.internal.locator;
 
-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.assertNotSame;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
index e49e1eb..3b10c28 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
@@ -15,7 +15,9 @@
 
 package org.apache.geode.cache.execute;
 
-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.io.DataInputStream;
 import java.io.FileInputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java b/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java
index fd78731..8c8ba86 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java
@@ -30,7 +30,11 @@ import javax.management.NotificationEmitter;
 import javax.management.NotificationListener;
 
 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.Scope;
 import org.apache.geode.distributed.ConfigurationProperties;
 import org.apache.geode.distributed.DistributedSystem;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index 815f75b..d91a408 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -14,8 +14,14 @@
  */
 package org.apache.geode.cache.management;
 
-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.assertNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
index af898ee..29efa02 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
@@ -14,7 +14,11 @@
  */
 package org.apache.geode.cache.management;
 
-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.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
index 442b2e7..852332c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
@@ -21,10 +21,20 @@ import static org.junit.Assert.fail;
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+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.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.Scope;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
index e06928e..55c1798 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
@@ -21,10 +21,19 @@ import static org.junit.Assert.fail;
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+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.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.Scope;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
index 0b8470b..55e3eff 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.cache.mapInterface;
 
-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.assertTrue;
 
 import java.util.Properties;
 import java.util.TreeMap;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
index f6274b3..ee4cb06 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
@@ -14,7 +14,12 @@
  */
 package org.apache.geode.cache.partition;
 
-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.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
index 84d2424..ab8c2ad 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
@@ -19,10 +19,19 @@
  */
 package org.apache.geode.cache.query;
 
-import static org.junit.Assert.*;
-
-import java.io.*;
-import java.util.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.BufferedWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 import org.junit.After;
 import org.junit.Before;
@@ -30,9 +39,11 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.data.*;
-import org.apache.geode.cache.query.internal.*;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.data.Country;
+import org.apache.geode.cache.query.data.Portfolio;
+import org.apache.geode.cache.query.internal.QueryObserverAdapter;
+import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 import org.apache.geode.test.junit.categories.PerformanceTest;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/CacheUtils.java b/geode-core/src/test/java/org/apache/geode/cache/query/CacheUtils.java
index ddf9405..de00348 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/CacheUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/CacheUtils.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.cache.query;
 
-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.fail;
 
 import java.util.Iterator;
 import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
index ab299d7..51ef1c9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
@@ -15,7 +15,7 @@
 
 package org.apache.geode.cache.query;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
index f834c4a..8ff2772 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
@@ -23,8 +23,10 @@
  */
 package org.apache.geode.cache.query;
 
-import static org.junit.Assert.*;
-import static org.junit.runners.MethodSorters.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.runners.MethodSorters.NAME_ASCENDING;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
index ab813fa..ad5f8ee 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
@@ -15,8 +15,10 @@
 
 package org.apache.geode.cache.query;
 
-import static org.apache.geode.cache.query.data.TestData.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.cache.query.data.TestData.createAndPopulateSet;
+import static org.apache.geode.cache.query.data.TestData.populateRegion;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.Serializable;
 import java.util.HashSet;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/City.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/City.java
index a27f38f..e7e7b39 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/City.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/City.java
@@ -21,7 +21,7 @@
 
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
+import java.io.Serializable;
 
 public class City implements Serializable {
   public String name;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/CollectionHolder.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/CollectionHolder.java
index e9f1a8a..0f5e1e0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/CollectionHolder.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/CollectionHolder.java
@@ -21,10 +21,14 @@
 
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.Serializable;
 import java.util.Arrays;
 
-import org.apache.geode.*;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
 
 public class CollectionHolder implements Serializable, DataSerializable {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java
index 3495e86..0ffb999 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java
@@ -20,8 +20,9 @@
 
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
 
 public class Country implements Serializable {
   public String name;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java
index cb96df8..f53320d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java
@@ -21,7 +21,7 @@
 
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
+import java.io.Serializable;
 import java.util.Set;
 
 public class District implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Inventory.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Inventory.java
index d00b738..af8ef48 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Inventory.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Inventory.java
@@ -14,8 +14,8 @@
  */
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
-import java.sql.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
 
 /*
  * author: Prafulla Chaudhari
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioPdx.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioPdx.java
index 17c11fc..618a00b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioPdx.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/PortfolioPdx.java
@@ -20,7 +20,6 @@
 
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -29,7 +28,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.geode.*;
 import org.apache.geode.internal.Assert;
 import org.apache.geode.pdx.PdxReader;
 import org.apache.geode.pdx.PdxSerializable;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Position.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Position.java
index 8b7c7a4..cdd9e7e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Position.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Position.java
@@ -14,11 +14,15 @@
  */
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.geode.*;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
 
 
 public class Position implements Serializable, DataSerializable, Comparable {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/ProhibitedSecurityQuote.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/ProhibitedSecurityQuote.java
index b234844..daa7379 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/ProhibitedSecurityQuote.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/ProhibitedSecurityQuote.java
@@ -14,8 +14,8 @@
  */
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
-import java.sql.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
 
 /*
  * author: Prafulla Chaudhari
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java
index 8b60246..4fa4d95 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java
@@ -21,7 +21,8 @@
 package org.apache.geode.cache.query.data;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public class Quote implements Serializable {
   public int cusip;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/SecurityMaster.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/SecurityMaster.java
index 7346596..6459b2b 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/SecurityMaster.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/SecurityMaster.java
@@ -14,8 +14,8 @@
  */
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
-import java.sql.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
 
 /*
  * author: Prafulla Chaudhari
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java
index dba3fd7..9f8548a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java
@@ -20,7 +20,7 @@
 
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
+import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Village.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Village.java
index 6bc9bec..80983df 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Village.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Village.java
@@ -20,7 +20,7 @@
 
 package org.apache.geode.cache.query.data;
 
-import java.io.*;
+import java.io.Serializable;
 
 public class Village implements Serializable {
   public String name;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
index 3061ce9..828fb43 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.junit.Assert.*;
+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/cache/query/dunit/GroupByQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
index 949397c..7064cda 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.util.Iterator;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
index 765a7b9..a07648b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-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.assertFalse;
 
 import java.util.Iterator;
 import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
index d58f4c0..c0608f0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
index 7008143..ff91884 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
index 2636d84..c394dfb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.fail;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
index 5946e43..21f399a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
@@ -14,8 +14,10 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
index 8512673..775921a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-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.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
index b32ba6d..347008b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java
index a7f0f76..0e51c90 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java
@@ -15,11 +15,10 @@
 package org.apache.geode.cache.query.dunit;
 
 
-import java.io.*;
+import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.geode.*;
 import org.apache.geode.pdx.PdxReader;
 import org.apache.geode.pdx.PdxSerializable;
 import org.apache.geode.pdx.PdxWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java
index 59e10ea..b110709 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.security.Principal;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
index 99781b0..9c99c60 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index 4879973..58c2507 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -14,13 +14,13 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.IgnoredException.*;
-import static org.apache.geode.test.dunit.Invoke.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.awaitility.Awaitility.*;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index df99ad6..4b8f8a5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -15,7 +15,8 @@
 package org.apache.geode.cache.query.dunit;
 
 import static org.apache.geode.cache.query.Utils.createPortfoliosAndPositions;
-import static org.junit.Assert.*;
+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/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 2ab395a..c295bf1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -15,7 +15,11 @@
 package org.apache.geode.cache.query.dunit;
 
 import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-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 static org.junit.Assert.fail;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
index 93ea42c..3c0eb70 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -14,8 +14,12 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-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.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/cache/query/dunit/SelectStarQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
index 567b91f..a529adf 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
@@ -14,10 +14,13 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.Invoke.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
-import static org.apache.geode.test.dunit.NetworkUtils.*;
+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.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import static org.apache.geode.test.dunit.NetworkUtils.getServerHostName;
 
 import java.io.Serializable;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Employee.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Employee.java
index df9ae23..c5c5d99 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Employee.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Employee.java
@@ -15,7 +15,10 @@
 
 package org.apache.geode.cache.query.facets.lang;
 
-import java.util.*;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
 
 public class Employee {
   static Random rand = new Random();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Faculty.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Faculty.java
index 768a1f8..baf9a74 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Faculty.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Faculty.java
@@ -16,7 +16,11 @@
 package org.apache.geode.cache.query.facets.lang;
 
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/G_Student.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/G_Student.java
index ac64993..da6f85a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/G_Student.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/G_Student.java
@@ -16,7 +16,8 @@
 package org.apache.geode.cache.query.facets.lang;
 
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Date;
 
 
 public class G_Student extends Student {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Person.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Person.java
index 0f5be01..3fcbc28 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Person.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Person.java
@@ -15,7 +15,8 @@
 
 package org.apache.geode.cache.query.facets.lang;
 
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
 
 public class Person {
   private String _ssn;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Student.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Student.java
index d8f86ae..a4e0cfa 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Student.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Student.java
@@ -15,7 +15,11 @@
 
 package org.apache.geode.cache.query.facets.lang;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/UG_Student.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/UG_Student.java
index 350cf94..c022988 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/UG_Student.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/UG_Student.java
@@ -15,7 +15,8 @@
 
 package org.apache.geode.cache.query.facets.lang;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Date;
 
 
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Utils.java b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Utils.java
index 145ec2b..083a153 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Utils.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/facets/lang/Utils.java
@@ -15,7 +15,10 @@
 
 package org.apache.geode.cache.query.facets.lang;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.StringTokenizer;
 
 import org.apache.geode.LogWriter;
 import org.apache.geode.cache.AttributesFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
index 59490a4..086b232 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
@@ -19,7 +19,7 @@
  */
 package org.apache.geode.cache.query.functional;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 
 import java.util.Collection;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
index 6a6debc..6b4358c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.functional;
 
-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/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
index bdf6bf7..b00d040 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.functional;
 
-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.List;
 
@@ -23,7 +25,12 @@ 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.Cache;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.query.CacheUtils;
 import org.apache.geode.cache.query.Query;
 import org.apache.geode.cache.query.QueryService;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
index f83d262..d6357e8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
@@ -19,7 +19,8 @@
  */
 package org.apache.geode.cache.query.functional;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.text.SimpleDateFormat;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByTestImpl.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByTestImpl.java
index 0c52036..e11955b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByTestImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByTestImpl.java
@@ -19,7 +19,10 @@
  */
 package org.apache.geode.cache.query.functional;
 
-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.HashMap;
 import java.util.HashSet;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
index 2fcf45d..609cdd3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
@@ -23,16 +23,34 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.data.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.Scope;
+import org.apache.geode.cache.query.CacheUtils;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.IndexType;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.data.City;
+import org.apache.geode.cache.query.data.Country;
+import org.apache.geode.cache.query.data.District;
+import org.apache.geode.cache.query.data.State;
+import org.apache.geode.cache.query.data.Village;
 import org.apache.geode.cache.query.internal.QueryObserverAdapter;
 import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.cache.query.types.StructType;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
index ab79dc6..64056f6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.functional;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.File;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
index e76aed0..65370cb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
@@ -27,8 +27,17 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.query.CacheUtils;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
 import org.apache.geode.cache.query.internal.QueryObserverAdapter;
 import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.cache.query.internal.index.IndexManager;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
index ba20848..9113936 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
@@ -19,7 +19,7 @@
  */
 package org.apache.geode.cache.query.functional;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
index 1fb8707..3e443d7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.cache.query.functional;
 
-import static org.junit.Assert.*;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
index 0306887..e5e46a7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
@@ -23,7 +23,12 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
 
 import org.junit.After;
 import org.junit.Before;
@@ -31,9 +36,22 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.data.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.Scope;
+import org.apache.geode.cache.query.CacheUtils;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.IndexType;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.data.City;
+import org.apache.geode.cache.query.data.Country;
+import org.apache.geode.cache.query.data.District;
+import org.apache.geode.cache.query.data.State;
+import org.apache.geode.cache.query.data.Village;
 import org.apache.geode.cache.query.internal.QueryObserverAdapter;
 import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.cache.query.types.StructType;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
index dd33a49..7265b39 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
@@ -29,8 +29,17 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.Scope;
+import org.apache.geode.cache.query.CacheUtils;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.IndexType;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
 import org.apache.geode.cache.query.data.Numbers;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.test.junit.categories.IntegrationTest;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
index 48cb5c1..4d29584 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
@@ -19,7 +19,11 @@
  */
 package org.apache.geode.cache.query.functional;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java
index 5bd7580..fb72a3a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java
@@ -14,7 +14,11 @@
  */
 package org.apache.geode.cache.query.functional;
 
-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.util.ArrayList;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
index 24858ac..ec0caed 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.cache.query.functional;
 
-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.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
index a402451..bcf8cdb 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.functional;
 
-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.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -26,7 +28,12 @@ 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.Cache;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.query.CacheUtils;
 import org.apache.geode.cache.query.Query;
 import org.apache.geode.cache.query.QueryService;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
index 28dc1bf..062aa15 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
@@ -19,7 +19,7 @@
  */
 package org.apache.geode.cache.query.functional;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
index c9d2ba0..1ff76a9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.internal;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
index a622964..a2d6972 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
@@ -14,9 +14,14 @@
  */
 package org.apache.geode.cache.query.internal;
 
-import static org.junit.Assert.*;
+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 static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
index 7db2215..d2b96f8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.internal;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
index bf36757..f933c5e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.query.internal;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
index 4b4c1f7..9a51820 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.internal;
 
-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.DataInputStream;
 import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
index 88d87d6..c26cfa0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.cache.query.internal;
 
-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.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
index eddec1b..e20b729 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.cache.query.internal;
 
-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.ArrayList;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
index 9f3858f..d6ece5c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
@@ -17,7 +17,7 @@
  */
 package org.apache.geode.cache.query.internal;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 
 import java.util.Collections;
 import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
index dc7c53d..5c4a7ff 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.internal;
 
-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.util.Iterator;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
index 8fc8a7d..1fc7e75 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
@@ -19,7 +19,8 @@
  */
 package org.apache.geode.cache.query.internal;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Iterator;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
index a3d193c..b5632f0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.query.internal.aggregate;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
index b0aff80..f9e6fb2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.internal.cq;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
index 61e7838..22581f5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
@@ -15,12 +15,18 @@
 package org.apache.geode.cache.query.internal.index;
 
 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.assertNotNull;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-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.query.data.Portfolio;
 import org.apache.geode.cache.query.internal.index.IndexManager.IndexUpdaterThread;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
index ee86e57..0f15291 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
index 42e6356..2797851 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
@@ -25,8 +25,16 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.cache.*;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.query.CacheUtils;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
 import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.cache.query.data.Position;
 import org.apache.geode.distributed.internal.DistributionConfig;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
index afd4a7e..bcf8c33 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
@@ -14,8 +14,10 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-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 static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
index e0fab8c..2a52fac 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-import static org.junit.Assert.*;
+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.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
index 1c1947a..2c8d598 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
@@ -14,7 +14,11 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-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.util.Properties;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index 48601b6..c648cab 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Collection;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
index d4d0d05..9a4e067 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index 729f493..1e7d521 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-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.HashMap;
 import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
index 2e7263e..32f060a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
@@ -25,7 +25,11 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.QueryTestUtils;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
 import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.cache.query.data.Position;
 import org.apache.geode.test.junit.categories.IntegrationTest;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
index a8e7351..5a11e80 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
@@ -18,8 +18,10 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.Collection;
 import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
index c12ab5e..838f1f2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import java.io.Serializable;
 import java.text.ParseException;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
index 9757345..0bddddc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
@@ -14,9 +14,13 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
index 299176e..1ea7797 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
@@ -14,7 +14,11 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
index 4c5c1fa..8b1fefe 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-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.util.ArrayList;
 import java.util.Set;
@@ -27,7 +29,14 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.CacheUtils;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.IndexExistsException;
+import org.apache.geode.cache.query.IndexNameConflictException;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.RegionNotFoundException;
+import org.apache.geode.cache.query.SelectResults;
 import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.cache.query.functional.StructSetOrResultsSet;
 import org.apache.geode.cache.query.internal.DefaultQuery;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 36349cb..7525cc2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-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.Collection;
 import java.util.Map;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
index e7e2dde..1b556ac 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
@@ -28,7 +28,12 @@ import org.apache.geode.cache.AttributesFactory;
 import org.apache.geode.cache.PartitionAttributesFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.Scope;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.CacheUtils;
+import org.apache.geode.cache.query.Index;
+import org.apache.geode.cache.query.IndexType;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
 import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
 import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver.IndexInfo;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
index c84c364..ecb22e6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
@@ -14,9 +14,12 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-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.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
index f1e891f..b01afd3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.junit.After;
 import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
index df5f513..5bc281e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-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.Collection;
 import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
index 5699539..e28d530 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
@@ -14,8 +14,8 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-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 java.util.ArrayList;
 import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index f1f04e4..e2e2171 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.cache.query.internal.index;
 
-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.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
index 24d10bf..5e17bc0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.server.internal;
 
-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/cache/server/internal/LoadMonitorTest.java b/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
index 9bff8b7..a68ab83 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
@@ -14,8 +14,10 @@
  */
 package org.apache.geode.cache.server.internal;
 
-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.when;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
index 70a7744..43d6c2b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
@@ -14,8 +14,14 @@
  */
 package org.apache.geode.cache.snapshot;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+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.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
index 658349e..50b3884 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.snapshot;
 
-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.File;
 import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotTestCase.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotTestCase.java
index 4b63865..bec355e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotTestCase.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.snapshot;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
 import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
 
 import java.io.File;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
index 04bc164..e4febb8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
@@ -15,7 +15,7 @@
 package org.apache.geode.cache.util;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

-- 
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.

Mime
View raw message