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 18e2d01  GEODE-2953: Expand wildcard imports in geode-core.  (#1912)
18e2d01 is described below

commit 18e2d0167d769894727c221ae0906f72bd48ccfb
Author: Patrick Rhomberg <prhomb...@pivotal.io>
AuthorDate: Fri May 4 10:03:31 2018 -0700

    GEODE-2953: Expand wildcard imports in geode-core.  (#1912)
---
 .../admin/internal/CacheHealthConfigImpl.java      |   2 +-
 .../admin/internal/CacheServerConfigImpl.java      |   2 +-
 .../DistributedSystemHealthConfigImpl.java         |   2 +-
 .../internal/DistributionLocatorConfigImpl.java    |   2 +-
 .../admin/internal/DistributionLocatorImpl.java    |   6 +-
 .../admin/internal/GemFireHealthConfigImpl.java    |   2 +-
 .../admin/internal/ManagedEntityConfigImpl.java    |   4 +-
 .../internal/ManagedEntityConfigXmlGenerator.java  |  35 ++++-
 .../admin/internal/MemberHealthConfigImpl.java     |   2 +-
 .../internal/SystemMemberBridgeServerImpl.java     |   4 +-
 .../admin/internal/SystemMemberCacheEventImpl.java |   3 +-
 .../internal/SystemMemberRegionEventImpl.java      |   3 +-
 .../admin/internal/SystemMemberRegionImpl.java     |  25 +++-
 .../DistributedSystemHealthConfigJmxImpl.java      |   9 +-
 .../geode/distributed/DistributedLockService.java  |   4 +-
 .../internal/AbstractDistributionConfig.java       | 161 ++++++++++++++++++++-
 .../distributed/internal/DistributionConfig.java   | 161 ++++++++++++++++++++-
 .../internal/FunctionExecutionPooledExecutor.java  |   8 +-
 .../geode/distributed/internal/LocatorStats.java   |   6 +-
 .../internal/LonerDistributionManager.java         |  22 ++-
 .../internal/PooledExecutorWithDMStats.java        |   8 +-
 .../distributed/internal/ProcessorKeeper21.java    |   3 +-
 .../internal/ReliableReplyProcessor21.java         |   7 +-
 .../internal/RuntimeDistributionConfigImpl.java    |  11 +-
 .../distributed/internal/ShutdownMessage.java      |  10 +-
 .../geode/distributed/internal/StartupMessage.java |   5 +-
 .../ThrottlingMemLinkedQueueWithDMStats.java       |   3 +-
 .../distributed/internal/locks/DLockStats.java     |  10 +-
 .../internal/locks/DummyDLockStats.java            |   3 +-
 .../distributed/internal/locks/GrantorInfo.java    |   2 +-
 .../membership/InternalDistributedMember.java      |  20 ++-
 .../internal/membership/InternalRole.java          |   3 +-
 .../membership/gms/messenger/JGAddress.java        |   6 +-
 .../internal/cli/domain/RegionInformation.java     |   3 +-
 .../pdx/internal/AutoSerializableManager.java      |  18 ++-
 .../apache/geode/pdx/internal/TypeRegistry.java    |   2 +-
 .../org/apache/geode/redis/GeodeRedisServer.java   |   2 +-
 37 files changed, 520 insertions(+), 59 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthConfigImpl.java
index 3c57ef4..e583352 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthConfigImpl.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.admin.internal;
 
-import org.apache.geode.admin.*;
+import org.apache.geode.admin.CacheHealthConfig;
 
 /**
  * The implementation of <code>CacheHealthConfig</code>
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
index 2b1ccd9..61f463e 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.admin.internal;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
 
 import org.apache.geode.admin.CacheServerConfig;
 import org.apache.geode.admin.CacheVmConfig;
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthConfigImpl.java
index 41b7f12..12a8fd7 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthConfigImpl.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.admin.internal;
 
-import org.apache.geode.admin.*;
+import org.apache.geode.admin.DistributedSystemHealthConfig;
 
 /**
  * The implementation of <code>DistributedSystemHealthConfig</code>. Note that 
because it never
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
index 1db01a7..f5486c9 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
@@ -22,7 +22,7 @@ import java.util.Properties;
 import org.apache.geode.GemFireConfigException;
 import org.apache.geode.admin.DistributionLocator;
 import org.apache.geode.admin.DistributionLocatorConfig;
-import org.apache.geode.distributed.internal.tcpserver.*;
+import org.apache.geode.distributed.internal.tcpserver.TcpClient;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
index 8b03ef3..e66a5c1 100755
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
@@ -17,7 +17,11 @@ package org.apache.geode.admin.internal;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
 
 import org.apache.logging.log4j.Logger;
 
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
index 4bf0305..98dc311 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.admin.internal;
 
-import org.apache.geode.admin.*;
+import org.apache.geode.admin.GemFireHealthConfig;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
 // @todo davidw Delegate to a "parent" config for properties that are not 
overridden.
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
index d33c99d..dc8a793 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
@@ -15,7 +15,9 @@
 package org.apache.geode.admin.internal;
 
 import java.io.File;
-import java.net.*;
+import java.net.InetAddress;
+import java.net.URL;
+import java.net.UnknownHostException;
 
 import org.apache.geode.admin.ManagedEntityConfig;
 import org.apache.geode.internal.GemFireVersion;
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
index e210057..54f703e 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
@@ -14,17 +14,40 @@
  */
 package org.apache.geode.admin.internal;
 
-import java.io.*;
-import java.util.*;
-
-import javax.xml.transform.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.AttributesImpl;
 
-import org.apache.geode.admin.*;
+import org.apache.geode.admin.AdminDistributedSystem;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.CacheServer;
+import org.apache.geode.admin.CacheServerConfig;
+import org.apache.geode.admin.DistributedSystemConfig;
+import org.apache.geode.admin.DistributionLocator;
+import org.apache.geode.admin.DistributionLocatorConfig;
+import org.apache.geode.admin.ManagedEntityConfig;
 import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthConfigImpl.java
index f250fee..925feaf 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthConfigImpl.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.admin.internal;
 
-import org.apache.geode.admin.*;
+import org.apache.geode.admin.MemberHealthConfig;
 
 // @todo Make this class (and all of its subclasses) {@link 
java.io.Externalizable} or
 // {@link org.apache.geode.DataSerializable}.
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
index 4e530ef..99af89f 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
@@ -21,7 +21,9 @@ import org.apache.geode.admin.AdminException;
 import org.apache.geode.admin.SystemMemberBridgeServer;
 import org.apache.geode.admin.SystemMemberCacheServer;
 import org.apache.geode.cache.server.ServerLoadProbe;
-import org.apache.geode.internal.admin.*;
+import org.apache.geode.internal.admin.AdminBridgeServer;
+import org.apache.geode.internal.admin.CacheInfo;
+import org.apache.geode.internal.admin.GemFireVM;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
index 2735578..8c135d4 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.admin.internal;
 
-import org.apache.geode.admin.*;
+import org.apache.geode.admin.SystemMemberCacheEvent;
+import org.apache.geode.admin.SystemMemberCacheListener;
 import org.apache.geode.cache.Operation;
 import org.apache.geode.distributed.DistributedMember;
 
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
index e714745..6f44880 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.admin.internal;
 
-import org.apache.geode.admin.*;
+import org.apache.geode.admin.SystemMemberCacheListener;
+import org.apache.geode.admin.SystemMemberRegionEvent;
 import org.apache.geode.cache.Operation;
 import org.apache.geode.distributed.DistributedMember;
 
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
index 3aeb8ea..d2172b6 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
@@ -15,11 +15,26 @@
 package org.apache.geode.admin.internal;
 
 import java.io.File;
-import java.util.*;
-
-import org.apache.geode.admin.*;
-import org.apache.geode.cache.*;
-import org.apache.geode.internal.admin.remote.*;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.SystemMemberRegion;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.CacheStatistics;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.DiskWriteAttributes;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.ExpirationAction;
+import org.apache.geode.cache.MembershipAttributes;
+import org.apache.geode.cache.MirrorType;
+import org.apache.geode.cache.PartitionAttributes;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.Scope;
+import org.apache.geode.cache.SubscriptionAttributes;
+import org.apache.geode.internal.admin.remote.AdminRegion;
 
 /**
  * View of a region in a GemFire system member's cache.
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
index 828d731..ce22b30 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
@@ -14,11 +14,12 @@
  */
 package org.apache.geode.admin.jmx.internal;
 
-import javax.management.*;
-import javax.management.modelmbean.*;
+import javax.management.ObjectName;
+import javax.management.modelmbean.ModelMBean;
 
-import org.apache.geode.admin.*;
-import org.apache.geode.admin.internal.*;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.GemFireHealth;
+import org.apache.geode.admin.internal.DistributedSystemHealthConfigImpl;
 
 /**
  * The JMX "managed resource" that represents the configuration for the health 
of a distributed
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/DistributedLockService.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/DistributedLockService.java
index 3ecf8c7..1e7af92 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/DistributedLockService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/DistributedLockService.java
@@ -15,8 +15,8 @@
 
 package org.apache.geode.distributed;
 
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.distributed.internal.locks.*;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.locks.DLockService;
 
 /**
  * <p>
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
index 1b6c276..cca6c65 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
@@ -14,7 +14,166 @@
  */
 package org.apache.geode.distributed.internal;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ACK_SEVERE_ALERT_THRESHOLD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ACK_WAIT_THRESHOLD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ARCHIVE_DISK_SPACE_LIMIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ARCHIVE_FILE_SIZE_LIMIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ASYNC_DISTRIBUTION_TIMEOUT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ASYNC_MAX_QUEUE_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ASYNC_QUEUE_TIMEOUT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_CONFIGURATION_DIR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CONFLATE_EVENTS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCKETS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DELTA_PROPAGATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DEPLOY_WORKING_DIR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
+import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_TCP;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS;
+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.ENABLE_NETWORK_PARTITION_DETECTION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ENABLE_TIME_STATISTICS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ENFORCE_UNIQUE_HOST;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_ACCESS_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_HOSTNAME_FOR_CLIENTS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_HTTP_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PASSWORD_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_UPDATE_RATE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOAD_CLUSTER_CONFIGURATION_FROM_DIR;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOCATOR_WAIT_TIME;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCK_MEMORY;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOG_DISK_SPACE_LIMIT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOG_FILE_SIZE_LIMIT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MAX_NUM_RECONNECT_TRIES;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MAX_WAIT_TIME_RECONNECT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MCAST_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MCAST_FLOW_CONTROL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MCAST_RECV_BUFFER_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MCAST_SEND_BUFFER_SIZE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_TTL;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMBERSHIP_PORT_RANGE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_PROTOCOL;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static 
org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REDIS_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REDIS_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.REDIS_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATORS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REMOVE_UNRESPONSIVE_CLIENT;
+import static org.apache.geode.distributed.ConfigurationProperties.ROLES;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_ACCESSOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_ACCESSOR_PP;
+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_CLIENT_DHALGO;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_LOG_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_LOG_LEVEL;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+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.distributed.ConfigurationProperties.SECURITY_PEER_VERIFY_MEMBER_TIMEOUT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST_PROCESSOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_PREFIX;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_UDP_DHALGO;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERIALIZABLE_OBJECT_FILTER;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SOCKET_BUFFER_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SOCKET_LEASE_TIME;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_CLUSTER_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_DEFAULT_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_GATEWAY_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_JMX_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_LOCATOR_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_SERVER_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_WEB_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
+import static 
org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLE_RATE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.TCP_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.UDP_FRAGMENT_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.UDP_RECV_BUFFER_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.UDP_SEND_BUFFER_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.USER_COMMAND_PACKAGES;
+import static 
org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.VALIDATE_SERIALIZABLE_OBJECTS;
 
 import java.lang.reflect.Method;
 import java.net.InetAddress;
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
index 3840128..5d057f9 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
@@ -15,7 +15,166 @@
 
 package org.apache.geode.distributed.internal;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ACK_SEVERE_ALERT_THRESHOLD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ACK_WAIT_THRESHOLD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ARCHIVE_DISK_SPACE_LIMIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ARCHIVE_FILE_SIZE_LIMIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ASYNC_DISTRIBUTION_TIMEOUT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ASYNC_MAX_QUEUE_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ASYNC_QUEUE_TIMEOUT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_CONFIGURATION_DIR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CONFLATE_EVENTS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCKETS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DELTA_PROPAGATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DEPLOY_WORKING_DIR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
+import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_TCP;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS;
+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.ENABLE_NETWORK_PARTITION_DETECTION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ENABLE_TIME_STATISTICS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ENFORCE_UNIQUE_HOST;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_ACCESS_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_HOSTNAME_FOR_CLIENTS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_HTTP_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PASSWORD_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_UPDATE_RATE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOAD_CLUSTER_CONFIGURATION_FROM_DIR;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOCATOR_WAIT_TIME;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCK_MEMORY;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOG_DISK_SPACE_LIMIT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOG_FILE_SIZE_LIMIT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MAX_NUM_RECONNECT_TRIES;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MAX_WAIT_TIME_RECONNECT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MCAST_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MCAST_FLOW_CONTROL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MCAST_RECV_BUFFER_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MCAST_SEND_BUFFER_SIZE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_TTL;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMBERSHIP_PORT_RANGE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_PROTOCOL;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static 
org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REDIS_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REDIS_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.REDIS_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATORS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REMOVE_UNRESPONSIVE_CLIENT;
+import static org.apache.geode.distributed.ConfigurationProperties.ROLES;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_ACCESSOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_ACCESSOR_PP;
+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_CLIENT_DHALGO;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_LOG_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_LOG_LEVEL;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+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.distributed.ConfigurationProperties.SECURITY_PEER_VERIFY_MEMBER_TIMEOUT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST_PROCESSOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_PREFIX;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_UDP_DHALGO;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERIALIZABLE_OBJECT_FILTER;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_BIND_ADDRESS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SOCKET_BUFFER_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SOCKET_LEASE_TIME;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_CIPHERS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_CLUSTER_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_DEFAULT_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_GATEWAY_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_JMX_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_LOCATOR_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_SERVER_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_WEB_ALIAS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
+import static 
org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLE_RATE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.TCP_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.UDP_FRAGMENT_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.UDP_RECV_BUFFER_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.UDP_SEND_BUFFER_SIZE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.USER_COMMAND_PACKAGES;
+import static 
org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
+import static 
org.apache.geode.distributed.ConfigurationProperties.VALIDATE_SERIALIZABLE_OBJECTS;
 
 import java.io.File;
 import java.lang.reflect.Field;
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
index 3c792ff..9eeb9b4 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
@@ -16,7 +16,13 @@
 package org.apache.geode.distributed.internal;
 
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.geode.SystemFailure;
 import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
index 4ee4f54..307b207 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
@@ -19,7 +19,11 @@ import static 
org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-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/distributed/internal/LonerDistributionManager.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
index 6d1bbe4..f74c34d 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
@@ -17,8 +17,26 @@ package org.apache.geode.distributed.internal;
 import java.io.Serializable;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.apache.geode.CancelCriterion;
 import org.apache.geode.InternalGemFireError;
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
index f26095b..245c7bf 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
@@ -16,7 +16,13 @@
 package org.apache.geode.distributed.internal;
 
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.geode.SystemFailure;
 import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java
index 9d74733..54756a1 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java
@@ -17,7 +17,8 @@ package org.apache.geode.distributed.internal;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.ObjIdConcurrentMap;
 
 /**
  * A message processor class typically creates an instance of ProcessorKeeper 
and holds it in a
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
index b966a26..9b2b594 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
@@ -15,9 +15,12 @@
 
 package org.apache.geode.distributed.internal;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
-import org.apache.geode.distributed.internal.membership.*;
+import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
index 349cfd7..bb22e3f 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
@@ -15,7 +15,16 @@
 
 package org.apache.geode.distributed.internal;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ARCHIVE_DISK_SPACE_LIMIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.ARCHIVE_FILE_SIZE_LIMIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_HTTP_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOG_DISK_SPACE_LIMIT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.LOG_FILE_SIZE_LIMIT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLE_RATE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
 
 import java.io.File;
 import java.util.Arrays;
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
index 4c6b546..764a95c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
@@ -14,11 +14,13 @@
  */
 package org.apache.geode.distributed.internal;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 
-import org.apache.geode.*;
-import org.apache.geode.distributed.internal.membership.*;
-import org.apache.geode.internal.*;
+import org.apache.geode.DataSerializer;
+import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
index e164bb7..2d326e8 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
@@ -28,9 +28,12 @@ import org.apache.logging.log4j.Logger;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.Instantiator;
 import org.apache.geode.SystemConnectException;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.InternalDataSerializer;
 import 
org.apache.geode.internal.InternalDataSerializer.SerializerAttributesHolder;
+import org.apache.geode.internal.InternalInstantiator;
 import 
org.apache.geode.internal.InternalInstantiator.InstantiatorAttributesHolder;
+import org.apache.geode.internal.Version;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.net.SocketCreator;
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
index 9121bf6..8eace86 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
@@ -15,7 +15,8 @@
 
 package org.apache.geode.distributed.internal;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
 
 
 /**
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
index 8dea067..e84e1a8 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
@@ -15,8 +15,14 @@
 
 package org.apache.geode.distributed.internal.locks;
 
-import org.apache.geode.*;
-import org.apache.geode.distributed.internal.*;
+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.distributed.internal.PoolStatHelper;
+import org.apache.geode.distributed.internal.QueueStatHelper;
 import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
 
 /**
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
index 55b69ad..81fc395 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
@@ -15,7 +15,8 @@
 
 package org.apache.geode.distributed.internal.locks;
 
-import org.apache.geode.distributed.internal.*;
+import org.apache.geode.distributed.internal.PoolStatHelper;
+import org.apache.geode.distributed.internal.QueueStatHelper;
 
 /**
  * Empty implementation of <code>DistributedLockStats</code> used when there 
is currently no
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
index 6fd969f..6fd51be 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
@@ -15,7 +15,7 @@
 
 package org.apache.geode.distributed.internal.locks;
 
-import org.apache.geode.distributed.internal.membership.*;
+import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 
 /**
  * Used to provide information on a grantor request made to the elder.
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 7941af1..8470f72 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -14,10 +14,20 @@
  */
 package org.apache.geode.distributed.internal.membership;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.EOFException;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.GemFireConfigException;
@@ -30,7 +40,11 @@ import 
org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionAdvisor.ProfileId;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.OSProcess;
+import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.versions.VersionSource;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.net.SocketCreator;
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java
index 00e8de1..22ba24c 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.distributed.internal.membership;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
index a6ffa29..d1a5438 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
@@ -14,7 +14,11 @@
  */
 package org.apache.geode.distributed.internal.membership.gms.messenger;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
diff --git 
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionInformation.java
 
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionInformation.java
index 57e4912..f4420ee 100644
--- 
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionInformation.java
+++ 
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/RegionInformation.java
@@ -15,7 +15,8 @@
 package org.apache.geode.management.internal.cli.domain;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Region;
diff --git 
a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
 
b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
index 082bc6a..2bf03a9 100644
--- 
a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
+++ 
b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
@@ -21,7 +21,16 @@ import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.regex.Pattern;
@@ -35,7 +44,12 @@ import org.apache.geode.internal.CopyOnWriteHashSet;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.util.concurrent.CopyOnWriteWeakHashMap;
-import org.apache.geode.pdx.*;
+import org.apache.geode.pdx.FieldType;
+import org.apache.geode.pdx.NonPortableClassException;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializationException;
+import org.apache.geode.pdx.PdxWriter;
+import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
 import org.apache.geode.pdx.internal.unsafe.UnsafeWrapper;
 
 /**
diff --git 
a/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java 
b/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
index 2479d29..93fa670 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.pdx.internal;
 
-import static java.lang.Integer.*;
+import static java.lang.Integer.valueOf;
 
 import java.util.Map;
 import java.util.Set;
diff --git 
a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java 
b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
index 1b12e16..309f3c1 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.redis;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
 
 import java.io.IOException;
 import java.net.InetAddress;

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

Reply via email to