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/30 16:43:42 UTC
[geode] branch develop updated: GEODE-2953: Expand wildcard imports
in geode-core:test.internal... subpackages. (#1882)
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 3a9d9f3 GEODE-2953: Expand wildcard imports in geode-core:test.internal... subpackages. (#1882)
3a9d9f3 is described below
commit 3a9d9f341614b9020ae963766eafca7b8b956045
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Mon Apr 30 09:43:38 2018 -0700
GEODE-2953: Expand wildcard imports in geode-core:test.internal... subpackages. (#1882)
---
.../CompressionCacheConfigDUnitTest.java | 6 ++-
.../CompressionCacheListenerDUnitTest.java | 5 +-
.../CompressionCacheListenerOffHeapDUnitTest.java | 2 +-
.../CompressionRegionConfigDUnitTest.java | 5 +-
.../CompressionRegionFactoryDUnitTest.java | 3 +-
.../CompressionRegionOperationsDUnitTest.java | 4 +-
...ompressionRegionOperationsOffHeapDUnitTest.java | 2 +-
.../compression/CompressionStatsDUnitTest.java | 4 +-
.../compression/SnappyCompressorJUnitTest.java | 2 +-
.../internal/datasource/CleanUpJUnitTest.java | 3 +-
.../ConnectionPoolCacheImplJUnitTest.java | 3 +-
.../datasource/ConnectionPoolingJUnitTest.java | 3 +-
.../datasource/DataSourceFactoryJUnitTest.java | 5 +-
.../internal/datasource/RestartJUnitTest.java | 3 +-
.../geode/internal/i18n/BasicI18nJUnitTest.java | 5 +-
.../io/CompositeOutputStreamJUnitTest.java | 4 +-
...hChildrenRollingFileHandlerIntegrationTest.java | 3 +-
.../geode/internal/jndi/ContextJUnitTest.java | 6 ++-
.../internal/jta/BlockingTimeOutJUnitTest.java | 11 +++-
.../org/apache/geode/internal/jta/CacheUtils.java | 3 +-
.../geode/internal/jta/DataSourceJTAJUnitTest.java | 4 +-
.../geode/internal/jta/ExceptionJUnitTest.java | 4 +-
.../internal/jta/GlobalTransactionJUnitTest.java | 5 +-
.../org/apache/geode/internal/jta/JTAUtils.java | 16 ++++--
.../internal/jta/JtaIntegrationJUnitTest.java | 11 +++-
.../internal/jta/TransactionImplJUnitTest.java | 6 ++-
.../jta/TransactionManagerImplJUnitTest.java | 17 ++++--
.../internal/jta/TransactionTimeOutJUnitTest.java | 5 +-
.../internal/jta/UserTransactionImplJUnitTest.java | 5 +-
.../internal/jta/dunit/ExceptionsDUnitTest.java | 4 +-
.../internal/jta/dunit/IdleTimeOutDUnitTest.java | 3 +-
.../internal/jta/dunit/LoginTimeOutDUnitTest.java | 5 +-
.../internal/jta/dunit/MaxPoolSizeDUnitTest.java | 4 +-
.../jta/dunit/TransactionTimeOutDUnitTest.java | 4 +-
.../jta/dunit/TxnManagerMultiThreadDUnitTest.java | 4 +-
.../internal/jta/dunit/TxnTimeOutDUnitTest.java | 5 +-
.../internal/lang/InOutParameterJUnitTest.java | 3 +-
.../geode/internal/lang/ObjectUtilsJUnitTest.java | 5 +-
.../geode/internal/lang/SystemUtilsJUnitTest.java | 32 ++++++++++--
.../geode/internal/lang/ThrowableUtilsTest.java | 4 +-
.../logging/CacheLogRollingIntegrationTest.java | 9 +++-
.../internal/logging/LocatorLogFileJUnitTest.java | 13 ++++-
.../logging/LogServiceIntegrationJUnitTest.java | 4 +-
.../internal/logging/LogServiceJUnitTest.java | 4 +-
.../internal/logging/LogWriterPerformanceTest.java | 5 +-
.../logging/LoggingPerformanceTestCase.java | 2 +-
.../internal/logging/SortLogFileJUnitTest.java | 2 +-
.../logging/log4j/AlertAppenderJUnitTest.java | 5 +-
.../logging/log4j/ConfigLocatorJUnitTest.java | 8 ++-
.../logging/log4j/FastLoggerJUnitTest.java | 12 +++--
.../FastLoggerWithDefaultConfigJUnitTest.java | 6 ++-
.../GeodeVerboseLogMarkerIntegrationTest.java | 2 +-
.../logging/log4j/LocalizedMessageJUnitTest.java | 5 +-
.../logging/log4j/LogWriterAppenderJUnitTest.java | 4 +-
.../CustomConfigWithCacheIntegrationTest.java | 8 ++-
.../CustomConfigWithLogServiceIntegrationTest.java | 6 ++-
.../net/ClientSocketFactoryIntegrationTest.java | 9 ++--
.../net/SocketCreatorFactoryJUnitTest.java | 61 +++++++++++++++++++++-
.../geode/internal/net/SocketUtilsJUnitTest.java | 4 +-
.../offheap/AbstractStoredObjectTestBase.java | 7 ++-
.../geode/internal/offheap/DataTypeJUnitTest.java | 7 ++-
...nectingOutOfOffHeapMemoryListenerJUnitTest.java | 6 ++-
.../geode/internal/offheap/FragmentJUnitTest.java | 6 ++-
.../internal/offheap/FreeListManagerTest.java | 5 +-
.../geode/internal/offheap/InlineKeyJUnitTest.java | 3 +-
.../offheap/LifecycleListenerJUnitTest.java | 2 +-
.../internal/offheap/MemoryAllocatorJUnitTest.java | 8 ++-
.../internal/offheap/MemoryBlockNodeJUnitTest.java | 6 ++-
.../offheap/MemoryInspectorImplJUnitTest.java | 9 +++-
.../internal/offheap/OffHeapHelperJUnitTest.java | 10 +++-
.../internal/offheap/OffHeapIndexJUnitTest.java | 6 ++-
.../geode/internal/offheap/OffHeapRegionBase.java | 11 +++-
.../offheap/OffHeapRegionEntryHelperJUnitTest.java | 9 +++-
.../internal/offheap/OffHeapStorageJUnitTest.java | 5 +-
.../OffHeapStoredObjectAddressStackJUnitTest.java | 7 ++-
.../offheap/OffHeapStoredObjectJUnitTest.java | 13 ++++-
.../offheap/OffHeapStoredObjectSliceJUnitTest.java | 3 +-
.../OffHeapStoredObjectWithHeapFormJUnitTest.java | 6 ++-
.../offheap/OffHeapValidationJUnitTest.java | 27 +++++++++-
.../OffHeapWriteObjectAsByteArrayJUnitTest.java | 4 +-
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 14 +++--
.../offheap/RefCountChangeInfoJUnitTest.java | 4 +-
.../offheap/ReferenceCountHelperImplTest.java | 8 +--
.../offheap/ReferenceCountHelperJUnitTest.java | 10 ++--
.../internal/offheap/TinyMemoryBlockJUnitTest.java | 2 +-
.../offheap/TinyStoredObjectJUnitTest.java | 11 +++-
.../offheap/TxReleasesOffHeapOnCloseJUnitTest.java | 6 ++-
.../geode/internal/size/ObjectSizerJUnitTest.java | 6 ++-
.../internal/size/ObjectTraverserJUnitTest.java | 6 ++-
.../size/ReflectionObjectSizerJUnitTest.java | 5 +-
.../size/SizeClassOnceObjectSizerJUnitTest.java | 6 ++-
.../size/WellKnownClassSizerJUnitTest.java | 5 +-
.../internal/statistics/CallbackSamplerTest.java | 6 ++-
...DistributedSystemStatisticsIntegrationTest.java | 7 ++-
...ributedSystemStatisticsTypeIntegrationTest.java | 7 ++-
.../GemFireStatSamplerIntegrationTest.java | 17 ++++--
.../internal/statistics/ResourceInstTest.java | 4 +-
.../internal/statistics/SampleCollectorTest.java | 9 +++-
.../StatArchiveHandlerIntegrationTest.java | 3 +-
...rchiveWithConsecutiveResourceInstGenerator.java | 10 ++--
...veWithConsecutiveResourceInstGeneratorTest.java | 2 +-
...WithConsecutiveResourceInstIntegrationTest.java | 5 +-
.../StatArchiveWriterReaderIntegrationTest.java | 12 +++--
.../internal/statistics/StatArchiveWriterTest.java | 7 ++-
.../statistics/StatSamplerIntegrationTest.java | 9 ++--
.../internal/statistics/StatSamplerTestCase.java | 3 +-
.../StatTypesAreRolledOverRegressionTest.java | 7 +--
.../geode/internal/statistics/StatUtils.java | 2 +-
.../statistics/StatisticsDistributedTest.java | 18 ++++---
.../internal/statistics/StatisticsImplTest.java | 11 +++-
.../internal/statistics/StatisticsMonitorTest.java | 9 +++-
.../internal/stats50/AtomicStatsJUnitTest.java | 3 +-
.../geode/internal/tcp/ConnectionJUnitTest.java | 6 ++-
.../apache/geode/internal/tcp/ConnectionTest.java | 6 +--
.../apache/geode/internal/util/ArrayUtilsTest.java | 9 +++-
.../apache/geode/internal/util/BlobHelperTest.java | 7 ++-
...BlobHelperWithThreadContextClassLoaderTest.java | 2 +-
.../internal/util/DelayedActionJUnitTest.java | 3 +-
.../apache/geode/internal/util/HostNameTest.java | 11 ++--
.../geode/internal/util/IOUtilsJUnitTest.java | 7 ++-
.../CompactConcurrentHashSetJUnitTest.java | 2 +-
.../ConcurrentHashMapIteratorJUnitTest.java | 5 +-
.../concurrent/CopyOnWriteHashMapJUnitTest.java | 7 ++-
.../concurrent/ReentrantSemaphoreJUnitTest.java | 4 +-
.../SemaphoreReadWriteLockJUnitTest.java | 4 +-
.../concurrent/cm/ConcurrentHashMapJUnitTest.java | 7 ++-
126 files changed, 656 insertions(+), 215 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java
index c1ed393..584792b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.compression;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java
index e4f5e69..4939c71 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.compression;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
index ea599d0..e981333 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.compression;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
index c5a0679..db0578c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.compression;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java
index 12f9b18..1cd9b03 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.compression;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java
index fcfa62d..bbd86a9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.compression;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.Collection;
import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
index 8af723a..b5d689b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.compression;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
index 6a87322..636934f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
@@ -15,7 +15,9 @@
package org.apache.geode.internal.compression;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.Serializable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java
index ca158e9..59fd699 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.compression;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
index 615e662..e080d43 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
@@ -17,7 +17,8 @@
*/
package org.apache.geode.internal.datasource;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.fail;
import java.sql.Connection;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
index 05db136..dd94b88 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
@@ -19,7 +19,8 @@
*/
package org.apache.geode.internal.datasource;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.fail;
import java.sql.Connection;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
index 3a20c27..dad1ff7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.datasource;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
index 320cd05..e471428 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.datasource;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.sql.Connection;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
index dd32ab1..fd92c96 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
@@ -17,7 +17,8 @@
*/
package org.apache.geode.internal.datasource;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.fail;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
index 4965058..c9bd05f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.i18n;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
index c2d9897..a14a93c5 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.io;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
index e3c12a9..0b90f46 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.io;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.File;
import java.util.regex.Pattern;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
index 675a9be..de28cb7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.jndi;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Hashtable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
index 2e44f2c..6f0a936 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
@@ -14,10 +14,17 @@
*/
package org.apache.geode.internal.jta;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.OutputStreamWriter;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java b/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java
index 178a549..1dbec0d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java
@@ -20,7 +20,8 @@
package org.apache.geode.internal.jta;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
index ffe8f95..39a4209 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.jta;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import java.sql.Connection;
import java.sql.SQLException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
index 3efce68..38ed2c0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.jta;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
index f83fff8..5e4b1a9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.jta;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.sql.Connection;
import java.sql.SQLException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java b/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java
index 7ef3721..707df50 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java
@@ -20,14 +20,22 @@
package org.apache.geode.internal.jta;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.sql.*;
+import javax.sql.DataSource;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.Region;
public class JTAUtils {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
index 7f41d9b..65745e3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
@@ -15,7 +15,10 @@
package org.apache.geode.internal.jta;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
@@ -25,7 +28,11 @@ import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.junit.categories.IntegrationTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
index dab98b2..93ba65c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
@@ -26,7 +26,11 @@ import java.util.Properties;
import javax.transaction.Synchronization;
import javax.transaction.UserTransaction;
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedSystem;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
index f46a7b3..73cafd8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
@@ -15,16 +15,27 @@
package org.apache.geode.internal.jta;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Properties;
-import javax.transaction.*;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.UserTransaction;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedSystem;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
index 991ff01..1c0d1f9 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.jta;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
index 81397b1..08a97f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
@@ -15,7 +15,10 @@
package org.apache.geode.internal.jta;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java
index 84febc0..3e35386 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.jta.dunit;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java
index a534818..d430066 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java
@@ -15,7 +15,8 @@
package org.apache.geode.internal.jta.dunit;
import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
index 5b3fbad..3a80a23 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.jta.dunit;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java
index 3a49093..c2b5671 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.jta.dunit;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java
index d25b84c..4177f64 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.jta.dunit;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
index c35f3ae..c2b802f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.jta.dunit;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java
index 9b76ea3..8805b6e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.jta.dunit;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.test.dunit.Assert.fail;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
index 9c4b80e..7296270 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.lang;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
index e5d685f..0d5095f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.lang;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
index f38fe00..97472b3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
@@ -14,10 +14,34 @@
*/
package org.apache.geode.internal.lang;
-import static org.apache.geode.internal.lang.SystemUtils.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.junit.Assert.*;
-import static org.junit.Assume.*;
+import static org.apache.geode.internal.lang.SystemUtils.APPLE_JVM_VENDOR_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.IBM_J9_JVM_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.JAVA_HOTSPOT_JVM_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.LINUX_OS_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.MAC_OSX_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.ORACLE_JROCKIT_JVM_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.ORACLE_JVM_VENDOR_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.WINDOWS_OS_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.getBootClassPath;
+import static org.apache.geode.internal.lang.SystemUtils.getClassPath;
+import static org.apache.geode.internal.lang.SystemUtils.getJavaVersion;
+import static org.apache.geode.internal.lang.SystemUtils.getOsArchitecture;
+import static org.apache.geode.internal.lang.SystemUtils.getOsName;
+import static org.apache.geode.internal.lang.SystemUtils.getOsVersion;
+import static org.apache.geode.internal.lang.SystemUtils.isAppleJVM;
+import static org.apache.geode.internal.lang.SystemUtils.isHotSpotVM;
+import static org.apache.geode.internal.lang.SystemUtils.isJ9VM;
+import static org.apache.geode.internal.lang.SystemUtils.isJRockitVM;
+import static org.apache.geode.internal.lang.SystemUtils.isJavaVersionAtLeast;
+import static org.apache.geode.internal.lang.SystemUtils.isLinux;
+import static org.apache.geode.internal.lang.SystemUtils.isMacOSX;
+import static org.apache.geode.internal.lang.SystemUtils.isOracleJVM;
+import static org.apache.geode.internal.lang.SystemUtils.isWindows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeNotNull;
import java.lang.management.ManagementFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
index 8f72f22..be525c1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.internal.lang;
-import static com.googlecode.catchexception.CatchException.*;
+import static com.googlecode.catchexception.CatchException.catchException;
import static com.googlecode.catchexception.CatchException.caughtException;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java
index 2444f98..75965c9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.logging;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_DISK_SPACE_LIMIT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE_SIZE_LIMIT;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_LOG_FILE;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.BufferedReader;
import java.io.File;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java
index ce402b1..400807d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java
@@ -14,8 +14,17 @@
*/
package org.apache.geode.internal.logging;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileInputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
index d6e8391..4d1c2cf 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.logging;
-import static org.apache.geode.internal.logging.LogServiceIntegrationTestSupport.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.internal.logging.LogServiceIntegrationTestSupport.writeConfigFile;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
import java.net.URL;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
index 7238664..f2d6bc8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.logging;
-import static junitparams.JUnitParamsRunner.*;
-import static org.assertj.core.api.Assertions.*;
+import static junitparams.JUnitParamsRunner.$;
+import static org.assertj.core.api.Assertions.assertThat;
import java.net.URL;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java
index bfc07b7..3792c85 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.logging;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LoggingPerformanceTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LoggingPerformanceTestCase.java
index c9d507f..18245e8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LoggingPerformanceTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LoggingPerformanceTestCase.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.logging;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
index 617dfad..895cc23 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.logging;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
index faf1f6a..60f55dd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.logging.log4j;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import java.lang.reflect.Field;
import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
index 58dffb5..49db8a2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.logging.log4j;
-import static org.junit.Assert.*;
-import static org.junit.Assume.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
import java.io.File;
import java.net.URL;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
index 891ac3c..0fd2b63 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
@@ -14,9 +14,15 @@
*/
package org.apache.geode.internal.logging.log4j;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
index 48a7290..a65e44c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.logging.log4j;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.junit.Assert.assertThat;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java
index 5a4c3ee..d9b7ac2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.logging.log4j;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
index 25ebff4..678ad66 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.logging.log4j;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
index 5a81b6e..c2b92cb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.logging.log4j;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
index b4d9276..84d5947 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
@@ -14,8 +14,12 @@
*/
package org.apache.geode.internal.logging.log4j.custom;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.CONFIG_LAYOUT_PREFIX;
+import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.createConfigFileIn;
+import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.defineLogStatementRegex;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java
index 4a19e86..ee996d3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.logging.log4j.custom;
-import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.CONFIG_LAYOUT_PREFIX;
+import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.createConfigFileIn;
+import static org.apache.geode.internal.logging.log4j.custom.CustomConfiguration.defineLogStatementRegex;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
index ec44385..e38c676 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
@@ -14,10 +14,11 @@
*/
package org.apache.geode.internal.net;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.distributed.internal.DistributionConfig.*;
-import static org.apache.geode.internal.security.SecurableCommunicationChannel.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_ENABLED;
+import static org.apache.geode.distributed.internal.DistributionConfig.GEMFIRE_PREFIX;
+import static org.apache.geode.internal.security.SecurableCommunicationChannel.CLUSTER;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.IOException;
import java.net.InetAddress;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
index 3ac1be7..d26135e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
@@ -14,8 +14,65 @@
*/
package org.apache.geode.internal.net;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_CLUSTER_ALIAS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_DEFAULT_ALIAS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
index eaa384c..329f1f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.net;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.ServerSocket;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/AbstractStoredObjectTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/AbstractStoredObjectTestBase.java
index c763fb3..6a867bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/AbstractStoredObjectTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/AbstractStoredObjectTestBase.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import java.io.DataOutput;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
index f5e8fe7..383ce50 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
@@ -15,8 +15,11 @@
package org.apache.geode.internal.offheap;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.when;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
index d473b78..4b1b6f8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.offheap;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Rule;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
index 4bcb1cb..e57e366 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.offheap;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
import java.util.Arrays;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
index 6edb59f..b0b5ad8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
@@ -18,7 +18,10 @@ import static com.googlecode.catchexception.CatchException.catchException;
import static com.googlecode.catchexception.CatchException.caughtException;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
index 5a1a539..cf17925 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
@@ -30,7 +30,8 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapIntKey;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapLongKey;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapObjectKey;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
index 7e0859f..a89d519 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
index 17e6c40..3985563 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
@@ -14,7 +14,13 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.nio.ByteBuffer;
import java.util.ArrayList;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
index 48e9f02..bcd43d0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
@@ -15,7 +15,11 @@
package org.apache.geode.internal.offheap;
import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
index 05ad618..48f23b9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
index df86028..f47de4e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
@@ -14,8 +14,14 @@
*/
package org.apache.geode.internal.offheap;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import java.nio.ByteBuffer;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
index eb9dd23..b212f3b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
@@ -28,7 +28,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.RegionFactory;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.IndexExistsException;
+import org.apache.geode.cache.query.IndexInvalidException;
+import org.apache.geode.cache.query.IndexNameConflictException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
index 487ffa2..cbc2ddc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
@@ -16,7 +16,11 @@ package org.apache.geode.internal.offheap;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.File;
import java.io.FilenameFilter;
@@ -39,7 +43,10 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.compression.Compressor;
import org.apache.geode.compression.SnappyCompressor;
import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.offheap.annotations.OffHeapIdentifier;
import org.apache.geode.internal.offheap.annotations.Released;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
index a7598a7..11dca6e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.offheap;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.nio.ByteBuffer;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
index 29e7f2c..d6be486 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
index f81d736..c3b70be 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.withSettings;
import org.apache.logging.log4j.Logger;
import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
index 1554300..29bb0a5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
@@ -15,8 +15,17 @@
package org.apache.geode.internal.offheap;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
index defbda5..56d5cb5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
index 51436be..5d8bdcb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
index f401e98..74c7ab7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
@@ -16,12 +16,35 @@ package org.apache.geode.internal.offheap;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.io.Serializable;
import java.sql.Timestamp;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Stack;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.Vector;
import org.junit.After;
import org.junit.Before;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
index 556bf38..224c993 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
index 2ca0e45..d74f5af 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
@@ -14,10 +14,16 @@
*/
package org.apache.geode.internal.offheap;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.awaitility.Awaitility.*;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
+import static org.awaitility.Awaitility.with;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Properties;
import java.util.concurrent.Callable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
index 716a122..18bc913 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
index 2089629..b303e1a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
@@ -15,8 +15,10 @@
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
import java.util.ArrayList;
import java.util.List;
@@ -31,7 +33,7 @@ import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.*;
+import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
index 993db0c..4c0e39a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
@@ -15,8 +15,12 @@
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.util.Collections;
import java.util.List;
@@ -29,7 +33,7 @@ import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.*;
+import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
index 2f7d586..1e7e60a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import java.nio.ByteBuffer;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
index c20cff0..09203bf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
@@ -14,8 +14,15 @@
*/
package org.apache.geode.internal.offheap;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.nio.ByteBuffer;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
index 966e96d..a2cdcc7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
@@ -23,7 +23,11 @@ import java.util.Properties;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheTransactionManager;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.test.junit.categories.IntegrationTest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
index 7159cde..3aebf1b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.size;
-import static org.apache.geode.internal.size.SizeTestUtil.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.internal.size.SizeTestUtil.OBJECT_SIZE;
+import static org.apache.geode.internal.size.SizeTestUtil.REFERENCE_SIZE;
+import static org.apache.geode.internal.size.SizeTestUtil.roundup;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
index 0ad1342..26a2160 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
@@ -17,7 +17,11 @@ package org.apache.geode.internal.size;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
index 690ffb0..9b1aad3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.size;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.mockito.Mockito.mock;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
index 69a7b8d..24dab64 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.size;
-import static org.apache.geode.internal.size.SizeTestUtil.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.internal.size.SizeTestUtil.OBJECT_SIZE;
+import static org.apache.geode.internal.size.SizeTestUtil.REFERENCE_SIZE;
+import static org.apache.geode.internal.size.SizeTestUtil.roundup;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
index 9199070..8665452 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.size;
-import static org.apache.geode.internal.size.SizeTestUtil.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.internal.size.SizeTestUtil.OBJECT_SIZE;
+import static org.apache.geode.internal.size.SizeTestUtil.roundup;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
index 8660f24..73c75e8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.statistics;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.util.Arrays;
import java.util.concurrent.ScheduledExecutorService;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java
index ae2bd7b..5caa38e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.statistics;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.Properties;
import java.util.Random;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java
index cadc7ee..7306a2e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.statistics;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
index 18e88a7..759847b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
@@ -14,9 +14,20 @@
*/
package org.apache.geode.internal.statistics;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-import static org.junit.Assume.*;
+import static org.apache.geode.distributed.ConfigurationProperties.ARCHIVE_DISK_SPACE_LIMIT;
+import static org.apache.geode.distributed.ConfigurationProperties.ARCHIVE_FILE_SIZE_LIMIT;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_TIME_STATISTICS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLE_RATE;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
import java.io.File;
import java.lang.reflect.Method;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
index c38e7f5..ab9e817 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.statistics;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.MockitoAnnotations.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.MockitoAnnotations.initMocks;
import java.lang.reflect.Field;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
index 66265f8..d03a077 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.statistics;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.File;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java
index ca5993c..611e07a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.statistics;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
import java.io.File;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGenerator.java
index 60560f7..5312686 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGenerator.java
@@ -15,9 +15,13 @@
package org.apache.geode.internal.statistics;
import static org.apache.geode.internal.statistics.StatArchiveFormat.NANOS_PER_MILLI;
-import static org.apache.geode.internal.statistics.StatUtils.*;
-import static org.apache.geode.internal.statistics.TestStatArchiveWriter.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.internal.statistics.StatUtils.findResourceInsts;
+import static org.apache.geode.internal.statistics.TestStatArchiveWriter.WRITER_INITIAL_DATE_MILLIS;
+import static org.apache.geode.internal.statistics.TestStatArchiveWriter.WRITER_PREVIOUS_TIMESTAMP_NANOS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java
index 1e1fd81..e68ff13 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.statistics;
-import static org.apache.geode.internal.statistics.StatUtils.*;
+import static org.apache.geode.internal.statistics.StatUtils.compareStatArchiveFiles;
import java.io.File;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java
index a189097..4bfa52a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.statistics;
-import static org.apache.geode.internal.statistics.StatArchiveWithConsecutiveResourceInstGenerator.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.internal.statistics.StatArchiveWithConsecutiveResourceInstGenerator.ARCHIVE_FILE_NAME;
+import static org.apache.geode.internal.statistics.StatArchiveWithConsecutiveResourceInstGenerator.STATS_SPEC_STRING;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
import java.net.URL;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
index 3fb0282..10bf319 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
@@ -15,9 +15,15 @@
package org.apache.geode.internal.statistics;
import static org.apache.geode.internal.statistics.StatArchiveFormat.NANOS_PER_MILLI;
-import static org.apache.geode.internal.statistics.TestStatArchiveWriter.*;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.apache.geode.internal.statistics.TestStatArchiveWriter.WRITER_INITIAL_DATE_MILLIS;
+import static org.apache.geode.internal.statistics.TestStatArchiveWriter.WRITER_PREVIOUS_TIMESTAMP_NANOS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
index a9fa34e..657fa5c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.statistics;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.junit.Test;
import org.junit.experimental.categories.Category;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
index 2d9a915..5e7afbf 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
@@ -14,9 +14,12 @@
*/
package org.apache.geode.internal.statistics;
-import static java.util.concurrent.TimeUnit.*;
-import static org.awaitility.Awaitility.*;
-import static org.junit.Assert.*;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.awaitility.Awaitility.await;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerTestCase.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerTestCase.java
index 2598066..7fdf0a3 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerTestCase.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.statistics;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.HashMap;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
index f10b6c2..aaa33d0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.internal.statistics;
-import static java.util.concurrent.TimeUnit.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.File;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatUtils.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatUtils.java
index 6ba1be6..e78f859 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatUtils.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.statistics;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
index bdf1fe0..c6821c8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
@@ -14,12 +14,18 @@
*/
package org.apache.geode.internal.statistics;
-import static java.util.concurrent.TimeUnit.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.Host.*;
-import static org.apache.geode.test.dunit.Invoke.*;
-import static org.awaitility.Awaitility.*;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLE_RATE;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.Host.getHost;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.awaitility.Awaitility.await;
import java.io.File;
import java.io.FileFilter;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
index 8b2a9b4..9494088 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
@@ -14,8 +14,15 @@
*/
package org.apache.geode.internal.statistics;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.isA;
+import static org.mockito.Mockito.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.util.function.DoubleSupplier;
import java.util.function.IntSupplier;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
index 7c05252..9cc54ab 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.statistics;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.File;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
index 85c7165..4282df6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.stats50;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
import static org.junit.Assert.assertEquals;
import java.util.Properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
index 0dde8a6..571fde9 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
@@ -14,7 +14,11 @@
*/
package org.apache.geode.internal.tcp;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.io.InputStream;
import java.net.InetSocketAddress;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
index 01a0f69..7ecefd1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.internal.tcp;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
index e6e23d8..fc156ea 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
@@ -14,8 +14,13 @@
*/
package org.apache.geode.internal.util;
-import static org.apache.geode.internal.util.ArrayUtils.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.internal.util.ArrayUtils.asList;
+import static org.apache.geode.internal.util.ArrayUtils.getElementAtIndex;
+import static org.apache.geode.internal.util.ArrayUtils.getFirst;
+import static org.apache.geode.internal.util.ArrayUtils.toByteArray;
+import static org.apache.geode.internal.util.ArrayUtils.toBytes;
+import static org.apache.geode.internal.util.ArrayUtils.toIntegerArray;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
index fdc7112..1d9a510 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.internal.util;
-import static org.apache.geode.internal.util.BlobHelper.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.internal.util.BlobHelper.deserializeBlob;
+import static org.apache.geode.internal.util.BlobHelper.serializeTo;
+import static org.apache.geode.internal.util.BlobHelper.serializeToBlob;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.EOFException;
import java.io.NotSerializableException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
index 35c5c3c..a36ceee 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.util;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.io.Serializable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
index 61bc5bf..5e55aea 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.util;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
index 45ddaa4..22f96ca 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
@@ -14,9 +14,14 @@
*/
package org.apache.geode.internal.util;
-import static org.apache.geode.internal.lang.SystemUtils.*;
-import static org.apache.geode.internal.util.HostName.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.apache.geode.internal.lang.SystemUtils.LINUX_OS_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.MAC_OSX_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.SOLARIS_OS_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.WINDOWS_OS_NAME;
+import static org.apache.geode.internal.lang.SystemUtils.isWindows;
+import static org.apache.geode.internal.util.HostName.COMPUTER_NAME_PROPERTY;
+import static org.apache.geode.internal.util.HostName.HOSTNAME_PROPERTY;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
index 5e462a9..ba670b7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
@@ -14,7 +14,12 @@
*/
package org.apache.geode.internal.util;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.Closeable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
index 32964a8..2719067 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.util.concurrent;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
index f2b2f02..59918e3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
@@ -14,8 +14,9 @@
*/
package org.apache.geode.internal.util.concurrent;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
index 0f23775..6c4b80c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
@@ -19,7 +19,12 @@
*/
package org.apache.geode.internal.util.concurrent;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
index b0ef9ec..8eb2947 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.util.concurrent;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
index 9d01480..1416685 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
@@ -14,7 +14,9 @@
*/
package org.apache.geode.internal.util.concurrent;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java
index c12babc..d93dc26 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java
@@ -19,7 +19,12 @@
*/
package org.apache.geode.internal.util.concurrent.cm;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
--
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.