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/12 22:47:16 UTC
[geode] branch develop updated: GEODE-4952: Remove unused imports
from geode-core, excluding geode-core:internal. (#1726)
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 5307968 GEODE-4952: Remove unused imports from geode-core, excluding geode-core:internal. (#1726)
5307968 is described below
commit 5307968acf4e6ea49485dcab5dc3073322b37852
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Thu Apr 12 15:47:13 2018 -0700
GEODE-4952: Remove unused imports from geode-core, excluding geode-core:internal. (#1726)
---
.../src/main/java/org/apache/geode/SerializationException.java | 1 -
.../geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java | 1 -
.../apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java | 1 -
.../apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java | 1 -
.../src/main/java/org/apache/geode/cache/CacheClosedException.java | 2 --
.../src/main/java/org/apache/geode/cache/LowMemoryException.java | 1 -
.../apache/geode/cache/client/internal/ClientSideHandshakeImpl.java | 3 ---
.../java/org/apache/geode/cache/client/internal/ProxyCache.java | 2 --
.../java/org/apache/geode/cache/client/internal/ProxyRegion.java | 1 -
.../java/org/apache/geode/cache/client/internal/ServerProxy.java | 1 -
.../geode/cache/client/internal/locator/GetAllServersResponse.java | 3 ---
.../geode/cache/client/internal/locator/LocatorListResponse.java | 1 -
.../apache/geode/cache/execute/EmptyRegionFunctionException.java | 1 -
.../src/main/java/org/apache/geode/cache/execute/Function.java | 1 -
.../geode/cache/persistence/ConflictingPersistentDataException.java | 1 -
.../org/apache/geode/cache/query/MultiIndexCreationException.java | 1 -
.../src/main/java/org/apache/geode/cache/query/internal/Bag.java | 4 ----
.../org/apache/geode/cache/query/internal/CompiledArithmetic.java | 1 -
.../java/org/apache/geode/cache/query/internal/CompiledSelect.java | 1 -
.../apache/geode/cache/query/internal/CompiledSortCriterion.java | 1 -
.../geode/cache/query/internal/CumulativeNonDistinctResults.java | 2 --
.../java/org/apache/geode/cache/query/internal/LinkedResultSet.java | 2 --
.../org/apache/geode/cache/query/internal/ProxyQueryService.java | 1 -
.../geode/cache/query/internal/QueryExecutionCanceledException.java | 1 -
.../org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java | 1 -
.../apache/geode/cache/query/internal/index/IndexCreationData.java | 1 -
.../apache/geode/cache/query/internal/index/MemoryIndexStore.java | 1 -
.../apache/geode/cache/query/internal/index/PartitionedIndex.java | 1 -
.../apache/geode/cache/query/internal/parse/ASTArithmeticOp.java | 1 -
.../java/org/apache/geode/cache/query/internal/parse/ASTSelect.java | 1 -
.../apache/geode/cache/query/internal/types/CollectionTypeImpl.java | 1 -
.../org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java | 1 -
.../apache/geode/distributed/internal/DistributionConfigImpl.java | 1 -
.../geode/distributed/internal/InternalDistributedSystem.java | 1 -
.../org/apache/geode/distributed/internal/StartupMessageData.java | 3 ---
.../distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java | 1 -
.../apache/geode/distributed/internal/deadlock/DependencyGraph.java | 1 -
.../apache/geode/distributed/internal/membership/gms/GMSUtil.java | 2 --
.../geode/distributed/internal/membership/gms/ServiceConfig.java | 1 -
.../distributed/internal/membership/gms/messenger/GMSEncrypt.java | 1 -
.../geode/distributed/internal/streaming/StreamingOperation.java | 3 ---
.../src/main/java/org/apache/geode/management/JVMMetrics.java | 1 -
.../src/main/java/org/apache/geode/management/NetworkMetrics.java | 1 -
.../apache/geode/management/internal/MBeanProxyInfoRepository.java | 1 -
.../apache/geode/management/internal/NotificationCacheListener.java | 1 -
.../geode/management/internal/beans/AsyncEventQueueMBean.java | 1 -
.../org/apache/geode/management/internal/beans/FileUploader.java | 6 ------
.../apache/geode/management/internal/beans/LocatorMBeanBridge.java | 1 -
.../apache/geode/management/internal/beans/MetricsCalculator.java | 1 -
.../apache/geode/management/internal/beans/RegionMBeanBridge.java | 1 -
.../geode/management/internal/beans/stats/GCStatsMonitor.java | 1 -
.../management/internal/beans/stats/MemberLevelDiskMonitor.java | 1 -
.../org/apache/geode/management/internal/beans/stats/StatsRate.java | 1 -
.../cli/commands/ExportImportClusterConfigurationCommands.java | 1 -
.../management/internal/cli/commands/ShowMetricsInterceptor.java | 2 --
.../management/internal/cli/converters/DiskStoreNameConverter.java | 5 -----
.../internal/cli/converters/GatewaySenderIdConverter.java | 5 -----
.../management/internal/cli/converters/LocatorIdNameConverter.java | 5 -----
.../geode/management/internal/cli/domain/DataCommandRequest.java | 4 ----
.../management/internal/cli/domain/EvictionAttributesInfo.java | 1 -
.../internal/cli/domain/FixedPartitionAttributesInfo.java | 1 -
.../management/internal/cli/domain/PartitionAttributesInfo.java | 1 -
.../geode/management/internal/cli/result/TableBuilderHelper.java | 1 -
.../geode/management/internal/cli/shell/jline/ANSIHandler.java | 1 -
.../management/internal/cli/shell/jline/CygwinMinttyTerminal.java | 2 --
.../geode/management/internal/cli/util/DiskStoreCompacter.java | 1 -
.../geode/management/internal/cli/util/DiskStoreUpgrader.java | 1 -
.../geode/management/internal/cli/util/EvictionAttributesInfo.java | 2 --
.../apache/geode/management/internal/cli/util/HyphenFormatter.java | 1 -
.../org/apache/geode/management/internal/cli/util/LogFilter.java | 2 --
.../management/internal/configuration/domain/CacheElement.java | 1 -
.../management/internal/configuration/domain/Configuration.java | 3 ---
.../geode/management/internal/configuration/domain/XmlEntity.java | 1 -
.../configuration/messages/SharedConfigurationStatusResponse.java | 3 ---
.../geode/management/internal/configuration/utils/ZipUtils.java | 3 ---
.../java/org/apache/geode/pdx/internal/ClientTypeRegistration.java | 1 -
.../main/java/org/apache/geode/pdx/internal/DefaultPdxField.java | 1 -
.../main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java | 2 --
.../java/org/apache/geode/pdx/internal/PdxInstanceFactoryImpl.java | 1 -
geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java | 3 ---
.../java/org/apache/geode/pdx/internal/PeerTypeRegistration.java | 3 ---
.../java/org/apache/geode/pdx/internal/TrackingPdxReaderImpl.java | 1 -
.../apache/geode/pdx/internal/WeakConcurrentIdentityHashMap.java | 1 -
83 files changed, 134 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/SerializationException.java b/geode-core/src/main/java/org/apache/geode/SerializationException.java
index 3c78d3f..3c33272 100644
--- a/geode-core/src/main/java/org/apache/geode/SerializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/SerializationException.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode;
-import org.apache.geode.GemFireIOException;
/**
* An exception indicating that a serialization or deserialization failed.
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
index 0dd4558..97da076 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.Level;
import org.apache.geode.SystemFailure;
import org.apache.geode.admin.UnmodifiableConfigurationException;
-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/jmx/internal/StatisticResourceJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
index 61ee780..c1481f3 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
@@ -23,7 +23,6 @@ import org.apache.commons.modeler.ManagedBean;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
-import org.apache.geode.LogWriter;
import org.apache.geode.SystemFailure;
import org.apache.geode.admin.AdminException;
import org.apache.geode.admin.Statistic;
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
index 8c8ed37..7a5e5b2 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
@@ -37,7 +37,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.admin.AdminBridgeServer;
import org.apache.geode.internal.admin.GemFireVM;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.InternalLogWriter;
/**
* MBean representation of {@link org.apache.geode.admin.SystemMemberCache}.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheClosedException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheClosedException.java
index 199e5b8..0fb5713 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheClosedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheClosedException.java
@@ -15,8 +15,6 @@
package org.apache.geode.cache;
import org.apache.geode.CancelException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.InternalCache;
/**
* Indicates that the caching system has been closed. Can be thrown from almost any method related
diff --git a/geode-core/src/main/java/org/apache/geode/cache/LowMemoryException.java b/geode-core/src/main/java/org/apache/geode/cache/LowMemoryException.java
index 50ce6a2..a9cbc72 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/LowMemoryException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/LowMemoryException.java
@@ -16,7 +16,6 @@
package org.apache.geode.cache;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
import org.apache.geode.cache.control.ResourceManager;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
index 0f4aa4e..f880102 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
@@ -34,8 +34,6 @@ import java.util.Properties;
import javax.net.ssl.SSLSocket;
-import org.apache.logging.log4j.Logger;
-
import org.apache.geode.CancelCriterion;
import org.apache.geode.DataSerializer;
import org.apache.geode.GemFireConfigException;
@@ -63,7 +61,6 @@ import org.apache.geode.internal.cache.tier.sockets.EncryptorImpl;
import org.apache.geode.internal.cache.tier.sockets.Handshake;
import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.AuthenticationRequiredException;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCache.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCache.java
index 3b4285c..2561fd1 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCache.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyCache.java
@@ -14,10 +14,8 @@
*/
package org.apache.geode.cache.client.internal;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.Set;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyRegion.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyRegion.java
index 5efac16..bad27dc 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ProxyRegion.java
@@ -25,7 +25,6 @@ import java.util.concurrent.locks.Lock;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.CacheStatistics;
import org.apache.geode.cache.CacheWriterException;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerProxy.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerProxy.java
index a6b7e83..675a55e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ServerProxy.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.client.internal;
-import java.util.List;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.distributed.internal.ServerLocation;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java
index 82425e7..7e8e115 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/GetAllServersResponse.java
@@ -18,10 +18,7 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.DataSerializableFixedID;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
index c0d4803..ed88f75 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorListResponse.java
@@ -17,7 +17,6 @@ package org.apache.geode.cache.client.internal.locator;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
import org.apache.geode.distributed.internal.ServerLocation;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java b/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java
index 7df9b12..eccdf01 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.execute;
-import org.apache.geode.distributed.DistributedMember;
/**
* Exception to indicate that Region is empty for data aware functions.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
index 1d89fa0..2c4bf34 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
@@ -16,7 +16,6 @@ package org.apache.geode.cache.execute;
import java.util.Collection;
import java.util.Collections;
-import java.util.Optional;
import org.apache.geode.cache.Region;
import org.apache.geode.lang.Identifiable;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/persistence/ConflictingPersistentDataException.java b/geode-core/src/main/java/org/apache/geode/cache/persistence/ConflictingPersistentDataException.java
index 8a0ece4..e5c0347 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/persistence/ConflictingPersistentDataException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/persistence/ConflictingPersistentDataException.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.persistence;
-import org.apache.geode.GemFireException;
import org.apache.geode.cache.DiskAccessException;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/MultiIndexCreationException.java b/geode-core/src/main/java/org/apache/geode/cache/query/MultiIndexCreationException.java
index 158db05..ff0756b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/MultiIndexCreationException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/MultiIndexCreationException.java
@@ -18,7 +18,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.geode.cache.query.internal.DefaultQueryService;
/**
* Consists a map of index names and Exceptions thrown during index creation using
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Bag.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Bag.java
index bfc2a0a..a62e39a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Bag.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Bag.java
@@ -27,16 +27,12 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
-import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.CqResults;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.internal.ObjectIntHashMap.Entry;
import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledArithmetic.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledArithmetic.java
index 5470648..e601a48 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledArithmetic.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledArithmetic.java
@@ -22,7 +22,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.AmbiguousNameException;
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
-import org.apache.geode.cache.query.QueryException;
import org.apache.geode.cache.query.QueryInvocationTargetException;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java
index 760d36f..7a0a9ae 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java
@@ -50,7 +50,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.internal.PdxString;
-import org.apache.geode.security.NotAuthorizedException;
public class CompiledSelect extends AbstractCompiledValue {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSortCriterion.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSortCriterion.java
index 4d2be62..cc6c143 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSortCriterion.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSortCriterion.java
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.ListIterator;
import org.apache.geode.cache.CacheException;
-import org.apache.geode.cache.query.AmbiguousNameException;
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
import org.apache.geode.cache.query.QueryInvocationTargetException;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
index d0d63d5..7d90c9c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
@@ -26,8 +26,6 @@ import java.util.List;
import java.util.Set;
import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.CacheException;
-import org.apache.geode.cache.query.QueryException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java
index 949e007..6cc2ce9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java
@@ -23,10 +23,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import java.util.SortedSet;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.SelectResults;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ProxyQueryService.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ProxyQueryService.java
index 51f9823..f8fd3da 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ProxyQueryService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ProxyQueryService.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.internal.ProxyCache;
import org.apache.geode.cache.client.internal.UserAttributes;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
index 030fa41..70dae41 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
@@ -16,7 +16,6 @@
package org.apache.geode.cache.query.internal;
import org.apache.geode.cache.CacheRuntimeException;
-import org.apache.geode.cache.control.ResourceManager;
/**
* Internal exception thrown when a query has been canceled and
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java
index 871a150..3995411 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache.query.internal.cq;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java
index d13ce49..711e1bd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexCreationData.java
@@ -22,7 +22,6 @@ package org.apache.geode.cache.query.internal.index;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.List;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.internal.DataSerializableFixedID;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java
index c682a9b..2fced96 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java
@@ -38,7 +38,6 @@ import org.apache.geode.cache.query.internal.index.AbstractIndex.InternalIndexSt
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.cache.query.internal.types.TypeUtils;
import org.apache.geode.internal.cache.CachedDeserializable;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
index c556dc7..5a20d49 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
@@ -18,7 +18,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTArithmeticOp.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTArithmeticOp.java
index 1fa36ce..7a51af4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTArithmeticOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTArithmeticOp.java
@@ -19,7 +19,6 @@ package org.apache.geode.cache.query.internal.parse;
import antlr.Token;
import org.apache.geode.cache.query.internal.QCompiler;
-import org.apache.geode.cache.query.internal.parse.GemFireAST;
public class ASTArithmeticOp extends GemFireAST {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
index f75b118..ccf9d9f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
@@ -22,7 +22,6 @@ import java.util.Map;
import antlr.*;
import antlr.collections.*;
-import org.apache.geode.cache.query.internal.CompiledValue;
import org.apache.geode.cache.query.internal.QCompiler;
public class ASTSelect extends GemFireAST {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
index 9fdbbcf..b7573c2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
@@ -22,7 +22,6 @@ import java.util.*;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.internal.NWayMergeResults;
import org.apache.geode.cache.query.internal.Ordered;
import org.apache.geode.cache.query.internal.ResultsSet;
import org.apache.geode.cache.query.internal.SortedResultSet;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
index 1a710ec..525a547 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.ClassPathLoader;
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/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
index 4fe0b5a..e40b167 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
@@ -73,7 +73,6 @@ import java.net.InetAddress;
import java.net.URL;
import java.net.UnknownHostException;
import java.util.Collections;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
index 4992038..b532cec 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -88,7 +88,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.FunctionServiceStats;
import org.apache.geode.internal.cache.execute.FunctionStats;
import org.apache.geode.internal.cache.tier.sockets.EncryptorImpl;
-import org.apache.geode.internal.cache.tier.sockets.Handshake;
import org.apache.geode.internal.cache.xmlcache.CacheServerCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java
index ab7cb19..5c11898 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java
@@ -17,15 +17,12 @@ package org.apache.geode.distributed.internal;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Properties;
import java.util.StringTokenizer;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.GemFireVersion;
/**
* Provides optional data fields as properties for StartupMessage and StartupResponseMessage. This
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 c6a3e53..9121bf6 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
@@ -17,7 +17,6 @@ package org.apache.geode.distributed.internal;
import java.util.*;
-import org.apache.geode.distributed.internal.DistributionStats;
/**
* An instance of ThrottlingMemLinkedQueue allows the instantiator to specify a maximum queue
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
index da029fc..68a1f4b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
@@ -26,7 +26,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.geode.distributed.internal.deadlock.MessageDependencyMonitor.MessageKey;
-import org.apache.geode.internal.util.PluckStacks;
/**
* This class holds a graph of dependencies between objects
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
index 92b708d..f1b7351 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java
@@ -21,8 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.logging.log4j.Logger;
-
import org.apache.geode.GemFireConfigException;
import org.apache.geode.distributed.internal.membership.gms.membership.HostAddress;
import org.apache.geode.internal.net.SocketCreator;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
index f4d244a..395e94d 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.distributed.internal.membership.gms;
-import java.net.InetAddress;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.DistributionConfig;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java
index 76fb1de..4b33454 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java
@@ -22,7 +22,6 @@ import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
index c14cb55..9d7f043 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
@@ -33,9 +33,7 @@ import org.apache.geode.GemFireRethrowable;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.PRQueryTraceInfo;
import org.apache.geode.cache.query.internal.QueryMonitor;
@@ -62,7 +60,6 @@ import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.BlobHelper;
-import org.apache.geode.pdx.internal.TypeRegistry;
/**
* StreamingOperation is an abstraction for sending messages to multiple (or single) recipient
diff --git a/geode-core/src/main/java/org/apache/geode/management/JVMMetrics.java b/geode-core/src/main/java/org/apache/geode/management/JVMMetrics.java
index a8d4c40..2e04094 100644
--- a/geode-core/src/main/java/org/apache/geode/management/JVMMetrics.java
+++ b/geode-core/src/main/java/org/apache/geode/management/JVMMetrics.java
@@ -17,7 +17,6 @@ package org.apache.geode.management;
import java.beans.ConstructorProperties;
import java.io.Serializable;
-import org.apache.geode.cache.Region;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/management/NetworkMetrics.java b/geode-core/src/main/java/org/apache/geode/management/NetworkMetrics.java
index e3da7a7..1a197d9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/NetworkMetrics.java
+++ b/geode-core/src/main/java/org/apache/geode/management/NetworkMetrics.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.management;
-import org.apache.geode.cache.DiskStore;
/**
* Composite data type used to distribute network related metrics for a member.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInfoRepository.java b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInfoRepository.java
index 9f981dd..64ac42a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInfoRepository.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanProxyInfoRepository.java
@@ -25,7 +25,6 @@ import javax.management.ObjectName;
import org.apache.logging.log4j.Logger;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.LogService;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationCacheListener.java b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationCacheListener.java
index e0f65f3..f1c3057 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/NotificationCacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/NotificationCacheListener.java
@@ -16,7 +16,6 @@ package org.apache.geode.management.internal;
import javax.management.Notification;
-import javax.management.ObjectName;
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.EntryEvent;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBean.java
index a5d804a..bf7afd0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/AsyncEventQueueMBean.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal.beans;
import javax.management.NotificationBroadcasterSupport;
import org.apache.geode.management.AsyncEventQueueMXBean;
-import org.apache.geode.management.internal.beans.stats.StatsKey;
/**
* Concrete implementation of AsyncEventQueueMXBean
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/FileUploader.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/FileUploader.java
index e8a9f3d..9a6cbfb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/FileUploader.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/FileUploader.java
@@ -20,15 +20,9 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.Serializable;
-import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import com.healthmarketscience.rmiio.RemoteOutputStream;
import com.healthmarketscience.rmiio.RemoteOutputStreamMonitor;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
index bb86ac0..007f319 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.logging.log4j.Logger;
import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MetricsCalculator.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MetricsCalculator.java
index 8d71b9f..de0b631 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MetricsCalculator.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MetricsCalculator.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal.beans;
import java.util.concurrent.TimeUnit;
-import org.apache.geode.management.internal.ManagementConstants;
/**
* This is a utility class to calculate various type of Metrics out of raw stats
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
index c1c7865..7d2fbac 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.cache.eviction.EvictionCounters;
import org.apache.geode.management.EvictionAttributesData;
import org.apache.geode.management.FixedPartitionAttributesData;
import org.apache.geode.management.MembershipAttributesData;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/GCStatsMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/GCStatsMonitor.java
index 4109fe7..019e47a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/GCStatsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/GCStatsMonitor.java
@@ -15,7 +15,6 @@
package org.apache.geode.management.internal.beans.stats;
import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.statistics.StatisticId;
import org.apache.geode.internal.statistics.StatisticNotFoundException;
import org.apache.geode.internal.statistics.StatisticsNotification;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/MemberLevelDiskMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/MemberLevelDiskMonitor.java
index 05f3d68..1bf9e54 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/MemberLevelDiskMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/MemberLevelDiskMonitor.java
@@ -19,7 +19,6 @@ import java.util.Map;
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.statistics.StatisticId;
import org.apache.geode.internal.statistics.StatisticNotFoundException;
import org.apache.geode.internal.statistics.StatisticsListener;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsRate.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsRate.java
index 20e1e3e..09675b7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsRate.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/StatsRate.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.management.internal.beans.stats;
-import org.apache.geode.management.internal.beans.MetricsCalculator;
/**
*
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
index c3a8eb5..1deb998 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
@@ -37,7 +37,6 @@ import org.xml.sax.SAXException;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
-import org.apache.geode.distributed.ClusterConfigurationService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalClusterConfigurationService;
import org.apache.geode.distributed.internal.InternalLocator;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsInterceptor.java
index 97a49a5..e189d1d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsInterceptor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsInterceptor.java
@@ -20,8 +20,6 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
-
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.GfshParseResult;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/DiskStoreNameConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/DiskStoreNameConverter.java
index 0d3f9e5..67e0384 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/DiskStoreNameConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/DiskStoreNameConverter.java
@@ -15,17 +15,12 @@
package org.apache.geode.management.internal.cli.converters;
import java.util.Arrays;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.springframework.shell.core.Completion;
-import org.springframework.shell.core.Converter;
-import org.springframework.shell.core.MethodTarget;
-
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.internal.cli.shell.Gfsh;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
index 1202d50..bba44c3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
@@ -16,14 +16,9 @@ package org.apache.geode.management.internal.cli.converters;
import java.util.Arrays;
import java.util.Collections;
-import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.springframework.shell.core.Completion;
-import org.springframework.shell.core.Converter;
-import org.springframework.shell.core.MethodTarget;
-
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.internal.ManagementConstants;
import org.apache.geode.management.internal.cli.shell.Gfsh;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorIdNameConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorIdNameConverter.java
index 79e9461..85f31bb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorIdNameConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/LocatorIdNameConverter.java
@@ -15,14 +15,9 @@
package org.apache.geode.management.internal.cli.converters;
import java.util.Arrays;
-import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.springframework.shell.core.Completion;
-import org.springframework.shell.core.Converter;
-import org.springframework.shell.core.MethodTarget;
-
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.internal.cli.shell.Gfsh;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandRequest.java
index 76bcaec..8d617e2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandRequest.java
@@ -14,12 +14,8 @@
*/
package org.apache.geode.management.internal.cli.domain;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
import java.io.Serializable;
-import org.apache.geode.DataSerializer;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo.java
index e852ef9..473981e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal.cli.domain;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAlgorithm;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java
index 292565e..2726bf4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo.java
@@ -16,7 +16,6 @@ package org.apache.geode.management.internal.cli.domain;
import java.io.Serializable;
-import io.netty.util.internal.StringUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.FixedPartitionAttributes;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java
index 72eaef3..df7fbbb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import org.apache.commons.lang.StringUtils;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilderHelper.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilderHelper.java
index fc80040..a3947c9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilderHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilderHelper.java
@@ -16,7 +16,6 @@ package org.apache.geode.management.internal.cli.result;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import org.apache.geode.management.internal.cli.shell.Gfsh;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIHandler.java
index 12b0cc3..ab610e8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIHandler.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.management.internal.cli.shell.jline;
-import org.springframework.shell.core.JLineLogHandler;
/**
* Overrides jline.History to add History without newline characters.
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/CygwinMinttyTerminal.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/CygwinMinttyTerminal.java
index e709a1e..c15da86 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/CygwinMinttyTerminal.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/CygwinMinttyTerminal.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.management.internal.cli.shell.jline;
-import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import jline.UnixTerminal;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreCompacter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreCompacter.java
index b48d599..72e5d13 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreCompacter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreCompacter.java
@@ -27,7 +27,6 @@ import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreUpgrader.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreUpgrader.java
index e628548..75cd42c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreUpgrader.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreUpgrader.java
@@ -27,7 +27,6 @@ import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/EvictionAttributesInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/EvictionAttributesInfo.java
index 38be36a..d153819 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/EvictionAttributesInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/EvictionAttributesInfo.java
@@ -15,8 +15,6 @@
package org.apache.geode.management.internal.cli.util;
import java.io.Serializable;
-import java.util.Map;
-import java.util.Set;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAlgorithm;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/HyphenFormatter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/HyphenFormatter.java
index 7f7bf5c..7bb798b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/HyphenFormatter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/HyphenFormatter.java
@@ -15,7 +15,6 @@
package org.apache.geode.management.internal.cli.util;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogFilter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogFilter.java
index 40db2df..ac2281e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/LogFilter.java
@@ -16,9 +16,7 @@
package org.apache.geode.management.internal.cli.util;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
index 912d2d2..d3dddb1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
@@ -21,7 +21,6 @@ import static org.apache.geode.management.internal.configuration.utils.XmlUtils.
import java.io.IOException;
import java.net.URL;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import javax.xml.XMLConstants;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
index b9059b7..2454842 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
@@ -19,8 +19,6 @@ import java.io.DataOutput;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
@@ -35,7 +33,6 @@ import org.xml.sax.SAXException;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
import org.apache.geode.management.internal.configuration.utils.XmlUtils;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index aaa43de..73a6869 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -18,7 +18,6 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.Serializable;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.HashMap;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusResponse.java
index fdde06a..aa2ced5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusResponse.java
@@ -19,9 +19,6 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/ZipUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/ZipUtils.java
index d5cc146..4b22b5b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/ZipUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/ZipUtils.java
@@ -16,17 +16,14 @@ package org.apache.geode.management.internal.configuration.utils;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Enumeration;
-import java.util.Stack;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
index 4b3efff..408cb46 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.logging.log4j.Logger;
import org.apache.geode.InternalGemFireError;
-import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.client.internal.AddPDXEnumOp;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/DefaultPdxField.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/DefaultPdxField.java
index 58bc444..6d2af6e 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/DefaultPdxField.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/DefaultPdxField.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.pdx.internal;
-import java.nio.ByteBuffer;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java
index fc2afe3..29bab10 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceEnum.java
@@ -16,7 +16,6 @@ package org.apache.geode.pdx.internal;
import java.io.DataOutput;
import java.io.IOException;
-import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -31,7 +30,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxSerializationException;
import org.apache.geode.pdx.WritablePdxInstance;
-import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
/**
* Used to represent an enum value as a PdxInstance
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceFactoryImpl.java
index b9d875b..a353761 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceFactoryImpl.java
@@ -17,7 +17,6 @@ package org.apache.geode.pdx.internal;
import java.util.Date;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxInstanceFactory;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
index 0e6b09a..8ec7323 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
@@ -18,7 +18,6 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.PrintStream;
-import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -26,13 +25,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.SortedSet;
-import java.util.TreeMap;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.sockets.OldClientSupportService;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
index 8aa76b1..72dbb4c 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
@@ -15,7 +15,6 @@
package org.apache.geode.pdx.internal;
import java.io.IOException;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -30,7 +29,6 @@ import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
@@ -50,7 +48,6 @@ import org.apache.geode.distributed.LockServiceDestroyedException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.internal.CopyOnWriteHashSet;
-import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/TrackingPdxReaderImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/TrackingPdxReaderImpl.java
index 310f158..6a41c5e 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/TrackingPdxReaderImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/TrackingPdxReaderImpl.java
@@ -18,7 +18,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxUnreadFields;
import org.apache.geode.pdx.internal.AutoSerializableManager.AutoClassInfo;
import org.apache.geode.pdx.internal.AutoSerializableManager.PdxFieldWrapper;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/WeakConcurrentIdentityHashMap.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/WeakConcurrentIdentityHashMap.java
index 316114b..0da2a5e 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/WeakConcurrentIdentityHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/WeakConcurrentIdentityHashMap.java
@@ -17,7 +17,6 @@ package org.apache.geode.pdx.internal;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
-import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
--
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.