You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/04/27 19:01:40 UTC
[geode] branch develop updated: GEODE-2953: Expand wildcard imports
in geode-core:internal. (#1874)
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 0ee42d1 GEODE-2953: Expand wildcard imports in geode-core:internal. (#1874)
0ee42d1 is described below
commit 0ee42d11788fc923a8fd5fe2b006f048126e70d6
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Fri Apr 27 12:01:37 2018 -0700
GEODE-2953: Expand wildcard imports in geode-core:internal. (#1874)
---
.../geode/internal/ByteBufferOutputStream.java | 6 ++--
.../apache/geode/internal/ExternalizableDSFID.java | 7 ++++-
.../geode/internal/NullDataOutputStream.java | 4 ++-
.../java/org/apache/geode/internal/OSProcess.java | 23 +++++++++++++--
.../java/org/apache/geode/internal/ObjIdMap.java | 2 +-
.../apache/geode/internal/ProcessOutputReader.java | 10 +++++--
.../java/org/apache/geode/internal/SmHelper.java | 6 ++--
.../datasource/GemFireConnectionPoolManager.java | 3 +-
.../geode/internal/jta/GlobalTransaction.java | 19 +++++++++++--
.../apache/geode/internal/jta/TransactionImpl.java | 15 ++++++++--
.../geode/internal/jta/UserTransactionImpl.java | 9 +++++-
.../org/apache/geode/internal/jta/XidImpl.java | 4 ++-
.../geode/internal/logging/LocalLogWriter.java | 3 +-
.../internal/logging/log4j/LogWriterAppenders.java | 12 ++++++--
.../geode/internal/offheap/OffHeapStorage.java | 6 +++-
.../internal/offheap/annotations/Released.java | 2 +-
.../internal/offheap/annotations/Retained.java | 2 +-
.../internal/offheap/annotations/Unretained.java | 2 +-
.../geode/internal/security/AuthorizeRequest.java | 21 +++++++++++++-
.../internal/security/AuthorizeRequestPP.java | 7 ++++-
.../geode/internal/sequencelog/EntryLogger.java | 6 +++-
.../statistics/DummyStatisticsFactory.java | 8 ++++--
.../internal/statistics/DummyStatisticsImpl.java | 4 ++-
.../geode/internal/statistics/HostStatHelper.java | 3 +-
.../internal/statistics/LocalStatisticsImpl.java | 3 +-
.../internal/statistics/StatSamplerStats.java | 6 +++-
.../statistics/StatisticDescriptorImpl.java | 4 ++-
.../statistics/StatisticsTypeFactoryImpl.java | 9 ++++--
.../internal/statistics/StatisticsTypeImpl.java | 10 +++++--
.../internal/statistics/StatisticsTypeXml.java | 33 ++++++++++++++++------
.../apache/geode/internal/statistics/VMStats.java | 6 +++-
.../statistics/VMStatsContractFactory.java | 3 +-
.../statistics/platform/LinuxProcFsStatistics.java | 6 +++-
.../statistics/platform/LinuxProcessStats.java | 5 +++-
.../statistics/platform/LinuxSystemStats.java | 4 ++-
.../statistics/platform/OSXProcessStats.java | 5 +++-
.../statistics/platform/OSXSystemStats.java | 4 ++-
.../statistics/platform/SolarisProcessStats.java | 5 +++-
.../statistics/platform/SolarisSystemStats.java | 4 ++-
.../statistics/platform/WindowsProcessStats.java | 5 +++-
.../statistics/platform/WindowsSystemStats.java | 4 ++-
.../internal/stats50/Atomic50StatisticsImpl.java | 7 +++--
.../geode/internal/tcp/ConnectExceptions.java | 4 ++-
.../apache/geode/internal/tcp/MsgOutputStream.java | 9 ++++--
.../org/apache/geode/internal/tcp/MsgStreamer.java | 7 ++++-
45 files changed, 255 insertions(+), 72 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
index 1d6d286..dcfe410 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal;
-import java.io.*;
-import java.nio.*;
+import java.io.OutputStream;
+import java.nio.BufferOverflowException;
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
/**
* An OutputStream that wraps to a ByteBuffer
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
index 4e77f38..5624ef5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
@@ -14,7 +14,12 @@
*/
package org.apache.geode.internal;
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
/**
* Abstract class for subclasses that want to be Externalizable in addition to being
diff --git a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
index dce63e6..e37b2b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal;
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UTFDataFormatException;
import org.apache.geode.DataSerializer;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java b/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
index a715d6f..70a0afe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
@@ -14,9 +14,26 @@
*/
package org.apache.geode.internal;
-import java.io.*;
-import java.lang.management.*;
-import java.util.*;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.lang.management.LockInfo;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MonitorInfo;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
import java.util.zip.GZIPOutputStream;
import org.apache.logging.log4j.Logger;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ObjIdMap.java b/geode-core/src/main/java/org/apache/geode/internal/ObjIdMap.java
index 94b1b4c..c4ae46c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ObjIdMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ObjIdMap.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal;
-import java.lang.ref.*;
+import java.lang.ref.WeakReference;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ProcessOutputReader.java b/geode-core/src/main/java/org/apache/geode/internal/ProcessOutputReader.java
index 78a3063..1413dfe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ProcessOutputReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ProcessOutputReader.java
@@ -15,8 +15,14 @@
package org.apache.geode.internal;
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SmHelper.java b/geode-core/src/main/java/org/apache/geode/internal/SmHelper.java
index 1bfc7e2..bc3685b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SmHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SmHelper.java
@@ -16,8 +16,10 @@
package org.apache.geode.internal;
import java.io.InvalidClassException;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnectionPoolManager.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnectionPoolManager.java
index 46839fb..e75eeb8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnectionPoolManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/GemFireConnectionPoolManager.java
@@ -16,7 +16,8 @@ package org.apache.geode.internal.datasource;
import java.io.Serializable;
-import javax.sql.*;
+import javax.sql.ConnectionPoolDataSource;
+import javax.sql.XADataSource;
/**
* GemFireConnectionPoolManager implements ConnectionProvider interface for managing the the
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java b/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
index c0a8e42..ee55367 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
@@ -25,10 +25,23 @@ package org.apache.geode.internal.jta;
* @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
* transactions.
*/
-import java.util.*;
-import javax.transaction.*;
-import javax.transaction.xa.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
import org.apache.geode.SystemFailure;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java
index a76629c..856f2fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java
@@ -20,10 +20,19 @@ package org.apache.geode.internal.jta;
* @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
* transactions.
*/
-import java.util.*;
-import javax.transaction.*;
-import javax.transaction.xa.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.xa.XAResource;
import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java
index 1f731a5..0182af5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java
@@ -27,9 +27,16 @@ package org.apache.geode.internal.jta;
* @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
* transactions.
*/
+
import java.io.Serializable;
-import javax.transaction.*;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.i18n.LogWriterI18n;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java
index 6202a40..3415e1b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java
@@ -24,7 +24,9 @@ package org.apache.geode.internal.jta;
* @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
* transactions.
*/
-import javax.transaction.xa.*;
+
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.Xid;
@Deprecated
public class XidImpl implements Xid {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LocalLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LocalLogWriter.java
index ee0d5dc..e514e4f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/LocalLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/LocalLogWriter.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.logging;
-import java.io.*;
+import java.io.PrintStream;
+import java.io.PrintWriter;
/**
* Implementation of {@link org.apache.geode.i18n.LogWriterI18n} that will write to a local stream.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
index d0bf115..e2076b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.logging.log4j;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@@ -23,7 +27,11 @@ import org.apache.geode.GemFireIOException;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.*;
+import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.logging.LogConfig;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.ManagerLogWriter;
+import org.apache.geode.internal.logging.SecurityManagerLogWriter;
import org.apache.geode.internal.process.ProcessLauncherContext;
import org.apache.geode.internal.util.LogFileUtils;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStorage.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStorage.java
index e9044ba..135f2b8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStorage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStorage.java
@@ -16,7 +16,11 @@ package org.apache.geode.internal.offheap;
import java.lang.reflect.Method;
-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.cache.CacheException;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionConfig;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Released.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Released.java
index 6f83990..689508a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Released.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Released.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.offheap.annotations;
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.*;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.DEFAULT;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Retained.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Retained.java
index a195b8b..b16b107 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Retained.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Retained.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.offheap.annotations;
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.*;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.DEFAULT;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Unretained.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Unretained.java
index 22f2885..5c4155a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Unretained.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/annotations/Unretained.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.offheap.annotations;
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.*;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.DEFAULT;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java
index 81d4d17..2034706 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequest.java
@@ -27,7 +27,26 @@ import java.util.Set;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.cache.operations.*;
+import org.apache.geode.cache.operations.CloseCQOperationContext;
+import org.apache.geode.cache.operations.DestroyOperationContext;
+import org.apache.geode.cache.operations.ExecuteCQOperationContext;
+import org.apache.geode.cache.operations.ExecuteFunctionOperationContext;
+import org.apache.geode.cache.operations.GetDurableCQsOperationContext;
+import org.apache.geode.cache.operations.GetOperationContext;
+import org.apache.geode.cache.operations.InterestType;
+import org.apache.geode.cache.operations.InvalidateOperationContext;
+import org.apache.geode.cache.operations.KeySetOperationContext;
+import org.apache.geode.cache.operations.OperationContext;
+import org.apache.geode.cache.operations.PutAllOperationContext;
+import org.apache.geode.cache.operations.PutOperationContext;
+import org.apache.geode.cache.operations.QueryOperationContext;
+import org.apache.geode.cache.operations.RegionClearOperationContext;
+import org.apache.geode.cache.operations.RegionCreateOperationContext;
+import org.apache.geode.cache.operations.RegionDestroyOperationContext;
+import org.apache.geode.cache.operations.RegisterInterestOperationContext;
+import org.apache.geode.cache.operations.RemoveAllOperationContext;
+import org.apache.geode.cache.operations.StopCQOperationContext;
+import org.apache.geode.cache.operations.UnregisterInterestOperationContext;
import org.apache.geode.cache.operations.internal.GetOperationContextImpl;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.i18n.LogWriterI18n;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java
index 7dd84f9..343d903 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/AuthorizeRequestPP.java
@@ -22,7 +22,12 @@ import java.security.Principal;
import java.util.Set;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.operations.*;
+import org.apache.geode.cache.operations.ExecuteCQOperationContext;
+import org.apache.geode.cache.operations.ExecuteFunctionOperationContext;
+import org.apache.geode.cache.operations.GetOperationContext;
+import org.apache.geode.cache.operations.KeySetOperationContext;
+import org.apache.geode.cache.operations.OperationContext;
+import org.apache.geode.cache.operations.QueryOperationContext;
import org.apache.geode.cache.operations.internal.GetOperationContextImpl;
import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.ClassLoadUtil;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/EntryLogger.java b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/EntryLogger.java
index 73ecb5a..87cbcd5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/sequencelog/EntryLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/sequencelog/EntryLogger.java
@@ -16,7 +16,11 @@ package org.apache.geode.internal.sequencelog;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.CachedDeserializable;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.entries.DiskEntry.RecoveredEntry;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.offheap.StoredObject;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsFactory.java
index 91faa40..c661143 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsFactory.java
@@ -15,9 +15,13 @@
package org.apache.geode.internal.statistics;
-import java.io.*;
+import java.io.IOException;
+import java.io.Reader;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
/**
* A StatisticsFactory that creates disconnected statistics
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
index ed38f21..adafe56 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
@@ -18,7 +18,9 @@ import java.util.function.DoubleSupplier;
import java.util.function.IntSupplier;
import java.util.function.LongSupplier;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
/**
* An implementation of {@link Statistics} that does nothing. Setting the "gemfire.statsDisabled" to
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatHelper.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatHelper.java
index ebd15b3..75fa7de 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatHelper.java
@@ -17,7 +17,8 @@ package org.apache.geode.internal.statistics;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.geode.*;
+import org.apache.geode.InternalGemFireException;
+import org.apache.geode.Statistics;
import org.apache.geode.internal.PureJavaMode;
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/internal/statistics/LocalStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
index 8d4c93e..19955f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.statistics;
-import org.apache.geode.*;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
import org.apache.geode.internal.OSProcess;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatSamplerStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatSamplerStats.java
index b920e9a..7224aa4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatSamplerStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatSamplerStats.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.statistics;
-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;
/**
* Statistics related to the statistic sampler.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
index 1a59616..51d36fd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.statistics;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
index 343b503..767f755 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
@@ -14,10 +14,13 @@
*/
package org.apache.geode.internal.statistics;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.HashMap;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
index 50658f0..8f042e7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
@@ -14,10 +14,14 @@
*/
package org.apache.geode.internal.statistics;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.HashMap;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeXml.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeXml.java
index 5df663f..72908d5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeXml.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeXml.java
@@ -14,15 +14,30 @@
*/
package org.apache.geode.internal.statistics;
-import java.io.*;
-import java.util.*;
-
-import javax.xml.parsers.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-import org.apache.geode.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.util.ArrayList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+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.SAXParseException;
+
+import org.apache.geode.GemFireConfigException;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.i18n.LocalizedStrings;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStats.java
index d94a879..b54d692 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStats.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.statistics;
-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;
/**
* Statistics related to a Java VM. Currently they all come from {@link java.lang.Runtime}.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContractFactory.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContractFactory.java
index aaa5db8..edd26cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContractFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/VMStatsContractFactory.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.statistics;
-import org.apache.geode.*;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.SystemFailure;
import org.apache.geode.internal.stats50.VMStats50;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java
index 83cbada..ab7f500 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.statistics.platform;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcessStats.java
index fa6fb4c..c57e3df 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxProcessStats.java
@@ -15,7 +15,10 @@
package org.apache.geode.internal.statistics.platform;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.statistics.HostStatHelper;
import org.apache.geode.internal.statistics.LocalStatisticsImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxSystemStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxSystemStats.java
index b4b514c..662c95f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxSystemStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/LinuxSystemStats.java
@@ -15,7 +15,9 @@
package org.apache.geode.internal.statistics.platform;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXProcessStats.java
index 95421ae..8a53ed3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXProcessStats.java
@@ -15,7 +15,10 @@
package org.apache.geode.internal.statistics.platform;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.statistics.HostStatHelper;
import org.apache.geode.internal.statistics.LocalStatisticsImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXSystemStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXSystemStats.java
index 066c9c2..218e9f0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXSystemStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/OSXSystemStats.java
@@ -15,7 +15,9 @@
package org.apache.geode.internal.statistics.platform;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisProcessStats.java
index 2b6393b..831356c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisProcessStats.java
@@ -15,7 +15,10 @@
package org.apache.geode.internal.statistics.platform;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.statistics.HostStatHelper;
import org.apache.geode.internal.statistics.LocalStatisticsImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisSystemStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisSystemStats.java
index d5924d9..04def16 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisSystemStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/SolarisSystemStats.java
@@ -15,7 +15,9 @@
package org.apache.geode.internal.statistics.platform;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsProcessStats.java
index 26607ab..dbddd39 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsProcessStats.java
@@ -15,7 +15,10 @@
package org.apache.geode.internal.statistics.platform;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.statistics.HostStatHelper;
import org.apache.geode.internal.statistics.LocalStatisticsImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsSystemStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsSystemStats.java
index 6c9992e..4cf9813 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsSystemStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/WindowsSystemStats.java
@@ -15,7 +15,9 @@
package org.apache.geode.internal.statistics.platform;
-import org.apache.geode.*;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
index 01c2742..04fc8ae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.internal.stats50;
-import java.util.*;
+import java.util.ArrayList;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicIntegerArray;
import java.util.concurrent.atomic.AtomicLongArray;
-import org.apache.geode.*;
-import org.apache.geode.internal.*;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.statistics.StatisticsImpl;
import org.apache.geode.internal.statistics.StatisticsManager;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectExceptions.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectExceptions.java
index fd8f3f1..54f3212 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectExceptions.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectExceptions.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.tcp;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import org.apache.geode.GemFireCheckedException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
index abb34df..24ba0fc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
@@ -14,11 +14,14 @@
*/
package org.apache.geode.internal.tcp;
-import java.io.*;
-import java.nio.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UTFDataFormatException;
+import java.nio.ByteBuffer;
import org.apache.geode.DataSerializer;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.ObjToByteArraySerializer;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
index 8830fa5..af54679 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
@@ -31,7 +31,12 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionMessage;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.ByteBufferWriter;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.ObjToByteArraySerializer;
+import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
--
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.