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 a063d1b  GEODE-2953: Expand wildcard imports in geode-core:test... 
subpackages.  (#1908)
a063d1b is described below

commit a063d1b0680e4a9a3a0db577a5cf0745ab6893c8
Author: Patrick Rhomberg <prhomb...@pivotal.io>
AuthorDate: Fri May 4 11:57:45 2018 -0700

    GEODE-2953: Expand wildcard imports in geode-core:test... subpackages.  
(#1908)
---
 .../org/apache/geode/admin/AdminTestHelper.java    |  3 +-
 .../apache/geode/admin/AlertLevelJUnitTest.java    |  3 +-
 .../internal/CacheHealthEvaluatorJUnitTest.java    | 24 ++++++++++++----
 .../admin/internal/DistributedSystemTestCase.java  |  4 ++-
 .../admin/internal/HealthEvaluatorTestCase.java    |  4 ++-
 .../codeAnalysis/decode/CompiledAttribute.java     |  3 +-
 .../geode/codeAnalysis/decode/CompiledField.java   |  3 +-
 .../geode/codeAnalysis/decode/CompiledMethod.java  |  3 +-
 .../apache/geode/codeAnalysis/decode/cp/Cp.java    |  3 +-
 .../geode/codeAnalysis/decode/cp/CpClass.java      |  3 +-
 .../geode/codeAnalysis/decode/cp/CpDouble.java     |  3 +-
 .../geode/codeAnalysis/decode/cp/CpFieldref.java   |  3 +-
 .../geode/codeAnalysis/decode/cp/CpFloat.java      |  3 +-
 .../geode/codeAnalysis/decode/cp/CpInteger.java    |  3 +-
 .../decode/cp/CpInterfaceMethodref.java            |  3 +-
 .../codeAnalysis/decode/cp/CpInvokeDynamic.java    |  3 +-
 .../geode/codeAnalysis/decode/cp/CpLong.java       |  3 +-
 .../codeAnalysis/decode/cp/CpMethodHandle.java     |  3 +-
 .../geode/codeAnalysis/decode/cp/CpMethodType.java |  3 +-
 .../geode/codeAnalysis/decode/cp/CpMethodref.java  |  3 +-
 .../codeAnalysis/decode/cp/CpNameAndType.java      |  3 +-
 .../geode/codeAnalysis/decode/cp/CpString.java     |  3 +-
 .../geode/codeAnalysis/decode/cp/CpUtf8.java       |  5 ++--
 .../memcached/DomainObjectsAsValuesJUnitTest.java  |  6 ++--
 .../memcached/GemcachedDevelopmentJUnitTest.java   |  6 +++-
 .../geode/memcached/IntegrationJUnitTest.java      |  8 ++++--
 .../geode/pdx/AutoSerializableJUnitTest.java       | 25 ++++++++++++++---
 .../org/apache/geode/pdx/ByteSourceJUnitTest.java  |  5 +++-
 .../pdx/ClientsWithVersioningRetryDUnitTest.java   |  7 +++--
 .../geode/pdx/JSONPdxClientServerDUnitTest.java    |  6 ++--
 .../geode/pdx/PDXAsyncEventQueueDUnitTest.java     |  2 --
 .../geode/pdx/PdxDeserializationDUnitTest.java     |  2 +-
 .../geode/pdx/PdxInstanceFactoryJUnitTest.java     | 32 ++++++++++++++++++----
 .../org/apache/geode/pdx/PdxInstanceJUnitTest.java | 14 ++++++++--
 .../org/apache/geode/pdx/PdxStringJUnitTest.java   |  5 ++--
 .../apache/geode/pdx/PdxTypeExportDUnitTest.java   |  2 +-
 .../java/org/apache/geode/redis/AuthJUnitTest.java |  7 +++--
 .../org/apache/geode/redis/HashesJUnitTest.java    | 15 ++++++++--
 .../org/apache/geode/redis/ListsJUnitTest.java     |  7 +++--
 .../org/apache/geode/redis/RedisDistDUnitTest.java |  6 ++--
 .../apache/geode/redis/SortedSetsJUnitTest.java    | 19 +++++++++++--
 .../org/apache/geode/redis/StringsJunitTest.java   | 15 ++++++++--
 .../executor/AbstractScanExecutorTest.java         |  6 ++--
 .../ClientAuthenticationPart2DUnitTest.java        |  4 ++-
 .../security/ClientAuthenticationTestUtils.java    |  8 ++++--
 .../security/ClientMultiUserAuthzDUnitTest.java    | 20 ++++++++++++--
 .../DeltaClientAuthorizationDUnitTest.java         | 14 ++++++++--
 .../DeltaClientPostAuthorizationDUnitTest.java     | 14 +++++++---
 .../security/GemFireSecurityExceptionTest.java     |  5 ++--
 .../IntegratedSecurityPeerAuthDistributedTest.java | 11 ++++++--
 .../geode/security/NotAuthorizedExceptionTest.java |  7 +++--
 .../geode/security/P2PAuthenticationDUnitTest.java | 23 +++++++++++-----
 .../apache/geode/security/PDXPostProcessor.java    |  2 +-
 ...AuthenticatorWithCachelessLocatorDUnitTest.java |  9 ++++--
 .../apache/geode/security/SecurityTestUtils.java   | 31 +++++++++++++++------
 .../generator/LdapUserCredentialGenerator.java     |  2 +-
 .../security/generator/SSLCredentialGenerator.java |  4 ++-
 .../security/templates/PKCSPrincipalTest.java      |  2 +-
 .../security/templates/UsernamePrincipalTest.java  |  2 +-
 .../test/java/org/apache/geode/sequence/Arrow.java |  3 +-
 .../java/org/apache/geode/sequence/Lifeline.java   |  3 +-
 .../apache/geode/sequence/SelectGraphDialog.java   | 21 ++++++++++++--
 .../org/apache/geode/sequence/SequenceDiagram.java | 23 +++++++++++++---
 .../org/apache/geode/sequence/SequencePanel.java   | 10 +++++--
 .../org/apache/geode/sequence/StateColorMap.java   |  2 +-
 .../java/org/apache/geode/sequence/TimeAxis.java   |  8 ++++--
 .../org/apache/geode/sequence/ZoomingPanel.java    | 12 ++++++--
 .../apache/geode/test/dunit/LogWriterUtils.java    |  2 +-
 .../org/apache/geode/test/dunit/ThreadUtils.java   |  4 +--
 .../java/org/apache/geode/test/dunit/Wait.java     |  4 +--
 .../geode/test/dunit/rules/RemoteInvoker.java      |  2 +-
 .../java/org/apache/geode/test/fake/Fakes.java     |  5 +++-
 .../golden/FailWithExtraLineInOutputJUnitTest.java |  3 +-
 ...ailWithLineMissingFromEndOfOutputJUnitTest.java |  3 +-
 ...WithLineMissingFromMiddleOfOutputJUnitTest.java |  3 +-
 .../golden/FailWithProblemInOutputTestCase.java    |  3 +-
 .../apache/geode/test/golden/GoldenComparator.java |  4 ++-
 .../apache/geode/test/golden/GoldenTestCase.java   |  2 +-
 .../apache/geode/test/golden/PassJUnitTest.java    |  3 +-
 .../apache/geode/test/process/ProcessWrapper.java  | 10 +++++--
 .../test/process/ProcessWrapperJUnitTest.java      |  2 +-
 .../java/org/apache/geode/util/JSR166TestCase.java |  6 +++-
 82 files changed, 435 insertions(+), 150 deletions(-)

diff --git 
a/geode-core/src/test/java/org/apache/geode/admin/AdminTestHelper.java 
b/geode-core/src/test/java/org/apache/geode/admin/AdminTestHelper.java
index cd3f39f..937b863 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/AdminTestHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/AdminTestHelper.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.admin;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
index e619071..5f0a67a 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
@@ -15,7 +15,8 @@
 package org.apache.geode.admin;
 
 import static org.apache.geode.internal.Assert.assertTrue;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import java.lang.reflect.Constructor;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
index ac0acae..04df388 100644
--- 
a/geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
@@ -14,18 +14,32 @@
  */
 package org.apache.geode.admin.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.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.TestName;
 
-import org.apache.geode.admin.*;
-import org.apache.geode.cache.*;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.admin.GemFireHealth;
+import org.apache.geode.admin.GemFireHealthConfig;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheLoader;
+import org.apache.geode.cache.CacheLoaderException;
+import org.apache.geode.cache.LoaderHelper;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.Scope;
+import org.apache.geode.internal.cache.CachePerfStats;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
 /**
diff --git 
a/geode-core/src/test/java/org/apache/geode/admin/internal/DistributedSystemTestCase.java
 
b/geode-core/src/test/java/org/apache/geode/admin/internal/DistributedSystemTestCase.java
index 0956b8c..046efb7 100755
--- 
a/geode-core/src/test/java/org/apache/geode/admin/internal/DistributedSystemTestCase.java
+++ 
b/geode-core/src/test/java/org/apache/geode/admin/internal/DistributedSystemTestCase.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.admin.internal;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCKETS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
 
 import java.util.Properties;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java
 
b/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java
index 14927f4..1f15ed9 100644
--- 
a/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java
+++ 
b/geode-core/src/test/java/org/apache/geode/admin/internal/HealthEvaluatorTestCase.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.admin.internal;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
 
 import java.util.Properties;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledAttribute.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledAttribute.java
index acec70d..3c245ce 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledAttribute.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledAttribute.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import org.apache.geode.codeAnalysis.decode.cp.CpUtf8;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledField.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledField.java
index 80bbbb5..cb8c720 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledField.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledField.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import org.apache.geode.codeAnalysis.decode.cp.CpUtf8;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledMethod.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledMethod.java
index 828e387..0f9566f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledMethod.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/CompiledMethod.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import org.apache.geode.codeAnalysis.decode.cp.CpUtf8;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/Cp.java 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/Cp.java
index 3507380..1bc6200 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/Cp.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/Cp.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 /**
  * Cp represents an entry in the constant pool of a class. See
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpClass.java 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpClass.java
index a5f55a1..70d6750 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpClass.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpClass.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import org.apache.geode.codeAnalysis.decode.CompiledClass;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpDouble.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpDouble.java
index bbad6e3..377e49a 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpDouble.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpDouble.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 
 public class CpDouble extends Cp {
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpFieldref.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpFieldref.java
index 51c585d..0602243 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpFieldref.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpFieldref.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import org.apache.geode.codeAnalysis.decode.CompiledClass;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpFloat.java 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpFloat.java
index d8e2834..82882c4 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpFloat.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpFloat.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 public class CpFloat extends Cp {
   byte b1;
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInteger.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInteger.java
index b44fb27..906e54b 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInteger.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInteger.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 class CpInteger extends Cp {
   byte b1;
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInterfaceMethodref.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInterfaceMethodref.java
index 2311e7b..378c3c1 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInterfaceMethodref.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInterfaceMethodref.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 public class CpInterfaceMethodref extends CpMethodref {
   CpInterfaceMethodref(DataInputStream source) throws IOException {
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInvokeDynamic.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInvokeDynamic.java
index 822c4c4..611bb1c 100755
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInvokeDynamic.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpInvokeDynamic.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import org.apache.geode.codeAnalysis.decode.CompiledClass;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpLong.java 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpLong.java
index a118cbe..5916838 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpLong.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpLong.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 public class CpLong extends Cp {
   byte b1;
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodHandle.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodHandle.java
index 8d75f54..2ee9d39 100755
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodHandle.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodHandle.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import org.apache.geode.codeAnalysis.decode.CompiledClass;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodType.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodType.java
index 111b211..5d9c567 100755
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodType.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodType.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import org.apache.geode.codeAnalysis.decode.CompiledClass;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodref.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodref.java
index c2ee885..e2ef8c9 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodref.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpMethodref.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 
 public class CpMethodref extends CpFieldref {
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpNameAndType.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpNameAndType.java
index ba4d0ac..79474bc 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpNameAndType.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpNameAndType.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 public class CpNameAndType extends Cp {
   int name_index; // utf8 unqualified field/method name
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpString.java
 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpString.java
index 7e8ca85..35e14ec 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpString.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpString.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 public class CpString extends Cp {
   int string_index; // har har - points to a Utf8 holding the string's guts
diff --git 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
index ba630fa..05a364b 100644
--- 
a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
+++ 
b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.codeAnalysis.decode.cp;
 
-import java.io.*;
-import java.util.*;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.Vector;
 
 public class CpUtf8 extends Cp {
   private StringBuffer value;
diff --git 
a/geode-core/src/test/java/org/apache/geode/memcached/DomainObjectsAsValuesJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/memcached/DomainObjectsAsValuesJUnitTest.java
index 7df4de5..0ad144c 100644
--- 
a/geode-core/src/test/java/org/apache/geode/memcached/DomainObjectsAsValuesJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/memcached/DomainObjectsAsValuesJUnitTest.java
@@ -14,8 +14,10 @@
  */
 package org.apache.geode.memcached;
 
-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.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
diff --git 
a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
index 7a15b05..d3b7685 100644
--- 
a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
@@ -15,7 +15,11 @@
 package org.apache.geode.memcached;
 
 import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git 
a/geode-core/src/test/java/org/apache/geode/memcached/IntegrationJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/memcached/IntegrationJUnitTest.java
index 6454a14..6e3c82f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/memcached/IntegrationJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/memcached/IntegrationJUnitTest.java
@@ -14,8 +14,12 @@
  */
 package org.apache.geode.memcached;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
index d9f06fc..65cea9e 100644
--- 
a/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
@@ -15,16 +15,33 @@
 package org.apache.geode.pdx;
 
 import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
-
-import java.io.*;
+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 java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.junit.After;
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
index b16ff92..488ef47 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.pdx;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.nio.BufferUnderflowException;
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
index 00c6a1f..e1ee36f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -14,8 +14,11 @@
  */
 package org.apache.geode.pdx;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCKETS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 import java.util.LinkedList;
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
index 7125827..ef8a78e 100755
--- 
a/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
@@ -14,8 +14,10 @@
  */
 package org.apache.geode.pdx;
 
-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.LOCATORS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
index 16a3a13..0c11fce 100644
--- 
a/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.pdx;
 
-import static org.junit.Assert.*;
-
 import java.util.List;
 import java.util.Properties;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
index c8f8b02..6e1eac4 100644
--- 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.pdx;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
index 6cf80a0..3cea5e9 100644
--- 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
@@ -15,10 +15,28 @@
 package org.apache.geode.pdx;
 
 import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
-
-import java.io.*;
-import java.util.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.LinkedHashSet;
+import java.util.Vector;
 
 import org.junit.After;
 import org.junit.Before;
@@ -34,7 +52,11 @@ import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
-import org.apache.geode.pdx.internal.*;
+import org.apache.geode.pdx.internal.PdxField;
+import org.apache.geode.pdx.internal.PdxInstanceEnum;
+import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
+import org.apache.geode.pdx.internal.PdxInstanceImpl;
+import org.apache.geode.pdx.internal.PdxType;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.SerializationTest;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
index cbe930b..f5c1750 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
@@ -14,8 +14,12 @@
  */
 package org.apache.geode.pdx;
 
-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.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.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -23,7 +27,11 @@ import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigInteger;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
 
 import org.junit.After;
 import org.junit.Before;
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
index 845be43..8672f98 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.pdx;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
index 327c37f..eaa5cfa 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.pdx;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Collection;
 
diff --git a/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
index 12ec334..8d493e9 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
@@ -14,8 +14,11 @@
  */
 package org.apache.geode.redis;
 
-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 java.io.IOException;
 import java.util.Random;
diff --git 
a/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
index 5c2fea2..fd4c03c 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
@@ -14,11 +14,20 @@
  */
 package org.apache.geode.redis;
 
-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.assertTrue;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
 
 import org.junit.After;
 import org.junit.AfterClass;
diff --git 
a/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
index 0606c58..e7c9eff 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
@@ -14,8 +14,11 @@
  */
 package org.apache.geode.redis;
 
-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.assertTrue;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git 
a/geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java
index 88658a6..a4e0d0e 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java
@@ -14,8 +14,10 @@
  */
 package org.apache.geode.redis;
 
-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 java.util.Random;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
index 63aa69d..89838ea 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
@@ -14,12 +14,25 @@
  */
 package org.apache.geode.redis;
 
-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 java.io.IOException;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
 
 import org.junit.After;
 import org.junit.AfterClass;
diff --git 
a/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java 
b/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
index 5ee3218..8027823 100755
--- a/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
@@ -14,11 +14,20 @@
  */
 package org.apache.geode.redis;
 
-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 java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
 
 import org.junit.After;
 import org.junit.AfterClass;
diff --git 
a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
 
b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
index 7f5c6cc..427f424 100644
--- 
a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
@@ -14,8 +14,10 @@
  */
 package org.apache.geode.redis.internal.executor;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.regex.Pattern;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationPart2DUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationPart2DUnitTest.java
index db2ba95..77c5d34 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationPart2DUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationPart2DUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.security;
 
-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.Collection;
 import java.util.List;
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestUtils.java
 
b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestUtils.java
index 580a7c8..f8544ac 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestUtils.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestUtils.java
@@ -14,9 +14,11 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.security.SecurityTestUtils.*;
-import static org.junit.Assert.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static org.apache.geode.security.SecurityTestUtils.NO_EXCEPTION;
+import static org.apache.geode.security.SecurityTestUtils.REGION_NAME;
+import static org.apache.geode.security.SecurityTestUtils.getCache;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.Properties;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java
index 4d1a012..4669fa2 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java
@@ -14,8 +14,24 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.security.SecurityTestUtils.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
+import static org.apache.geode.security.SecurityTestUtils.NOTAUTHZ_EXCEPTION;
+import static org.apache.geode.security.SecurityTestUtils.NO_EXCEPTION;
+import static org.apache.geode.security.SecurityTestUtils.REGION_NAME;
+import static org.apache.geode.security.SecurityTestUtils.closeCache;
+import static org.apache.geode.security.SecurityTestUtils.createCacheClient;
+import static 
org.apache.geode.security.SecurityTestUtils.createCacheClientForMultiUserMode;
+import static 
org.apache.geode.security.SecurityTestUtils.doMultiUserContainsKeys;
+import static org.apache.geode.security.SecurityTestUtils.doMultiUserDestroys;
+import static org.apache.geode.security.SecurityTestUtils.doMultiUserFE;
+import static org.apache.geode.security.SecurityTestUtils.doMultiUserGetAll;
+import static org.apache.geode.security.SecurityTestUtils.doMultiUserGets;
+import static 
org.apache.geode.security.SecurityTestUtils.doMultiUserInvalidates;
+import static org.apache.geode.security.SecurityTestUtils.doMultiUserPuts;
+import static org.apache.geode.security.SecurityTestUtils.doMultiUserQueries;
+import static 
org.apache.geode.security.SecurityTestUtils.doMultiUserQueryExecute;
+import static 
org.apache.geode.security.SecurityTestUtils.doMultiUserRegionDestroys;
+import static org.apache.geode.security.SecurityTestUtils.getLocatorPort;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
 
 import java.util.Iterator;
 import java.util.Properties;
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
index a52d192..7cfc06f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
@@ -15,9 +15,17 @@
 package org.apache.geode.security;
 
 import static 
org.apache.geode.security.ClientAuthenticationTestUtils.createCacheClient;
-import static org.apache.geode.security.SecurityTestUtils.*;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
+import static org.apache.geode.security.SecurityTestUtils.KEYS;
+import static org.apache.geode.security.SecurityTestUtils.NO_EXCEPTION;
+import static org.apache.geode.security.SecurityTestUtils.REGION_NAME;
+import static org.apache.geode.security.SecurityTestUtils.closeCache;
+import static org.apache.geode.security.SecurityTestUtils.getCache;
+import static org.apache.geode.security.SecurityTestUtils.getLocatorPort;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
 
 import java.util.Properties;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
index e0b5734..8d899b1 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
@@ -14,10 +14,16 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.security.SecurityTestUtils.*;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.IgnoredException.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
+import static org.apache.geode.security.SecurityTestUtils.NOTAUTHZ_EXCEPTION;
+import static org.apache.geode.security.SecurityTestUtils.NO_EXCEPTION;
+import static org.apache.geode.security.SecurityTestUtils.OTHER_EXCEPTION;
+import static org.apache.geode.security.SecurityTestUtils.closeCache;
+import static org.apache.geode.security.SecurityTestUtils.concatProperties;
+import static org.apache.geode.security.SecurityTestUtils.createCacheClient;
+import static org.apache.geode.security.SecurityTestUtils.getLocatorPort;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
index b04c361..278fc40 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.security;
 
-import static com.googlecode.catchexception.CatchException.*;
-import static org.assertj.core.api.Assertions.*;
+import static com.googlecode.catchexception.CatchException.catchException;
+import static com.googlecode.catchexception.CatchException.caughtException;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.NotSerializableException;
 import java.io.Serializable;
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/IntegratedSecurityPeerAuthDistributedTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/IntegratedSecurityPeerAuthDistributedTest.java
index efca98b..8cfeb4a 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/IntegratedSecurityPeerAuthDistributedTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/IntegratedSecurityPeerAuthDistributedTest.java
@@ -14,9 +14,14 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Invoke.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTH_INIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Properties;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
index 91d2f4e..233a1d4 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
@@ -14,9 +14,10 @@
  */
 package org.apache.geode.security;
 
-import static com.googlecode.catchexception.CatchException.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static com.googlecode.catchexception.CatchException.catchException;
+import static com.googlecode.catchexception.CatchException.caughtException;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 import java.io.NotSerializableException;
 import java.io.Serializable;
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
index cfcc23f..117000a 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
@@ -14,13 +14,22 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.AvailablePort.*;
-import static org.apache.geode.security.SecurityTestUtils.*;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.IgnoredException.*;
-import static org.apache.geode.test.dunit.NetworkUtils.*;
-import static org.apache.geode.test.dunit.Wait.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTH_INIT;
+import static org.apache.geode.internal.AvailablePort.SOCKET;
+import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
+import static org.apache.geode.security.SecurityTestUtils.startLocator;
+import static org.apache.geode.security.SecurityTestUtils.stopLocator;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertNull;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
+import static org.apache.geode.test.dunit.NetworkUtils.getIPLiteral;
+import static org.apache.geode.test.dunit.Wait.pause;
 
 import java.util.Properties;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessor.java 
b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessor.java
index 7e19194..0dcfa43 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessor.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessor.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.security;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
 import java.util.Properties;
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorWithCachelessLocatorDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorWithCachelessLocatorDUnitTest.java
index acf04b3..e827e68 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorWithCachelessLocatorDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorWithCachelessLocatorDUnitTest.java
@@ -15,8 +15,13 @@
 
 package org.apache.geode.security;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Properties;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java 
b/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
index c222277..8477423 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
@@ -14,14 +14,29 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.cache30.ClientServerTestCase.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.AvailablePort.*;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.DistributedTestUtils.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
-import static org.apache.geode.test.dunit.NetworkUtils.*;
-import static org.apache.geode.test.dunit.Wait.*;
+import static 
org.apache.geode.cache30.ClientServerTestCase.configureConnectionPoolWithNameAndFactory;
+import static org.apache.geode.cache30.ClientServerTestCase.disconnectFromDS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTH_INIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_LOG_LEVEL;
+import static 
org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static org.apache.geode.internal.AvailablePort.SOCKET;
+import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
+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 static 
org.apache.geode.test.dunit.DistributedTestUtils.getDUnitLocatorPort;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import static org.apache.geode.test.dunit.NetworkUtils.getIPLiteral;
+import static org.apache.geode.test.dunit.Wait.waitForCriterion;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
 
b/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
index bf80702..b339ae9 100755
--- 
a/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.security.generator;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_DHALGO;
 
 import java.security.Principal;
 import java.util.Properties;
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
 
b/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
index 58f50a9..ca84073 100755
--- 
a/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.security.generator;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_REQUIRE_AUTHENTICATION;
 
 import java.io.File;
 import java.io.IOException;
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
index 5b75364..2e0aa5b 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.security.templates;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.Serializable;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
index 1a96bfd..b6befe2 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.security.templates;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.Serializable;
 
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/Arrow.java 
b/geode-core/src/test/java/org/apache/geode/sequence/Arrow.java
index 6ce9d28..349cd87 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/Arrow.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/Arrow.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.sequence;
 
-import java.awt.*;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.awt.geom.GeneralPath;
 
 /**
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/Lifeline.java 
b/geode-core/src/test/java/org/apache/geode/sequence/Lifeline.java
index 56c92a8..55a99e3 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/Lifeline.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/Lifeline.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.sequence;
 
-import java.awt.*;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/sequence/SelectGraphDialog.java 
b/geode-core/src/test/java/org/apache/geode/sequence/SelectGraphDialog.java
index 59181b6..264a126 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/SelectGraphDialog.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/SelectGraphDialog.java
@@ -14,14 +14,29 @@
  */
 package org.apache.geode.sequence;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Pattern;
 
-import javax.swing.*;
+import javax.swing.AbstractListModel;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java 
b/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java
index 22781d7..5bddb52 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java
@@ -14,13 +14,28 @@
  */
 package org.apache.geode.sequence;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
-
-import javax.swing.*;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.Popup;
+import javax.swing.PopupFactory;
 
 /**
  * Created by IntelliJ IDEA. User: dsmith Date: Oct 29, 2010 Time: 4:18:40 PM 
To change this
diff --git 
a/geode-core/src/test/java/org/apache/geode/sequence/SequencePanel.java 
b/geode-core/src/test/java/org/apache/geode/sequence/SequencePanel.java
index c9c43b2..b90ce08 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/SequencePanel.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/SequencePanel.java
@@ -14,11 +14,17 @@
  */
 package org.apache.geode.sequence;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Toolkit;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 
-import javax.swing.*;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ScrollPaneConstants;
 
 /**
  * Created by IntelliJ IDEA. User: dan Date: Oct 28, 2010 Time: 10:29:23 PM To 
change this template
diff --git 
a/geode-core/src/test/java/org/apache/geode/sequence/StateColorMap.java 
b/geode-core/src/test/java/org/apache/geode/sequence/StateColorMap.java
index fc68a31..247eedc 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/StateColorMap.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/StateColorMap.java
@@ -16,7 +16,7 @@ package org.apache.geode.sequence;
 
 import static java.lang.Math.random;
 
-import java.awt.*;
+import java.awt.Color;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/TimeAxis.java 
b/geode-core/src/test/java/org/apache/geode/sequence/TimeAxis.java
index fd9bc6e..e78afd7 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/TimeAxis.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/TimeAxis.java
@@ -14,12 +14,16 @@
  */
 package org.apache.geode.sequence;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Rectangle;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.swing.*;
+import javax.swing.JComponent;
 
 /**
  * Created by IntelliJ IDEA. User: dsmith Date: Oct 29, 2010 Time: 5:24:54 PM 
To change this
diff --git 
a/geode-core/src/test/java/org/apache/geode/sequence/ZoomingPanel.java 
b/geode-core/src/test/java/org/apache/geode/sequence/ZoomingPanel.java
index 8be669b..df47d0d 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/ZoomingPanel.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/ZoomingPanel.java
@@ -14,12 +14,20 @@
  */
 package org.apache.geode.sequence;
 
-import java.awt.*;
+import java.awt.AlphaComposite;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
 
-import javax.swing.*;
+import javax.swing.JPanel;
+import javax.swing.JViewport;
 
 /**
  * Created by IntelliJ IDEA. User: dan Date: Oct 28, 2010 Time: 10:30:40 PM To 
change this template
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java
index 74fc208..e48048a 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.test.dunit;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
 
 import java.util.Properties;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
index 8bac15e..b6f6f88 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
@@ -14,8 +14,8 @@
  */
 package org.apache.geode.test.dunit;
 
-import static org.apache.geode.test.dunit.Jitter.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.test.dunit.Jitter.jitterInterval;
+import static org.junit.Assert.fail;
 
 import org.apache.logging.log4j.Logger;
 
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
index a5ddff7..73ed7a5 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
@@ -14,8 +14,8 @@
  */
 package org.apache.geode.test.dunit;
 
-import static org.apache.geode.test.dunit.Jitter.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.test.dunit.Jitter.jitterInterval;
+import static org.junit.Assert.fail;
 
 import org.apache.logging.log4j.Logger;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
index e754cc6..8f1150c 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.test.dunit.rules;
 
-import static org.apache.geode.test.dunit.Invoke.*;
+import static org.apache.geode.test.dunit.Invoke.invokeInLocator;
 
 import java.io.Serializable;
 
diff --git a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java 
b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
index ef7de58..95dea38 100644
--- a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
+++ b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.test.fake;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.util.HashMap;
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
index 6c76028..917e8a7 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.test.golden;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
index 1126ff5..2775ce6 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.test.golden;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
index ec4a42a..b8db1e1 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.test.golden;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithProblemInOutputTestCase.java
 
b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithProblemInOutputTestCase.java
index 85573de..f82e066 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithProblemInOutputTestCase.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithProblemInOutputTestCase.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.test.golden;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenComparator.java 
b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenComparator.java
index 2a67d77..92ac0bf 100644
--- 
a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenComparator.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenComparator.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.test.golden;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java 
b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java
index f4e06b9..bc71638 100644
--- a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.test.golden;
 
-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.IOException;
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
index 3f4ed6b..0e48231 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.test.golden;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java 
b/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java
index c8150f8..a02f298 100644
--- a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java
+++ b/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java
@@ -14,12 +14,18 @@
  */
 package org.apache.geode.test.process;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
 import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.PrintStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
index dde4118..d5bb6c2 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.test.process;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.After;
 import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/util/JSR166TestCase.java 
b/geode-core/src/test/java/org/apache/geode/util/JSR166TestCase.java
index fe4624e..3ac5789 100755
--- a/geode-core/src/test/java/org/apache/geode/util/JSR166TestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/util/JSR166TestCase.java
@@ -20,7 +20,11 @@
  */
 package org.apache.geode.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.security.CodeSource;
 import java.security.Permission;

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

Reply via email to