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 62f9944 GEODE-2953: Expand wildcard imports in geode-core:test. (#1909) 62f9944 is described below commit 62f994496a4a01447093a930f46199a6aff99770 Author: Patrick Rhomberg <prhomb...@pivotal.io> AuthorDate: Fri May 4 09:55:24 2018 -0700 GEODE-2953: Expand wildcard imports in geode-core:test. (#1909) --- .../src/test/java/com/company/app/DBLoader.java | 5 ++++- .../java/com/company/app/OrdersCacheListener.java | 5 ++++- .../test/java/com/company/data/DatabaseLoader.java | 5 ++++- .../test/java/com/company/data/MyDeclarable.java | 2 +- .../com/company/data/MyTransactionListener.java | 4 +++- .../src/test/java/com/examples/SuperClass.java | 3 ++- .../java/com/examples/ds/CompanySerializer.java | 4 +++- .../src/test/java/com/examples/ds/Employee.java | 4 +++- .../java/com/examples/ds/PutDataSerializables.java | 5 ++++- geode-core/src/test/java/com/examples/ds/User.java | 4 +++- .../src/test/java/hydra/MethExecutorResult.java | 7 +++++- .../src/test/java/hydra/SchedulingOrder.java | 2 +- .../test/java/org/apache/geode/CopyJUnitTest.java | 25 +++++++++++++++++++--- .../apache/geode/DiskInstantiatorsJUnitTest.java | 12 +++++++++-- .../apache/geode/JtaNoninvolvementJUnitTest.java | 11 ++++++++-- .../java/org/apache/geode/LonerDMJUnitTest.java | 18 +++++++++++++--- .../org/apache/geode/SetOperationTXJUnitTest.java | 4 +++- .../org/apache/geode/SystemFailureJUnitTest.java | 3 ++- .../test/java/org/apache/geode/TXJUnitTest.java | 10 +++++++-- .../java/org/apache/geode/TXWriterTestCase.java | 2 +- .../test/java/org/apache/geode/UnitTestDoclet.java | 12 +++++++++-- .../java/org/apache/persistence/admin/Logger.java | 7 ++++-- .../org/apache/persistence/logging/Logger.java | 6 +++++- .../persistence/logging/SimpleFormatter.java | 5 +++-- .../apache/persistence/logging/StreamHandler.java | 3 ++- .../java/parReg/query/unittest/NewPortfolio.java | 6 +++++- .../test/java/parReg/query/unittest/Position.java | 4 +++- 27 files changed, 141 insertions(+), 37 deletions(-) diff --git a/geode-core/src/test/java/com/company/app/DBLoader.java b/geode-core/src/test/java/com/company/app/DBLoader.java index 9e9196e..d7ba3e7 100644 --- a/geode-core/src/test/java/com/company/app/DBLoader.java +++ b/geode-core/src/test/java/com/company/app/DBLoader.java @@ -16,7 +16,10 @@ package com.company.app; import java.util.Properties; -import org.apache.geode.cache.*; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.LoaderHelper; /** * A <code>CacheLoader</code> that is <code>Declarable</code> diff --git a/geode-core/src/test/java/com/company/app/OrdersCacheListener.java b/geode-core/src/test/java/com/company/app/OrdersCacheListener.java index a0ad4b4..2b4d243 100755 --- a/geode-core/src/test/java/com/company/app/OrdersCacheListener.java +++ b/geode-core/src/test/java/com/company/app/OrdersCacheListener.java @@ -14,7 +14,10 @@ */ package com.company.app; -import org.apache.geode.cache.*; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.RegionEvent; /** * com.company.app.OrdersCacheListener. Cache listener impl for CacheXmlxxTest diff --git a/geode-core/src/test/java/com/company/data/DatabaseLoader.java b/geode-core/src/test/java/com/company/data/DatabaseLoader.java index 9a4cd15..631fe32 100644 --- a/geode-core/src/test/java/com/company/data/DatabaseLoader.java +++ b/geode-core/src/test/java/com/company/data/DatabaseLoader.java @@ -14,7 +14,10 @@ */ package com.company.data; -import org.apache.geode.cache.*; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.LoaderHelper; /** * A <code>CacheLoader</code> that is <code>Declarable</code> diff --git a/geode-core/src/test/java/com/company/data/MyDeclarable.java b/geode-core/src/test/java/com/company/data/MyDeclarable.java index a88f480..25fbc2a 100644 --- a/geode-core/src/test/java/com/company/data/MyDeclarable.java +++ b/geode-core/src/test/java/com/company/data/MyDeclarable.java @@ -14,7 +14,7 @@ */ package com.company.data; -import org.apache.geode.cache.*; +import org.apache.geode.cache.Declarable; /** * A <code>Declarable</code> object diff --git a/geode-core/src/test/java/com/company/data/MyTransactionListener.java b/geode-core/src/test/java/com/company/data/MyTransactionListener.java index 3ed5075..c39be79 100644 --- a/geode-core/src/test/java/com/company/data/MyTransactionListener.java +++ b/geode-core/src/test/java/com/company/data/MyTransactionListener.java @@ -14,7 +14,9 @@ */ package com.company.data; -import org.apache.geode.cache.*; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.TransactionEvent; +import org.apache.geode.cache.TransactionListener; /** * A <code>TransactionListener</code> that is <code>Declarable</code> diff --git a/geode-core/src/test/java/com/examples/SuperClass.java b/geode-core/src/test/java/com/examples/SuperClass.java index 5ca063d..dbc55d0 100644 --- a/geode-core/src/test/java/com/examples/SuperClass.java +++ b/geode-core/src/test/java/com/examples/SuperClass.java @@ -14,7 +14,8 @@ */ package com.examples; -import java.util.*; +import java.util.HashMap; +import java.util.Map; /** * The super class of another class. Neither is <code>Serializable</code>. diff --git a/geode-core/src/test/java/com/examples/ds/CompanySerializer.java b/geode-core/src/test/java/com/examples/ds/CompanySerializer.java index c6105d6..f5672e1 100644 --- a/geode-core/src/test/java/com/examples/ds/CompanySerializer.java +++ b/geode-core/src/test/java/com/examples/ds/CompanySerializer.java @@ -14,7 +14,9 @@ */ package com.examples.ds; -import java.io.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; import org.apache.geode.DataSerializer; diff --git a/geode-core/src/test/java/com/examples/ds/Employee.java b/geode-core/src/test/java/com/examples/ds/Employee.java index eba6048..c22fc9a 100644 --- a/geode-core/src/test/java/com/examples/ds/Employee.java +++ b/geode-core/src/test/java/com/examples/ds/Employee.java @@ -14,7 +14,9 @@ */ package com.examples.ds; -import java.io.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; import java.util.Date; import org.apache.geode.DataSerializable; diff --git a/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java b/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java index 30c2879..bb55749 100644 --- a/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java +++ b/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java @@ -17,7 +17,10 @@ package com.examples.ds; import java.util.Date; import java.util.Properties; -import org.apache.geode.cache.*; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; import org.apache.geode.distributed.DistributedSystem; /** diff --git a/geode-core/src/test/java/com/examples/ds/User.java b/geode-core/src/test/java/com/examples/ds/User.java index 6957d3b..503b735 100644 --- a/geode-core/src/test/java/com/examples/ds/User.java +++ b/geode-core/src/test/java/com/examples/ds/User.java @@ -14,7 +14,9 @@ */ package com.examples.ds; -import java.io.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; import org.apache.geode.DataSerializable; import org.apache.geode.Instantiator; diff --git a/geode-core/src/test/java/hydra/MethExecutorResult.java b/geode-core/src/test/java/hydra/MethExecutorResult.java index 9c04941..acdcb34 100644 --- a/geode-core/src/test/java/hydra/MethExecutorResult.java +++ b/geode-core/src/test/java/hydra/MethExecutorResult.java @@ -15,7 +15,12 @@ package hydra; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.PrintWriter; +import java.io.Serializable; +import java.io.StringWriter; /** * diff --git a/geode-core/src/test/java/hydra/SchedulingOrder.java b/geode-core/src/test/java/hydra/SchedulingOrder.java index 0168671..a0623c6 100644 --- a/geode-core/src/test/java/hydra/SchedulingOrder.java +++ b/geode-core/src/test/java/hydra/SchedulingOrder.java @@ -15,7 +15,7 @@ package hydra; -import org.apache.geode.*; +import org.apache.geode.GemFireException; /** * Abstract class for clients giving scheduling instructions to the hydra master. diff --git a/geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java index ae8952f..2015190 100644 --- a/geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java @@ -15,17 +15,36 @@ package org.apache.geode; 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.assertNotSame; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; import org.junit.Test; import org.junit.experimental.categories.Category; -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.CacheFactory; +import org.apache.geode.cache.CacheTransactionManager; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionEvent; +import org.apache.geode.cache.Scope; import org.apache.geode.cache.util.CacheListenerAdapter; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.pdx.PdxInstance; diff --git a/geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java index 50cc0b6..293cc45 100644 --- a/geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java @@ -14,7 +14,9 @@ */ package org.apache.geode; -import static org.apache.geode.distributed.ConfigurationProperties.*; +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_SAMPLING_ENABLED; import static org.junit.Assert.fail; import java.io.DataInput; @@ -28,7 +30,13 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -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.CacheFactory; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.Scope; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.internal.InternalInstantiator; import org.apache.geode.test.junit.categories.IntegrationTest; diff --git a/geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java b/geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java index 70705c4..dd569d4 100644 --- a/geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java @@ -15,7 +15,9 @@ package org.apache.geode; 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.assertTrue; import java.util.Properties; import java.util.concurrent.CountDownLatch; @@ -29,7 +31,12 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; -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.CacheFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.Scope; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.InternalDistributedSystem; diff --git a/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java b/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java index 6495f61..fabc7a8 100644 --- a/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java @@ -14,8 +14,15 @@ */ package org.apache.geode; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +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.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.apache.geode.distributed.ConfigurationProperties.ROLES; +import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE; +import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.net.InetAddress; import java.net.UnknownHostException; @@ -25,7 +32,12 @@ import org.junit.After; import org.junit.Test; import org.junit.experimental.categories.Category; -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.CacheFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.Scope; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.distributed.internal.LonerDistributionManager; diff --git a/geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java index d0df70f..4e67398 100644 --- a/geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java @@ -15,7 +15,9 @@ package org.apache.geode; 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.assertTrue; import java.util.Collection; import java.util.HashMap; diff --git a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java index 39675c5..895c26f 100644 --- a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java @@ -14,7 +14,8 @@ */ package org.apache.geode; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.concurrent.TimeUnit; diff --git a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java index 17c736f..1b06668 100644 --- a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java @@ -14,9 +14,15 @@ */ package org.apache.geode; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; import static org.assertj.core.api.Assertions.assertThatThrownBy; -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.util.ArrayList; import java.util.Collection; diff --git a/geode-core/src/test/java/org/apache/geode/TXWriterTestCase.java b/geode-core/src/test/java/org/apache/geode/TXWriterTestCase.java index 8242299..8fee96a 100644 --- a/geode-core/src/test/java/org/apache/geode/TXWriterTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/TXWriterTestCase.java @@ -14,7 +14,7 @@ */ package org.apache.geode; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/UnitTestDoclet.java b/geode-core/src/test/java/org/apache/geode/UnitTestDoclet.java index 607db57..45b18b4 100644 --- a/geode-core/src/test/java/org/apache/geode/UnitTestDoclet.java +++ b/geode-core/src/test/java/org/apache/geode/UnitTestDoclet.java @@ -14,9 +14,17 @@ */ package org.apache.geode; -import java.io.*; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; import java.text.BreakIterator; -import java.util.*; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.Set; +import java.util.TreeSet; import com.sun.javadoc.ClassDoc; import com.sun.javadoc.DocErrorReporter; diff --git a/geode-core/src/test/java/org/apache/persistence/admin/Logger.java b/geode-core/src/test/java/org/apache/persistence/admin/Logger.java index e1a7968..64055b7 100644 --- a/geode-core/src/test/java/org/apache/persistence/admin/Logger.java +++ b/geode-core/src/test/java/org/apache/persistence/admin/Logger.java @@ -15,8 +15,11 @@ package org.apache.persistence.admin; import java.io.PrintWriter; -import java.text.*; -import java.util.*; +import java.text.BreakIterator; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.MissingResourceException; +import java.util.ResourceBundle; /** * Provides single point for all log messages to written to. Currently this class only supports diff --git a/geode-core/src/test/java/org/apache/persistence/logging/Logger.java b/geode-core/src/test/java/org/apache/persistence/logging/Logger.java index e3f60b2..9fa7c1c 100644 --- a/geode-core/src/test/java/org/apache/persistence/logging/Logger.java +++ b/geode-core/src/test/java/org/apache/persistence/logging/Logger.java @@ -14,7 +14,11 @@ */ package org.apache.persistence.logging; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; /** * A logger is used to record messages and events. Each entry has a given level associated with it. diff --git a/geode-core/src/test/java/org/apache/persistence/logging/SimpleFormatter.java b/geode-core/src/test/java/org/apache/persistence/logging/SimpleFormatter.java index aa38a08..e44bd45 100644 --- a/geode-core/src/test/java/org/apache/persistence/logging/SimpleFormatter.java +++ b/geode-core/src/test/java/org/apache/persistence/logging/SimpleFormatter.java @@ -14,8 +14,9 @@ */ package org.apache.persistence.logging; -import java.io.*; -import java.util.*; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Date; /** * A Formatter that returns a textual description of a LogRecord diff --git a/geode-core/src/test/java/org/apache/persistence/logging/StreamHandler.java b/geode-core/src/test/java/org/apache/persistence/logging/StreamHandler.java index 8c3c173..35f7bbd 100644 --- a/geode-core/src/test/java/org/apache/persistence/logging/StreamHandler.java +++ b/geode-core/src/test/java/org/apache/persistence/logging/StreamHandler.java @@ -14,7 +14,8 @@ */ package org.apache.persistence.logging; -import java.io.*; +import java.io.OutputStream; +import java.io.PrintWriter; /** * A <code>StreamHandler</code> exports log records to an <code>OutputStream</code>. diff --git a/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java b/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java index 0c220f3..1b8ce2e 100755 --- a/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java +++ b/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java @@ -16,7 +16,11 @@ package parReg.query.unittest; import java.io.Serializable; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Random; /** * A version of the Portfolio Object used for query. diff --git a/geode-core/src/test/java/parReg/query/unittest/Position.java b/geode-core/src/test/java/parReg/query/unittest/Position.java index 0647ed4..bd5933a 100755 --- a/geode-core/src/test/java/parReg/query/unittest/Position.java +++ b/geode-core/src/test/java/parReg/query/unittest/Position.java @@ -15,7 +15,9 @@ package parReg.query.unittest; import java.io.Serializable; -import java.util.*; +import java.util.List; +import java.util.Properties; +import java.util.Random; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Declarable; -- To stop receiving notification emails like this one, please contact prhomb...@apache.org.