You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/04/27 19:01:19 UTC

[geode] branch develop updated: GEODE-2953: Expand wildcard imports in geode-core:internal.cache. (#1876)

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 dfb8175  GEODE-2953: Expand wildcard imports in geode-core:internal.cache. (#1876)
dfb8175 is described below

commit dfb8175b300d5a71fbdc4f379aee5309909eaef9
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Fri Apr 27 12:01:13 2018 -0700

    GEODE-2953: Expand wildcard imports in geode-core:internal.cache. (#1876)
---
 .../apache/geode/internal/cache/AcceptHelper.java    |  2 +-
 .../apache/geode/internal/cache/CachePerfStats.java  |  8 ++++++--
 .../apache/geode/internal/cache/CacheServerImpl.java |  4 +++-
 .../geode/internal/cache/CacheStatisticsImpl.java    |  4 +++-
 .../geode/internal/cache/CommitReplyException.java   |  3 ++-
 .../internal/cache/CountingDataInputStream.java      |  5 ++++-
 .../geode/internal/cache/DiskDirectoryStats.java     |  6 +++++-
 .../apache/geode/internal/cache/DiskStoreStats.java  |  6 +++++-
 .../internal/cache/DiskWriteAttributesImpl.java      |  6 +++++-
 .../apache/geode/internal/cache/EntryExpiryTask.java |  9 ++++++++-
 .../geode/internal/cache/EnumListenerEvent.java      |  8 +++++++-
 .../internal/cache/ForceableLinkedBlockingQueue.java |  3 ++-
 .../internal/cache/InvalidateRegionOperation.java    |  5 +++--
 .../geode/internal/cache/LoaderHelperImpl.java       |  6 +++++-
 .../cache/NetSearchExpirationCalculator.java         |  3 ++-
 .../java/org/apache/geode/internal/cache/Node.java   |  4 +++-
 .../cache/PartitionedRegionBucketMgmtHelper.java     |  2 +-
 .../org/apache/geode/internal/cache/PoolStats.java   |  6 +++++-
 .../internal/cache/PutAllPartialResultException.java |  3 ++-
 .../apache/geode/internal/cache/QueuedOperation.java | 11 ++++++++---
 .../apache/geode/internal/cache/RegionEventImpl.java |  7 +++++--
 .../geode/internal/cache/RegionIdleExpiryTask.java   |  3 ++-
 .../geode/internal/cache/RegionTTLExpiryTask.java    |  3 ++-
 .../apache/geode/internal/cache/RoleEventImpl.java   |  9 +++++++--
 .../geode/internal/cache/TXEntryUserAttrState.java   |  4 +++-
 .../org/apache/geode/internal/cache/TXEvent.java     |  8 ++++++--
 .../java/org/apache/geode/internal/cache/TXId.java   |  6 ++++--
 .../apache/geode/internal/cache/TXLockRequest.java   | 10 +++++++---
 .../apache/geode/internal/cache/TXRegionState.java   | 12 ++++++++++--
 .../geode/internal/cache/TXReservationMgr.java       |  7 +++++--
 .../geode/internal/cache/eviction/HeapEvictor.java   |  2 --
 .../geode/internal/cache/execute/FunctionStats.java  |  6 +++++-
 .../geode/internal/cache/locks/TXLockBatch.java      | 10 +++++++---
 .../geode/internal/cache/locks/TXLockIdImpl.java     |  6 ++++--
 .../geode/internal/cache/locks/TXLockService.java    |  5 +++--
 .../cache/locks/TXLockUpdateParticipantsMessage.java |  4 +++-
 .../region/entry/RegionEntryFactoryBuilder.java      |  2 +-
 .../tier/sockets/ClientInterestMessageImpl.java      |  6 +++++-
 .../cache/tier/sockets/ClientMarkerMessageImpl.java  |  4 +++-
 .../cache/tier/sockets/ClientProxyMembershipID.java  | 20 ++++++++++++++++----
 .../cache/tier/sockets/InterestResultPolicyImpl.java |  4 +++-
 .../cache/tier/sockets/UnregisterAllInterest.java    |  3 ++-
 .../cache/tier/sockets/command/ClientReady.java      |  5 ++++-
 .../internal/cache/tier/sockets/command/Default.java |  4 +++-
 .../internal/cache/tier/sockets/command/Invalid.java |  4 +++-
 .../cache/tier/sockets/command/MakePrimary.java      |  5 ++++-
 .../cache/tier/sockets/command/PeriodicAck.java      |  7 ++++++-
 .../internal/cache/tier/sockets/command/Ping.java    |  5 ++++-
 ...UntilParallelGatewaySenderFlushedCoordinator.java | 16 +++++++++++++---
 .../internal/cache/xmlcache/BindingCreation.java     |  3 ++-
 .../geode/internal/cache/xmlcache/CacheXml.java      |  7 ++++++-
 51 files changed, 228 insertions(+), 73 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java
index 215f0d6..7ca8d06 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java
@@ -24,7 +24,7 @@ package org.apache.geode.internal.cache;
  */
 
 import java.io.IOException;
-import java.net.*;
+import java.net.InetSocketAddress;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.ServerSocketChannel;
 import java.util.Set;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java
index 724cebe..ed36543 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CachePerfStats.java
@@ -15,10 +15,14 @@
 
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
 import org.apache.geode.distributed.internal.PoolStatHelper;
 import org.apache.geode.distributed.internal.QueueStatHelper;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.NanoTimer;
 import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
index 7237f42..ab1e0df 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.internal.cache;
 
-import static java.lang.Integer.*;
+import static java.lang.Integer.MAX_VALUE;
+import static java.lang.Integer.getInteger;
+import static java.lang.Integer.valueOf;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java
index 12f5fd4..70fe7ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java
@@ -15,7 +15,9 @@
 
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheStatistics;
+import org.apache.geode.cache.EntryDestroyedException;
+import org.apache.geode.cache.StatisticsDisabledException;
 import org.apache.geode.internal.InternalStatisticsDisabledException;
 
 class CacheStatisticsImpl implements CacheStatistics {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CommitReplyException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CommitReplyException.java
index 3d6fa7f..3625ea4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CommitReplyException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CommitReplyException.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.internal.cache;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.Set;
 
 import org.apache.geode.distributed.internal.ReplyException;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CountingDataInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CountingDataInputStream.java
index e35005e..7941619 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CountingDataInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CountingDataInputStream.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.internal.cache;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * A data input stream that counts the bytes it plans on reading.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java
index 25c5c36..9e2e110 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskDirectoryStats.java
@@ -14,7 +14,11 @@
  */
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
 import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java
index 39738af..d5a8572 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreStats.java
@@ -14,7 +14,11 @@
  */
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
 import org.apache.geode.distributed.internal.DistributionStats;
 import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
index 8193f79..82b9bee 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
@@ -16,7 +16,11 @@ package org.apache.geode.internal.cache;
 
 import java.util.Properties;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.cache.DiskWriteAttributes;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.cache.xmlcache.CacheXml;
 import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
index 3ed9d09..d197f1d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
@@ -23,7 +23,14 @@ import java.util.concurrent.locks.Lock;
 
 import org.apache.logging.log4j.Logger;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.EntryDestroyedException;
+import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.ExpirationAction;
+import org.apache.geode.cache.ExpirationAttributes;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.TimeoutException;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.InternalStatisticsDisabledException;
 import org.apache.geode.internal.lang.SystemPropertyHelper;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EnumListenerEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EnumListenerEvent.java
index a754635..7d8ac0a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EnumListenerEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EnumListenerEvent.java
@@ -14,7 +14,13 @@
  */
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheEvent;
+import org.apache.geode.cache.CacheListener;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionMembershipListener;
+import org.apache.geode.cache.RegionRoleListener;
+import org.apache.geode.cache.RoleEvent;
 
 public abstract class EnumListenerEvent {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java
index ccd541e..18abd71 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java
@@ -28,7 +28,8 @@ import java.util.AbstractQueue;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.concurrent.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
index 478de83..360966a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
@@ -18,10 +18,11 @@ package org.apache.geode.internal.cache;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import java.util.*;
+import java.util.Set;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheEvent;
+import org.apache.geode.cache.EntryNotFoundException;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperImpl.java
index d3459c8..43423a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperImpl.java
@@ -15,7 +15,11 @@
 
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.cache.*;
+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.TimeoutException;
 import org.apache.geode.i18n.StringId;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/NetSearchExpirationCalculator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/NetSearchExpirationCalculator.java
index 6899a02..e3b9d7d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/NetSearchExpirationCalculator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/NetSearchExpirationCalculator.java
@@ -15,7 +15,8 @@
 
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.ExpirationAction;
+import org.apache.geode.cache.ExpirationAttributes;
 
 /**
  * EntryExpiryTask already implements the algorithm for figuring out expiration. This class has it
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
index f27a9d3..72d13ed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
@@ -15,7 +15,9 @@
 
 package org.apache.geode.internal.cache;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.ExternalizableDSFID;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java
index 254f43e..65400f2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.internal.cache;
 
-import java.util.*;
+import java.util.Set;
 
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.SetUtils;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
index 7598486..41b3a7d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
@@ -16,7 +16,11 @@ package org.apache.geode.internal.cache;
 
 import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
 
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
 import org.apache.geode.distributed.internal.DistributionStats;
 import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
index 0b08adc..78383e3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
@@ -15,7 +15,8 @@
 package org.apache.geode.internal.cache;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
 
 import org.apache.geode.CancelException;
 import org.apache.geode.GemFireException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/QueuedOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/QueuedOperation.java
index 1c33cc8..c5306ce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/QueuedOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/QueuedOperation.java
@@ -14,10 +14,15 @@
  */
 package org.apache.geode.internal.cache;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 
-import org.apache.geode.*;
-import org.apache.geode.cache.*;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.TimeoutException;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
 import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
index fa2d734..647e70a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
@@ -20,11 +20,14 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.DSFIDFactory;
 import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
index 539ee4d..f9d9947 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
@@ -15,7 +15,8 @@
 
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.ExpirationAction;
 
 class RegionIdleExpiryTask extends RegionExpiryTask {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
index e765571..b372438 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
@@ -15,7 +15,8 @@
 
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.ExpirationAction;
 
 class RegionTTLExpiryTask extends RegionExpiryTask {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
index 02ba28c..f504ca1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
@@ -14,8 +14,13 @@
  */
 package org.apache.geode.internal.cache;
 
-import java.io.*;
-import java.util.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 import org.apache.geode.DataSerializable;
 import org.apache.geode.DataSerializer;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryUserAttrState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryUserAttrState.java
index 15c9697..4934226 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryUserAttrState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryUserAttrState.java
@@ -15,7 +15,9 @@
 
 package org.apache.geode.internal.cache;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheRuntimeException;
+import org.apache.geode.cache.CommitConflictException;
+import org.apache.geode.cache.Region;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
index 684f698..47c616e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
@@ -14,9 +14,13 @@
  */
 package org.apache.geode.internal.cache;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheEvent;
+import org.apache.geode.cache.TransactionEvent;
+import org.apache.geode.cache.TransactionId;
 import org.apache.geode.internal.offheap.Releasable;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
index 38cfe84..8b00cff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
@@ -14,10 +14,12 @@
  */
 package org.apache.geode.internal.cache;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 
 import org.apache.geode.cache.TransactionId;
-import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.DSFIDFactory;
 import org.apache.geode.internal.ExternalizableDSFID;
 import org.apache.geode.internal.InternalDataSerializer;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXLockRequest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXLockRequest.java
index 5958830..d1d8af7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXLockRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXLockRequest.java
@@ -15,11 +15,15 @@
 
 package org.apache.geode.internal.cache;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Set;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CommitConflictException;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.cache.locks.*;
+import org.apache.geode.internal.cache.locks.TXLockId;
+import org.apache.geode.internal.cache.locks.TXLockService;
+import org.apache.geode.internal.cache.locks.TXRegionLockRequest;
 
 /**
  * TXLockRequest represents all the locks that need to be made for a single transaction.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRegionState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRegionState.java
index 20febe9..f4f0d87 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRegionState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRegionState.java
@@ -15,13 +15,21 @@
 
 package org.apache.geode.internal.cache;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.CancelException;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CommitConflictException;
+import org.apache.geode.cache.RegionDestroyedException;
+import org.apache.geode.cache.UnsupportedOperationInTransactionException;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.TXEntryState.DistTxThinEntryState;
 import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
index 4abc4d0..28a6575 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
@@ -15,9 +15,12 @@
 
 package org.apache.geode.internal.cache;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CommitConflictException;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/HeapEvictor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/HeapEvictor.java
index 3040ba5..498a976 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/HeapEvictor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/HeapEvictor.java
@@ -17,14 +17,12 @@ package org.apache.geode.internal.cache.eviction;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.geode.distributed.internal.DistributionConfig.GEMFIRE_PREFIX;
 
-import java.util.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.*;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadFactory;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
index 46b6cb2..2f743c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
@@ -14,7 +14,11 @@
  */
 package org.apache.geode.internal.cache.execute;
 
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionStats;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
index 0126caf..7bb6964 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
@@ -15,13 +15,17 @@
 
 package org.apache.geode.internal.cache.locks;
 
-import java.io.*;
-import java.util.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 
 import org.apache.geode.distributed.internal.locks.DLockBatch;
 import org.apache.geode.distributed.internal.locks.DLockBatchId;
 import org.apache.geode.distributed.internal.locks.LockGrantorId;
-import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
index 7bcd9a4..3a0d6af 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
@@ -14,11 +14,13 @@
  */
 package org.apache.geode.internal.cache.locks;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.internal.locks.LockGrantorId;
-import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockService.java
index b63b82f..c2b87be 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockService.java
@@ -15,11 +15,12 @@
 
 package org.apache.geode.internal.cache.locks;
 
-import java.util.*;
+import java.util.List;
+import java.util.Set;
 
 import org.apache.geode.cache.CommitConflictException;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.distributed.internal.locks.*;
+import org.apache.geode.distributed.internal.locks.DLockService;
 
 /**
  * Provides transaction locking service for coordinating transactions.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
index 1a10a80..6c86dae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
@@ -15,7 +15,9 @@
 
 package org.apache.geode.internal.cache.locks;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.util.Set;
 
 import org.apache.geode.DataSerializer;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilder.java
index 2da220a..8333b33 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilder.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.internal.cache.region.entry;
 
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.RegionEntryFactory;
 import org.apache.geode.internal.cache.entries.VMStatsDiskLRURegionEntryHeap;
 import org.apache.geode.internal.cache.entries.VMStatsDiskLRURegionEntryOffHeap;
 import org.apache.geode.internal.cache.entries.VMStatsDiskRegionEntryHeap;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
index 8b6f243..aab5c5e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
@@ -15,7 +15,11 @@
 
 package org.apache.geode.internal.cache.tier.sockets;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.distributed.DistributedSystem;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
index 9809731..877dfcb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
@@ -15,7 +15,9 @@
 
 package org.apache.geode.internal.cache.tier.sockets;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.Version;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
index 2ac5552..026c6eb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
@@ -14,9 +14,17 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import java.io.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
 import java.util.Arrays;
 
 import org.apache.logging.log4j.Logger;
@@ -28,7 +36,11 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.distributed.DurableClientAttributes;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.VersionedDataInputStream;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
index c79ad39..3b61074 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
@@ -16,7 +16,9 @@
 
 package org.apache.geode.internal.cache.tier.sockets;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 
 import org.apache.geode.cache.InterestResultPolicy;
 import org.apache.geode.internal.DataSerializableFixedID;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
index 7453ca8..1645021 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
@@ -15,7 +15,8 @@
 
 package org.apache.geode.internal.cache.tier.sockets;
 
-import java.io.*;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
 
 /**
  * Singleton token indicating that all interest registrations should be removed.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
index 759b5b4..fe9b8fa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
@@ -18,7 +18,10 @@ import java.io.IOException;
 
 import org.apache.geode.distributed.internal.DistributionStats;
 import org.apache.geode.internal.cache.tier.Command;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
+import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.security.SecurityService;
 
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
index e6183d8..1cc1513 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
@@ -18,7 +18,9 @@ import java.io.IOException;
 
 import org.apache.geode.internal.cache.tier.Command;
 import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.security.SecurityService;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
index 6ca8099..0d43e68 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
@@ -18,7 +18,9 @@ import java.io.IOException;
 
 import org.apache.geode.internal.cache.tier.Command;
 import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.security.SecurityService;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
index 87dafff..58a7a62 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
@@ -18,7 +18,10 @@ package org.apache.geode.internal.cache.tier.sockets.command;
 import java.io.IOException;
 
 import org.apache.geode.internal.cache.tier.Command;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.Part;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.security.SecurityService;
 
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
index c30cc5e..91e177a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
@@ -18,7 +18,12 @@ import java.io.IOException;
 
 import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.tier.Command;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.Part;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.security.SecurityService;
 
 public class PeriodicAck extends BaseCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
index 70f641d..460c86e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
@@ -20,7 +20,10 @@ import org.apache.geode.distributed.internal.DistributionStats;
 import org.apache.geode.internal.cache.tier.CachedRegionHelper;
 import org.apache.geode.internal.cache.tier.Command;
 import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
+import org.apache.geode.internal.cache.tier.sockets.ClientHealthMonitor;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.security.SecurityService;
 
 public class Ping extends BaseCommand {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
index 734c9b9..9c518d5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinator.java
@@ -20,12 +20,22 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.*;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.BucketRegion;
+import org.apache.geode.internal.cache.BucketRegionQueue;
+import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
 import org.apache.geode.internal.cache.wan.WaitUntilGatewaySenderFlushedCoordinator;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java
index fb5b9b8..1b89f70 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java
@@ -19,7 +19,8 @@
  */
 package org.apache.geode.internal.cache.xmlcache;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 /**
  * This class represents the data given for binding a DataSource to JNDI tree. It encapsulates to
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
index 3390b93..7e7f523 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
@@ -18,7 +18,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ServiceLoader;
 
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXParseException;
 import org.xml.sax.ext.EntityResolver2;
 
 import org.apache.geode.cache.CacheXmlException;

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