From 8cc93f72a0bb1c2f7657e8e776c3abec9b09d837 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 16 Oct 2015 12:35:51 -0700 Subject: [PATCH] SGF-440 - Optimize imports across the SDG codebase. (cherry picked from commit af343a45fa57a9580a5942de8c091c680adea87b) Signed-off-by: John Blum --- .../data/gemfire/client/ClientCacheFactoryBean.java | 1 - .../AbstractFunctionExecutionConfigurationSource.java | 1 - .../data/gemfire/util/DistributedSystemUtils.java | 1 - .../data/gemfire/AutoRegionLookupDao.java | 1 - .../data/gemfire/ColocatedRegionIntegrationTest.java | 3 ++- .../springframework/data/gemfire/TxIntegrationTest.java | 1 - .../data/gemfire/client/ClientCacheTest.java | 3 ++- .../client/ClientRegionWithCacheLoaderWriterTest.java | 4 ---- .../config/CreateDefinedIndexesIntegrationTest.java | 1 - .../config/TemplateClientRegionNamespaceTest.java | 1 - .../repository/query/GemfireQueryCreatorUnitTests.java | 4 ++-- .../sample/UserRepositoryQueriesIntegrationTest.java | 9 ++++++--- ...AbstractGemfireRepositoryFactoryIntegrationTests.java | 8 ++++++-- .../GemfireRepositoryFactoryIntegrationTests.java | 5 +++-- .../data/gemfire/support/ClientCacheManagerTest.java | 2 +- .../data/gemfire/support/GemfireCacheTest.java | 4 ++-- .../GemfirePersistenceExceptionTranslationTest.java | 3 +-- .../data/gemfire/test/MockRegionFactoryTest.java | 2 ++ 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java index a910041a..2257151e 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java @@ -24,7 +24,6 @@ import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.config.GemfireConstants; -import org.springframework.data.gemfire.util.DistributedSystemUtils; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java b/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java index 1e75d318..9c30f5a3 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java @@ -13,7 +13,6 @@ package org.springframework.data.gemfire.function.config; import java.lang.annotation.Annotation; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java b/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java index 208b924d..27f10e00 100644 --- a/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java +++ b/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java @@ -20,7 +20,6 @@ import java.util.Properties; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; diff --git a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java index e1d379e9..d8cf7b8c 100644 --- a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java +++ b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; import org.springframework.context.annotation.DependsOn; -import org.springframework.context.annotation.Lazy; import org.springframework.dao.support.DaoSupport; import org.springframework.stereotype.Repository; diff --git a/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java index f036ec63..50b71e14 100644 --- a/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java @@ -16,7 +16,8 @@ package org.springframework.data.gemfire; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; diff --git a/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java index 67f72d55..5bc1c5eb 100644 --- a/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.Map; - import javax.annotation.Resource; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java index 0e24809c..3dfe0b53 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java @@ -15,7 +15,8 @@ */ package org.springframework.data.gemfire.client; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import javax.annotation.Resource; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java index e99e366a..8fa49b96 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java @@ -24,14 +24,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Resource; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.data.gemfire.ForkUtil; -import org.springframework.data.gemfire.fork.SpringCacheServerProcess; -import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/config/CreateDefinedIndexesIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/config/CreateDefinedIndexesIntegrationTest.java index a0789622..5f5d4887 100644 --- a/src/test/java/org/springframework/data/gemfire/config/CreateDefinedIndexesIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/CreateDefinedIndexesIntegrationTest.java @@ -17,7 +17,6 @@ package org.springframework.data.gemfire.config; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import java.io.Serializable; diff --git a/src/test/java/org/springframework/data/gemfire/config/TemplateClientRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/TemplateClientRegionNamespaceTest.java index 0621cce6..01f5c1e4 100644 --- a/src/test/java/org/springframework/data/gemfire/config/TemplateClientRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/TemplateClientRegionNamespaceTest.java @@ -28,7 +28,6 @@ import javax.annotation.Resource; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.StringUtils; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreatorUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreatorUnitTests.java index 95d673c8..2d1a167c 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreatorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreatorUnitTests.java @@ -15,8 +15,8 @@ */ package org.springframework.data.gemfire.repository.query; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java index 14a58d04..b13353b0 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java @@ -16,7 +16,10 @@ package org.springframework.data.gemfire.repository.sample; -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 java.util.ArrayList; import java.util.Arrays; @@ -24,8 +27,6 @@ import java.util.Calendar; import java.util.List; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.Region; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,6 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import com.gemstone.gemfire.cache.Region; + /** * The RepositoryQueriesTest class is a test suite of test cases testing the GemFire Query capability of Spring Data * GemFire Repositories. diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java index f106b1c8..2902829a 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java @@ -15,8 +15,12 @@ */ package org.springframework.data.gemfire.repository.support; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java index e1e5fa60..c857ec05 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java @@ -15,8 +15,9 @@ */ package org.springframework.data.gemfire.repository.support; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.junit.Assert.assertThat; import java.util.Collections; diff --git a/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java b/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java index f9b8edbb..55018ee6 100644 --- a/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/ClientCacheManagerTest.java @@ -12,7 +12,7 @@ */ package org.springframework.data.gemfire.support; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheTest.java b/src/test/java/org/springframework/data/gemfire/support/GemfireCacheTest.java index 21a81f42..e7933b03 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/GemfireCacheTest.java @@ -16,8 +16,8 @@ package org.springframework.data.gemfire.support; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; import java.util.Properties; diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java b/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java index c8aea7b1..de09760b 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java @@ -15,7 +15,7 @@ */ package org.springframework.data.gemfire.support; -import static org.junit.Assert.*; +import static org.junit.Assert.fail; import java.util.Map; @@ -26,7 +26,6 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.GemfireQueryException; import org.springframework.stereotype.Repository; - import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java index 32adaa28..656727d2 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java @@ -16,7 +16,9 @@ package org.springframework.data.gemfire.test; * @author David Turanski * */ + import static org.junit.Assert.assertEquals; + import org.junit.Test; import com.gemstone.gemfire.cache.Region;