diff --git a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java index 85089146..1709828b 100644 --- a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java @@ -54,6 +54,7 @@ import org.apache.geode.internal.jndi.JNDIInvoker; import org.apache.geode.pdx.PdxSerializable; import org.apache.geode.pdx.PdxSerializer; import org.apache.geode.security.SecurityManager; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; diff --git a/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java index d64b3451..a829856f 100644 --- a/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.DataPolicy; + import org.springframework.core.convert.converter.Converter; /** diff --git a/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java b/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java index 23508707..e459a087 100644 --- a/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire; import static java.util.stream.StreamSupport.stream; @@ -31,6 +30,7 @@ import java.util.Optional; import org.apache.geode.cache.DiskStore; import org.apache.geode.cache.DiskStoreFactory; import org.apache.geode.cache.GemFireCache; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.data.gemfire.config.annotation.DiskStoreConfigurer; diff --git a/src/main/java/org/springframework/data/gemfire/FixedPartitionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/FixedPartitionAttributesFactoryBean.java index 1f76480e..2c96660a 100644 --- a/src/main/java/org/springframework/data/gemfire/FixedPartitionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/FixedPartitionAttributesFactoryBean.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.FixedPartitionAttributes; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java b/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java index c6a97ecf..39d94e84 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java @@ -19,8 +19,10 @@ package org.springframework.data.gemfire; import org.apache.geode.GemFireCheckedException; import org.apache.geode.GemFireException; import org.apache.geode.cache.Region; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java b/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java index 4cf7f007..835ce97f 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java @@ -64,6 +64,7 @@ import org.apache.geode.cache.query.QueryExecutionTimeoutException; import org.apache.geode.cache.query.QueryInvalidException; import org.apache.geode.distributed.LeaseExpiredException; import org.apache.geode.security.GemFireSecurityException; + import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.DataIntegrityViolationException; diff --git a/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java b/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java index a09b639f..eb60b278 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire; import org.apache.geode.CancelException; + import org.springframework.dao.InvalidDataAccessResourceUsageException; /** diff --git a/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java b/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java index c9d07911..fd81134e 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java @@ -21,6 +21,7 @@ import org.apache.geode.cache.query.IndexExistsException; import org.apache.geode.cache.query.IndexInvalidException; import org.apache.geode.cache.query.IndexMaintenanceException; import org.apache.geode.cache.query.IndexNameConflictException; + import org.springframework.dao.DataIntegrityViolationException; /** diff --git a/src/main/java/org/springframework/data/gemfire/GemfireOperations.java b/src/main/java/org/springframework/data/gemfire/GemfireOperations.java index 1e73a1c5..5e982ff5 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireOperations.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireOperations.java @@ -19,6 +19,7 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.query.Query; import org.apache.geode.cache.query.QueryService; import org.apache.geode.cache.query.SelectResults; + import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; diff --git a/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java b/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java index 72e81ec0..462df6e1 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.query.QueryException; import org.apache.geode.cache.query.QueryExecutionTimeoutException; import org.apache.geode.cache.query.QueryInvalidException; + import org.springframework.dao.InvalidDataAccessResourceUsageException; /** diff --git a/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java b/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java index cc5d92d8..4642aa08 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire; import org.apache.geode.GemFireCheckedException; import org.apache.geode.GemFireException; + import org.springframework.dao.UncategorizedDataAccessException; /** diff --git a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java b/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java index 110b5696..85609e48 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java @@ -35,6 +35,7 @@ import org.apache.geode.cache.query.QueryInvalidException; import org.apache.geode.cache.query.QueryService; import org.apache.geode.cache.query.SelectResults; import org.apache.geode.internal.cache.LocalRegion; + import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/GemfireUtils.java b/src/main/java/org/springframework/data/gemfire/GemfireUtils.java index c86b332c..f5c24f16 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireUtils.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireUtils.java @@ -18,10 +18,12 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.CacheFactory; import org.apache.geode.internal.GemFireVersion; + +import org.w3c.dom.Element; + import org.springframework.data.gemfire.config.support.GemfireFeature; import org.springframework.data.gemfire.util.RegionUtils; import org.springframework.util.ClassUtils; -import org.w3c.dom.Element; /** * {@link GemfireUtils} is an abstract utility class encapsulating common functionality for accessing features diff --git a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java b/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java index 14c522ed..f954620c 100644 --- a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire; import static java.util.stream.StreamSupport.stream; @@ -37,6 +36,7 @@ import org.apache.geode.cache.query.IndexExistsException; import org.apache.geode.cache.query.IndexNameConflictException; import org.apache.geode.cache.query.IndexStatistics; import org.apache.geode.cache.query.QueryService; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java index b96d0bb9..edb10c46 100644 --- a/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.InterestPolicy; + import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; /** diff --git a/src/main/java/org/springframework/data/gemfire/LocatorFactoryBean.java b/src/main/java/org/springframework/data/gemfire/LocatorFactoryBean.java index c163b60a..10ef0072 100644 --- a/src/main/java/org/springframework/data/gemfire/LocatorFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/LocatorFactoryBean.java @@ -28,6 +28,7 @@ import java.util.stream.StreamSupport; import org.apache.geode.distributed.Locator; import org.apache.geode.distributed.LocatorLauncher; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.data.gemfire.config.annotation.LocatorConfigurer; diff --git a/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java index c4151ab6..2b666dd5 100644 --- a/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java @@ -25,6 +25,7 @@ import org.apache.geode.cache.PartitionAttributes; import org.apache.geode.cache.PartitionAttributesFactory; import org.apache.geode.cache.PartitionResolver; import org.apache.geode.cache.partition.PartitionListener; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.data.gemfire.support.AbstractFactoryBeanSupport; diff --git a/src/main/java/org/springframework/data/gemfire/RegionShortcutConverter.java b/src/main/java/org/springframework/data/gemfire/RegionShortcutConverter.java index 3b633ae4..ffc6a250 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionShortcutConverter.java +++ b/src/main/java/org/springframework/data/gemfire/RegionShortcutConverter.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.RegionShortcut; + import org.springframework.core.convert.converter.Converter; /** diff --git a/src/main/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverter.java index 3cc49cf5..8e57e3c2 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverter.java @@ -20,6 +20,7 @@ import java.util.Optional; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.RegionShortcut; + import org.springframework.core.convert.converter.Converter; import org.springframework.lang.Nullable; diff --git a/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java b/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java index e0714d23..d2e7ccaa 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/RegionShortcutWrapper.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.RegionShortcut; + import org.springframework.util.ObjectUtils; /** diff --git a/src/main/java/org/springframework/data/gemfire/ScopeConverter.java b/src/main/java/org/springframework/data/gemfire/ScopeConverter.java index b9c0f1cc..17ede1fe 100644 --- a/src/main/java/org/springframework/data/gemfire/ScopeConverter.java +++ b/src/main/java/org/springframework/data/gemfire/ScopeConverter.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.Scope; + import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; /** diff --git a/src/main/java/org/springframework/data/gemfire/ScopeType.java b/src/main/java/org/springframework/data/gemfire/ScopeType.java index a093e729..a3bdbbaf 100644 --- a/src/main/java/org/springframework/data/gemfire/ScopeType.java +++ b/src/main/java/org/springframework/data/gemfire/ScopeType.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.Scope; + import org.springframework.util.StringUtils; /** diff --git a/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java index ac6e7f2e..f16d4d38 100644 --- a/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.InterestPolicy; import org.apache.geode.cache.SubscriptionAttributes; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/src/main/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapter.java b/src/main/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapter.java index 85063420..54bc34c7 100644 --- a/src/main/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapter.java @@ -24,6 +24,7 @@ import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; import org.apache.geode.cache.TimeoutException; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java b/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java index 62f53a60..10e2b9ae 100644 --- a/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java +++ b/src/main/java/org/springframework/data/gemfire/cache/GemfireCache.java @@ -20,6 +20,7 @@ import java.util.concurrent.Callable; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.springframework.cache.Cache; import org.springframework.cache.support.SimpleValueWrapper; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java b/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java index 28d918b4..ccd27674 100644 --- a/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java +++ b/src/main/java/org/springframework/data/gemfire/cache/GemfireCacheManager.java @@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.cache.support.AbstractCacheManager; diff --git a/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java b/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java index 83a283cb..c71b779d 100644 --- a/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.cache.config; import org.apache.geode.cache.GemFireCache; + import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; 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 baf48c76..0b697e63 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.client; import static java.util.stream.StreamSupport.stream; @@ -36,6 +35,7 @@ import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolManager; import org.apache.geode.distributed.DistributedSystem; + import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ApplicationContextEvent; diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java index 09bc4d73..15b6d6f6 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverter.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.client; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.springframework.core.convert.converter.Converter; /** diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java index db040349..0f543a52 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverter.java @@ -20,6 +20,7 @@ import java.util.Optional; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.springframework.core.convert.converter.Converter; import org.springframework.lang.Nullable; diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java index 343aad7c..5c47cf09 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapper.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.client; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.springframework.util.ObjectUtils; /** diff --git a/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java b/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java index 5d170dcd..d56d29eb 100644 --- a/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java @@ -24,8 +24,10 @@ import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.execute.Function; import org.apache.geode.management.internal.cli.domain.RegionInformation; import org.apache.geode.management.internal.cli.functions.GetRegionsFunction; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/src/main/java/org/springframework/data/gemfire/client/Interest.java b/src/main/java/org/springframework/data/gemfire/client/Interest.java index 0e5d7f97..2eea3942 100644 --- a/src/main/java/org/springframework/data/gemfire/client/Interest.java +++ b/src/main/java/org/springframework/data/gemfire/client/Interest.java @@ -21,8 +21,10 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.apache.geode.cache.InterestResultPolicy; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.InitializingBean; import org.springframework.core.Constants; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java index 3561d79a..253205d7 100644 --- a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.client; import org.apache.geode.cache.InterestResultPolicy; + import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; /** diff --git a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java index 08921de3..3162f0bd 100644 --- a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.client; import static java.util.stream.StreamSupport.stream; @@ -35,6 +34,7 @@ import org.apache.geode.cache.client.PoolFactory; import org.apache.geode.cache.client.PoolManager; import org.apache.geode.cache.query.QueryService; import org.apache.geode.distributed.DistributedSystem; + import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java b/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java index ae9f267d..9e7fdfcb 100644 --- a/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java +++ b/src/main/java/org/springframework/data/gemfire/client/RegexInterest.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.client; import org.apache.geode.cache.InterestResultPolicy; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java b/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java index b5384141..bc3eca72 100644 --- a/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolFactory; import org.apache.geode.cache.query.QueryService; + import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.client.PoolAdapter; diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/AbstractGemfireAdminOperations.java b/src/main/java/org/springframework/data/gemfire/config/admin/AbstractGemfireAdminOperations.java index a9c5b501..77046195 100644 --- a/src/main/java/org/springframework/data/gemfire/config/admin/AbstractGemfireAdminOperations.java +++ b/src/main/java/org/springframework/data/gemfire/config/admin/AbstractGemfireAdminOperations.java @@ -20,6 +20,7 @@ import org.apache.geode.cache.DiskStore; import org.apache.geode.cache.Region; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.query.Index; + import org.springframework.data.gemfire.config.schema.SchemaObjectDefinition; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperations.java b/src/main/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperations.java index dedb7409..fff23272 100644 --- a/src/main/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperations.java +++ b/src/main/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperations.java @@ -24,6 +24,7 @@ import org.apache.geode.cache.DiskStore; import org.apache.geode.cache.Region; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.query.Index; + import org.springframework.data.gemfire.config.schema.SchemaObjectDefinition; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunction.java b/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunction.java index 951aacc4..d6ae1d2a 100644 --- a/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunction.java +++ b/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunction.java @@ -23,8 +23,10 @@ import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.query.QueryException; import org.apache.geode.cache.query.QueryService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.data.gemfire.GemfireCacheUtils; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; import org.springframework.data.gemfire.function.annotation.GemfireFunction; diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunction.java b/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunction.java index 410c1cef..6bdb60eb 100644 --- a/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunction.java +++ b/src/main/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunction.java @@ -20,8 +20,10 @@ 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.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; import org.springframework.data.gemfire.function.annotation.GemfireFunction; diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunction.java b/src/main/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunction.java index 96ccf27a..56c8dd18 100644 --- a/src/main/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunction.java +++ b/src/main/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunction.java @@ -26,6 +26,7 @@ import java.util.stream.Collectors; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.query.Index; + import org.springframework.data.gemfire.function.annotation.GemfireFunction; /** diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplate.java b/src/main/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplate.java index 40b2eee8..6f3b8a90 100644 --- a/src/main/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplate.java @@ -29,6 +29,7 @@ import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.query.Index; import org.apache.geode.management.internal.cli.domain.RegionInformation; import org.apache.geode.management.internal.cli.functions.GetRegionsFunction; + import org.springframework.data.gemfire.client.function.ListRegionsOnServerFunction; import org.springframework.data.gemfire.config.admin.AbstractGemfireAdminOperations; import org.springframework.data.gemfire.config.admin.GemfireAdminOperations; diff --git a/src/main/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplate.java b/src/main/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplate.java index 73d11f8e..58a00d16 100644 --- a/src/main/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplate.java @@ -26,6 +26,7 @@ import java.util.Optional; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.execute.Function; + import org.springframework.data.gemfire.config.admin.GemfireAdminOperations; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AdministrativeConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/AdministrativeConfiguration.java index 7beb94b8..4a5e619e 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/AdministrativeConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/AdministrativeConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.config.annotation; import org.apache.geode.cache.execute.Function; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.gemfire.config.admin.functions.CreateIndexFunction; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java index 6e44ed4d..2934d697 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java @@ -23,8 +23,10 @@ import java.util.Optional; import java.util.Properties; import org.apache.geode.management.internal.security.ResourceConstants; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java index 4ac00c44..45df166d 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java @@ -27,6 +27,7 @@ import java.lang.annotation.Target; import org.apache.geode.cache.control.ResourceManager; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.cache.server.ClientSubscriptionConfig; + import org.springframework.beans.factory.BeanFactory; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java index f33bc156..aec87f8b 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java @@ -25,6 +25,7 @@ import java.lang.annotation.Target; import org.apache.geode.cache.client.PoolFactory; import org.apache.geode.cache.control.ResourceManager; + import org.springframework.beans.factory.BeanFactory; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java index e2014de8..cfb53fde 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java @@ -32,6 +32,7 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.query.Index; + import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java index 41bfa6bd..596272f6 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java @@ -31,6 +31,7 @@ import java.util.Set; import org.apache.geode.cache.Region; import org.apache.geode.compression.Compressor; import org.apache.geode.compression.SnappyCompressor; + import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java index 0ad9fbbe..bce3593b 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java @@ -27,6 +27,7 @@ import java.lang.annotation.Target; import org.apache.geode.security.AccessControl; import org.apache.geode.security.AuthInitialize; import org.apache.geode.security.Authenticator; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java index da277794..d92d19a1 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java @@ -25,6 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.cache.Region; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java index 5acfd467..b625af2f 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java @@ -26,6 +26,7 @@ import java.lang.annotation.Target; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.cache.server.ClientSubscriptionConfig; + import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java index efdb378b..3afa7e54 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java @@ -25,6 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.cache.server.CacheServer; + import org.springframework.context.annotation.Import; /** diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegions.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegions.java index fc44c86e..2ed59885 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegions.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegions.java @@ -27,6 +27,7 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.cache.config.EnableGemfireCaching; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfiguration.java index 7bb11992..dd3e0b69 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfiguration.java @@ -26,6 +26,7 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientCache; + import org.springframework.context.annotation.Import; /** diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegions.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegions.java index c3e7e8fd..1c0d55df 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegions.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegions.java @@ -25,6 +25,7 @@ import java.lang.annotation.Target; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCompression.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCompression.java index abcb8c49..187cf2fb 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCompression.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCompression.java @@ -26,6 +26,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.cache.Region; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueries.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueries.java index b6cc7b10..13f8d7c3 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueries.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueries.java @@ -26,6 +26,7 @@ import java.util.concurrent.Executor; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.query.QueryService; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStore.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStore.java index 3615ba03..0c7dc354 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStore.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableDiskStore.java @@ -35,6 +35,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.cache.DiskStore; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AliasFor; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java index 19d14a37..685829d0 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegions.java @@ -28,6 +28,7 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; + import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java index 0df387ae..431e579c 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableEviction.java @@ -27,6 +27,7 @@ import java.lang.annotation.Target; import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.Region; import org.apache.geode.cache.util.ObjectSizer; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.eviction.EvictionActionType; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableIndexing.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableIndexing.java index 24db8706..2a048138 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableIndexing.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableIndexing.java @@ -26,6 +26,7 @@ import java.lang.annotation.Target; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.query.Index; + import org.springframework.context.annotation.Configuration; /** diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLocator.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLocator.java index 342f40dc..ee430a6e 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLocator.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableLocator.java @@ -26,6 +26,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.distributed.Locator; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java index 3db4e6c9..cf616fb5 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java @@ -25,6 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.cache.Region; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java index 31244836..c2a17c94 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java @@ -26,6 +26,7 @@ import java.lang.annotation.Target; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolFactory; + import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.GemfireUtils; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSecurity.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSecurity.java index 57aaf776..d79f222f 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSecurity.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableSecurity.java @@ -25,6 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.security.AuthInitialize; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfiguration.java index e7ff74eb..3fab5b1b 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfiguration.java @@ -23,6 +23,8 @@ import java.util.Optional; import org.apache.geode.cache.GemFireCache; +import org.aspectj.lang.annotation.Aspect; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -33,8 +35,6 @@ import org.springframework.data.gemfire.config.annotation.support.GemFireAsLastR import org.springframework.data.gemfire.config.annotation.support.GemFireAsLastResourceConnectionClosingAspect; import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.aspectj.lang.annotation.Aspect; - /** * The {@link GemFireAsLastResourceConfiguration} class is a Spring {@link Configuration @Configuration} * annotated class used to configure the Pivotal GemFire "Last Resource" SDG {@link Aspect Aspects}. diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplication.java index 30063d6c..cbb70ff6 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplication.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/LocatorApplication.java @@ -24,6 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.distributed.Locator; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java index b7040a3a..e35d7e6b 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java @@ -26,6 +26,7 @@ import java.lang.annotation.Target; import org.apache.geode.cache.Cache; import org.apache.geode.cache.control.ResourceManager; + import org.springframework.beans.factory.BeanFactory; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java index 6dab187e..7b5a9443 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java @@ -23,6 +23,7 @@ import org.apache.geode.LogWriter; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.security.AuthInitialize; import org.apache.geode.security.AuthenticationFailedException; + import org.springframework.context.EnvironmentAware; import org.springframework.core.env.Environment; import org.springframework.data.gemfire.support.WiringDeclarableSupport; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupport.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupport.java index 0d7a229f..d842fff6 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupport.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupport.java @@ -32,10 +32,12 @@ import javax.resource.ResourceException; import org.apache.geode.cache.GemFireCache; import org.apache.geode.ra.GFConnection; import org.apache.geode.ra.GFConnectionFactory; + import org.aspectj.lang.annotation.Pointcut; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.event.Level; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.Ordered; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/CacheTypeAwareRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/CacheTypeAwareRegionFactoryBean.java index 40dc2965..280cc100 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/CacheTypeAwareRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/CacheTypeAwareRegionFactoryBean.java @@ -37,6 +37,7 @@ import org.apache.geode.cache.Scope; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.compression.Compressor; + import org.springframework.beans.factory.FactoryBean; import org.springframework.context.SmartLifecycle; import org.springframework.data.gemfire.GemfireUtils; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspect.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspect.java index fa5983dd..94b45101 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspect.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspect.java @@ -21,8 +21,10 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newR import javax.naming.NamingException; import org.apache.geode.ra.GFConnectionFactory; + import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; + import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireComponentClassTypeScanner.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireComponentClassTypeScanner.java index 483987df..b1c970cb 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireComponentClassTypeScanner.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/GemFireComponentClassTypeScanner.java @@ -32,6 +32,7 @@ import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.core.env.Environment; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/RegionDataAccessTracingAspect.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/RegionDataAccessTracingAspect.java index 0671265d..eb5b76c8 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/RegionDataAccessTracingAspect.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/RegionDataAccessTracingAspect.java @@ -26,6 +26,7 @@ import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.util.ObjectUtils; /** diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectCollector.java b/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectCollector.java index b6f18eb9..df186a70 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectCollector.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectCollector.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.Set; import org.apache.geode.cache.GemFireCache; + import org.springframework.context.ApplicationContext; /** diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinition.java b/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinition.java index 28c298a7..85fc348c 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinition.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinition.java @@ -23,6 +23,7 @@ import java.util.Optional; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.Index; + import org.springframework.core.Ordered; import org.springframework.data.gemfire.config.admin.GemfireAdminOperations; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinition.java b/src/main/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinition.java index 7e8a3bf0..687600fa 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinition.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinition.java @@ -25,6 +25,7 @@ import java.util.Optional; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.Index; + import org.springframework.data.gemfire.IndexType; import org.springframework.data.gemfire.config.admin.GemfireAdminOperations; import org.springframework.data.gemfire.config.schema.SchemaObjectDefinition; diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinition.java b/src/main/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinition.java index 33db80f1..a3856e10 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinition.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinition.java @@ -25,6 +25,7 @@ import java.util.Optional; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; + import org.springframework.data.gemfire.config.admin.GemfireAdminOperations; import org.springframework.data.gemfire.config.schema.SchemaObjectDefinition; import org.springframework.data.gemfire.config.schema.SchemaObjectType; diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollector.java b/src/main/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollector.java index 7c99b595..5c6db937 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollector.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollector.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.util.RegionUtils; diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollector.java b/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollector.java index 6d30007b..22234b5d 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollector.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollector.java @@ -29,6 +29,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import org.apache.geode.cache.GemFireCache; + import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.config.schema.SchemaObjectCollector; import org.springframework.lang.Nullable; diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexCollector.java b/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexCollector.java index aa95d437..80c2e4bd 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexCollector.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexCollector.java @@ -21,6 +21,7 @@ import java.util.stream.Collectors; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.query.Index; + import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.config.schema.SchemaObjectCollector; diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexDefiner.java b/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexDefiner.java index 98e6f2ee..ab600ee3 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexDefiner.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/support/IndexDefiner.java @@ -22,6 +22,7 @@ import java.util.Optional; import java.util.Set; import org.apache.geode.cache.query.Index; + import org.springframework.data.gemfire.config.schema.SchemaObjectDefiner; import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionCollector.java b/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionCollector.java index 4d1a2497..cdcc3edf 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionCollector.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionCollector.java @@ -21,6 +21,7 @@ import java.util.stream.Collectors; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.config.schema.SchemaObjectCollector; diff --git a/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionDefiner.java b/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionDefiner.java index 4ecdb49b..97103e4e 100644 --- a/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionDefiner.java +++ b/src/main/java/org/springframework/data/gemfire/config/schema/support/RegionDefiner.java @@ -23,6 +23,7 @@ import java.util.Set; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; + import org.springframework.data.gemfire.config.schema.SchemaObjectDefiner; import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; diff --git a/src/main/java/org/springframework/data/gemfire/config/support/AbstractDependencyStructuringBeanFactoryPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/AbstractDependencyStructuringBeanFactoryPostProcessor.java index 7655f6cd..6c37f270 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/AbstractDependencyStructuringBeanFactoryPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/AbstractDependencyStructuringBeanFactoryPostProcessor.java @@ -22,6 +22,7 @@ import java.util.function.Predicate; import org.apache.geode.cache.Region; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.query.Index; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java index 064979d3..8e2c5079 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java @@ -24,6 +24,7 @@ import java.util.Set; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; diff --git a/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java index c17571e5..f9feaf91 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java @@ -25,6 +25,7 @@ import org.apache.geode.cache.InterestPolicy; import org.apache.geode.cache.InterestResultPolicy; import org.apache.geode.cache.Scope; import org.apache.geode.cache.util.Gateway; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -63,7 +64,6 @@ public class CustomEditorBeanFactoryPostProcessor implements BeanFactoryPostProc * {@inheritDoc} */ @Override - @SuppressWarnings("all") public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { beanFactory.registerCustomEditor(ConnectionEndpoint.class, StringToConnectionEndpointConverter.class); @@ -89,7 +89,6 @@ public class CustomEditorBeanFactoryPostProcessor implements BeanFactoryPostProc * {@inheritDoc} */ @Override - @SuppressWarnings("all") public Iterable convert(ConnectionEndpoint[] source) { return ConnectionEndpointList.from(source); } @@ -103,7 +102,6 @@ public class CustomEditorBeanFactoryPostProcessor implements BeanFactoryPostProc * {@inheritDoc} */ @Override - @SuppressWarnings("all") public ConnectionEndpoint convert(String source) { return assertConverted(source, ConnectionEndpoint.parse(source), ConnectionEndpoint.class); } @@ -117,7 +115,6 @@ public class CustomEditorBeanFactoryPostProcessor implements BeanFactoryPostProc * {@inheritDoc} */ @Override - @SuppressWarnings("all") public ConnectionEndpointList convert(String source) { return assertConverted(source, ConnectionEndpointList.parse(0, source.split(",")), ConnectionEndpointList.class); diff --git a/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java b/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java index 64e97d20..ab1cd6c9 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java @@ -20,8 +20,10 @@ import java.util.Optional; import org.apache.geode.cache.query.MultiIndexCreationException; import org.apache.geode.cache.query.QueryService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; diff --git a/src/main/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessor.java index db2dcb2f..3d634987 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessor.java @@ -21,6 +21,7 @@ import java.lang.reflect.Field; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.data.gemfire.DiskStoreFactoryBean.DiskDir; diff --git a/src/main/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessor.java index 39b79809..0228257f 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessor.java @@ -23,6 +23,7 @@ import java.util.Optional; import org.apache.geode.cache.Region; import org.apache.geode.cache.lucene.LuceneIndex; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; diff --git a/src/main/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessor.java index 05eb26b3..a52fedaf 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessor.java @@ -23,6 +23,7 @@ import java.util.Arrays; import org.apache.geode.cache.DiskStore; import org.apache.geode.cache.Region; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AbstractPeerRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/AbstractPeerRegionParser.java index cde31c15..41b8b403 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/AbstractPeerRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/AbstractPeerRegionParser.java @@ -19,11 +19,11 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; import org.apache.geode.cache.wan.GatewaySender; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.w3c.dom.Element; - /** * Abstract Spring XML Parser for peer {@link Region} bean definitions. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java index f50b7a96..a1368e49 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java @@ -22,6 +22,10 @@ import java.util.Optional; import org.apache.geode.cache.Region; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.w3c.dom.Element; + import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; @@ -36,10 +40,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.w3c.dom.Element; - /** * Abstract base class encapsulating functionality common to all Region parsers. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AnnotationDrivenParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/AnnotationDrivenParser.java index 70214fd6..0a0d0cd3 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/AnnotationDrivenParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/AnnotationDrivenParser.java @@ -13,6 +13,8 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -20,7 +22,6 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.function.config.GemfireFunctionBeanPostProcessor; -import org.w3c.dom.Element; /** * A Spring {@link BeanDefinitionParser} Pivotal GemFire Function annotation support. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueParser.java index 757f9ee1..09fab387 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueParser.java @@ -16,6 +16,8 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; @@ -24,7 +26,6 @@ import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.data.gemfire.wan.AsyncEventQueueFactoryBean; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:async-event-queue> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/AutoRegionLookupParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/AutoRegionLookupParser.java index 331c7d7c..d34b65c5 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/AutoRegionLookupParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/AutoRegionLookupParser.java @@ -16,6 +16,8 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -23,7 +25,6 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.config.support.AutoRegionLookupBeanPostProcessor; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:auto-region-lookup> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/CacheParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/CacheParser.java index 53f0ed73..55343bea 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/CacheParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/CacheParser.java @@ -20,6 +20,11 @@ import java.util.List; import java.util.Optional; import org.apache.geode.internal.datasource.ConfigProperty; + +import org.w3c.dom.Attr; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -36,9 +41,6 @@ import org.springframework.data.gemfire.config.support.PdxDiskStoreAwareBeanFact import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Attr; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; /** * Bean definition parser for the <gfe:cache> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/CacheServerParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/CacheServerParser.java index 9f2119cd..2a284549 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/CacheServerParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/CacheServerParser.java @@ -16,6 +16,9 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Attr; +import org.w3c.dom.Element; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -25,8 +28,6 @@ import org.springframework.data.gemfire.server.CacheServerFactoryBean; import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Attr; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:cache-server< SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ClientCacheParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/ClientCacheParser.java index 0ba96a04..c78dc1da 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/ClientCacheParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/ClientCacheParser.java @@ -16,10 +16,11 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:client-cache> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java index 3e4a12e6..fbacda79 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java @@ -21,6 +21,8 @@ package org.springframework.data.gemfire.config.xml; import java.util.List; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.xml.ParserContext; @@ -33,8 +35,6 @@ import org.springframework.data.repository.query.QueryLookupStrategy; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; - /** * Bean definition parser for the <gfe:client-region> SDG XML namespace (XSD) element. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/DiskStoreParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/DiskStoreParser.java index 8024fa8c..7a2df3be 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/DiskStoreParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/DiskStoreParser.java @@ -19,6 +19,8 @@ package org.springframework.data.gemfire.config.xml; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import org.w3c.dom.Element; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -31,7 +33,6 @@ import org.springframework.data.gemfire.DiskStoreFactoryBean.DiskDir; import org.springframework.data.gemfire.config.support.DiskStoreDirectoryBeanPostProcessor; import org.springframework.util.CollectionUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:disk-store> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java index 053e1f8e..c598b0d8 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/FunctionServiceParser.java @@ -16,6 +16,8 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -24,7 +26,6 @@ import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.function.FunctionServiceFactoryBean; import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:function-service> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GatewayReceiverParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/GatewayReceiverParser.java index 1219e240..b8369366 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/GatewayReceiverParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/GatewayReceiverParser.java @@ -16,12 +16,13 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.data.gemfire.wan.GatewayReceiverFactoryBean; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:gateway-receiver> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GatewaySenderParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/GatewaySenderParser.java index b2af19a3..f5523494 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/GatewaySenderParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/GatewaySenderParser.java @@ -16,6 +16,8 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; @@ -23,7 +25,6 @@ import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.data.gemfire.wan.GatewaySenderFactoryBean; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:gateway-sender> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataSourceParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataSourceParser.java index e1b1bf81..979e461b 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataSourceParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/GemfireDataSourceParser.java @@ -15,6 +15,8 @@ package org.springframework.data.gemfire.config.xml; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.w3c.dom.Element; + import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; @@ -23,7 +25,6 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.client.GemfireDataSourcePostProcessor; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe-data:datasource> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireListenerContainerParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/GemfireListenerContainerParser.java index 4f8497b6..7408b624 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireListenerContainerParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/GemfireListenerContainerParser.java @@ -18,6 +18,8 @@ package org.springframework.data.gemfire.config.xml; import java.util.List; +import org.w3c.dom.Element; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.ManagedSet; @@ -28,7 +30,6 @@ import org.springframework.data.gemfire.listener.ContinuousQueryListenerContaine import org.springframework.data.gemfire.listener.adapter.ContinuousQueryListenerAdapter; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:cq-listener-container> element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireRegionAutoProxyParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/GemfireRegionAutoProxyParser.java index 096ace74..705a8c82 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/GemfireRegionAutoProxyParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/GemfireRegionAutoProxyParser.java @@ -15,6 +15,8 @@ package org.springframework.data.gemfire.config.xml; import java.util.Collections; +import org.w3c.dom.Element; + import org.springframework.aop.config.AopNamespaceUtils; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -24,7 +26,6 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.serialization.json.JSONRegionAdvice; import org.springframework.util.StringUtils; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe-data:json-region-auto-proxy< SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/IndexParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/IndexParser.java index ba55dac0..267f30f8 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/IndexParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/IndexParser.java @@ -18,6 +18,8 @@ package org.springframework.data.gemfire.config.xml; import java.util.concurrent.atomic.AtomicBoolean; +import org.w3c.dom.Element; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -26,7 +28,6 @@ import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.IndexFactoryBean; import org.springframework.data.gemfire.config.support.DefinedIndexesApplicationListener; -import org.w3c.dom.Element; /** * Bean definition parser for <gfe:index> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/LocalRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/LocalRegionParser.java index b3b830c7..1d2bbe9a 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/LocalRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/LocalRegionParser.java @@ -15,13 +15,13 @@ */ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.LocalRegionFactoryBean; import org.springframework.data.gemfire.RegionAttributesFactoryBean; -import org.w3c.dom.Element; - /** * Bean definition parser for the <gfe:local-region> SDG XML namespace (XSD) element. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java index 2bcf57ca..35e19281 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/LookupRegionParser.java @@ -18,13 +18,13 @@ package org.springframework.data.gemfire.config.xml; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; import org.apache.geode.cache.wan.GatewaySender; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.LookupRegionFactoryBean; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; - /** * Bean definition parser for the <gfe:lookup-region> SDG XML namespace (XSD) element. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/LuceneIndexParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/LuceneIndexParser.java index 18518efc..3dfc0b34 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/LuceneIndexParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/LuceneIndexParser.java @@ -21,13 +21,14 @@ import java.util.Arrays; import java.util.Optional; import java.util.stream.Collectors; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; /** * Spring XML {@link AbstractSingleBeanDefinitionParser parser} for the {@link LuceneIndexFactoryBean} bean definition. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/LuceneServiceParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/LuceneServiceParser.java index 3fd1e3e8..5665e21d 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/LuceneServiceParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/LuceneServiceParser.java @@ -17,10 +17,11 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.data.gemfire.search.lucene.LuceneServiceFactoryBean; -import org.w3c.dom.Element; /** * Spring XML {@link AbstractSingleBeanDefinitionParser parser} for a {@link LuceneServiceFactoryBean} bean definition. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java b/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java index 4331082e..c6ba37b4 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java @@ -21,6 +21,8 @@ import org.apache.geode.cache.LossAction; import org.apache.geode.cache.MembershipAttributes; import org.apache.geode.cache.ResumptionAction; +import org.w3c.dom.Element; + import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; @@ -37,8 +39,6 @@ import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; - /** * Utilities used by SDG XML Namespace Parsers. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/PartitionedRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/PartitionedRegionParser.java index 3ded7f44..3f41790d 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/PartitionedRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/PartitionedRegionParser.java @@ -17,6 +17,8 @@ package org.springframework.data.gemfire.config.xml; import java.util.List; +import org.w3c.dom.Element; + import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -30,8 +32,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; - /** * Bean definition parser for the <gfe:partitioned-region> SDG XML namespace (XSD) element. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/PoolParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/PoolParser.java index 5c052c4c..203f617f 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/PoolParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/PoolParser.java @@ -22,6 +22,8 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; +import org.w3c.dom.Element; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.MethodInvokingBean; @@ -40,7 +42,6 @@ import org.springframework.data.gemfire.support.ConnectionEndpointList; import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; /** * Bean definition parser for <gfe:pool> SDG XML namespace (XSD) elements. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionParser.java index 7bd8aa47..9a2c2785 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionParser.java @@ -15,13 +15,13 @@ */ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.RegionAttributesFactoryBean; import org.springframework.data.gemfire.ReplicatedRegionFactoryBean; -import org.w3c.dom.Element; - /** * Bean definition parser for the <gfe:replicated-region> SDG XML namespace (XSD) element. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/SnapshotServiceParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/SnapshotServiceParser.java index be760b88..47f7da26 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/SnapshotServiceParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/SnapshotServiceParser.java @@ -18,6 +18,8 @@ package org.springframework.data.gemfire.config.xml; import static org.springframework.data.gemfire.util.CollectionUtils.nullSafeList; +import org.w3c.dom.Element; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.ManagedList; @@ -25,7 +27,6 @@ import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean; import org.springframework.util.xml.DomUtils; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe-data:snapshot-service> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java index 2fe2682c..cfb1feef 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java @@ -15,13 +15,13 @@ */ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.PeerRegionFactoryBean; import org.springframework.data.gemfire.RegionAttributesFactoryBean; -import org.w3c.dom.Element; - /** * Bean definition parser for <gfe:*-region-template> SDG XML namespace (XSD) elements. * diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/TransactionManagerParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/TransactionManagerParser.java index 01c5c97a..df6cb705 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/TransactionManagerParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/TransactionManagerParser.java @@ -16,6 +16,8 @@ package org.springframework.data.gemfire.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -23,7 +25,6 @@ import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.transaction.GemfireTransactionManager; import org.springframework.util.StringUtils; -import org.w3c.dom.Element; /** * Bean definition parser for the <gfe:transaction-manager> SDG XML namespace (XSD) element. diff --git a/src/main/java/org/springframework/data/gemfire/dao/GemfireDaoSupport.java b/src/main/java/org/springframework/data/gemfire/dao/GemfireDaoSupport.java index bdc6b664..d14bec03 100644 --- a/src/main/java/org/springframework/data/gemfire/dao/GemfireDaoSupport.java +++ b/src/main/java/org/springframework/data/gemfire/dao/GemfireDaoSupport.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.dao; import org.apache.geode.cache.Region; + import org.springframework.dao.support.DaoSupport; import org.springframework.data.gemfire.GemfireOperations; import org.springframework.data.gemfire.GemfireTemplate; diff --git a/src/main/java/org/springframework/data/gemfire/eviction/EvictingRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/eviction/EvictingRegionFactoryBean.java index 444da9be..7033961a 100644 --- a/src/main/java/org/springframework/data/gemfire/eviction/EvictingRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictingRegionFactoryBean.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.eviction; import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.Region; + import org.springframework.beans.factory.FactoryBean; /** diff --git a/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java b/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java index c1187f46..663db856 100644 --- a/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionActionConverter.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.eviction; import org.apache.geode.cache.EvictionAction; + import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; /** diff --git a/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java index 3c2dbfe9..4b9bd2e3 100644 --- a/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBean.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire.eviction; import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.util.ObjectSizer; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java index 813ca0cf..81b1c95d 100644 --- a/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationActionConverter.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.expiration; import org.apache.geode.cache.ExpirationAction; + import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; /** diff --git a/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java index 45382a5b..6a4110cd 100644 --- a/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBean.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.expiration; import org.apache.geode.cache.ExpirationAction; import org.apache.geode.cache.ExpirationAttributes; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/src/main/java/org/springframework/data/gemfire/expiration/ExpiringRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/expiration/ExpiringRegionFactoryBean.java index aaf3be74..2ad90267 100644 --- a/src/main/java/org/springframework/data/gemfire/expiration/ExpiringRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/expiration/ExpiringRegionFactoryBean.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire.expiration; import org.apache.geode.cache.CustomExpiry; import org.apache.geode.cache.ExpirationAttributes; import org.apache.geode.cache.Region; + import org.springframework.beans.factory.FactoryBean; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/BatchingResultSender.java b/src/main/java/org/springframework/data/gemfire/function/BatchingResultSender.java index adfa6e9c..2750c611 100644 --- a/src/main/java/org/springframework/data/gemfire/function/BatchingResultSender.java +++ b/src/main/java/org/springframework/data/gemfire/function/BatchingResultSender.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.ResultSender; + import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java b/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java index 29f55366..e45c7595 100644 --- a/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java +++ b/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java @@ -23,8 +23,10 @@ import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.RegionFunctionContext; import org.apache.geode.cache.execute.ResultSender; import org.apache.geode.cache.partition.PartitionRegionHelper; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.data.gemfire.function.annotation.Filter; import org.springframework.data.gemfire.function.annotation.RegionData; import org.springframework.data.gemfire.util.ArrayUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/FunctionServiceFactoryBean.java b/src/main/java/org/springframework/data/gemfire/function/FunctionServiceFactoryBean.java index 89450002..5f2cf0f7 100644 --- a/src/main/java/org/springframework/data/gemfire/function/FunctionServiceFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/function/FunctionServiceFactoryBean.java @@ -19,8 +19,10 @@ import java.util.List; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java b/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java index f5106be5..3d64b013 100644 --- a/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java +++ b/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java @@ -29,8 +29,10 @@ import java.util.stream.Stream; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.security.ResourcePermission; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.BeanUtils; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.annotation.AnnotationUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java b/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java index 12bdbef5..fe7b093e 100644 --- a/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java +++ b/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java @@ -22,6 +22,7 @@ import org.apache.geode.cache.CacheClosedException; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.pdx.PdxInstance; + import org.springframework.util.ClassUtils; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java b/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java index 4b14e091..62b5f086 100644 --- a/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java @@ -24,8 +24,10 @@ import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.ResultSender; import org.apache.geode.management.internal.security.ResourcePermissions; import org.apache.geode.security.ResourcePermission; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.util.ObjectUtils; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionBeanDefinitionBuilder.java b/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionBeanDefinitionBuilder.java index 3399f6e0..5cd276e7 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionBeanDefinitionBuilder.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionBeanDefinitionBuilder.java @@ -20,6 +20,7 @@ import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; 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 305874d6..87e96a95 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 @@ -28,6 +28,7 @@ import java.util.stream.StreamSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.context.annotation.ScannedGenericBeanDefinition; import org.springframework.core.io.ResourceLoader; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java b/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java index d0a69e08..270a6f09 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java @@ -16,10 +16,11 @@ */ package org.springframework.data.gemfire.function.config; +import org.w3c.dom.Element; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.w3c.dom.Element; /** * Parser for a <function-executions> bean definition. diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java b/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java index ca8ad6b0..7d2872fc 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java @@ -22,6 +22,8 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI import java.util.Optional; import java.util.Set; +import org.w3c.dom.Element; + import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.xml.ParserContext; @@ -37,7 +39,6 @@ import org.springframework.data.gemfire.function.annotation.OnServer; import org.springframework.data.gemfire.function.annotation.OnServers; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.w3c.dom.Element; /** * {@link ImportBeanDefinitionRegistrar} for {@link EnableGemfireFunctionExecutions}, which scans for interfaces diff --git a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java b/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java index 5eb0ec08..288082e3 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java @@ -20,6 +20,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import org.apache.geode.cache.execute.Function; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.annotation.AnnotationAttributes; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/TypeFilterParser.java b/src/main/java/org/springframework/data/gemfire/function/config/TypeFilterParser.java index 72b159b6..c1b8f7fe 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/TypeFilterParser.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/TypeFilterParser.java @@ -23,6 +23,10 @@ import java.util.HashSet; import java.util.Optional; import java.util.regex.Pattern; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + import org.springframework.beans.BeanUtils; import org.springframework.beans.FatalBeanException; import org.springframework.beans.factory.parsing.ReaderContext; @@ -35,9 +39,6 @@ import org.springframework.core.type.filter.AssignableTypeFilter; import org.springframework.core.type.filter.RegexPatternTypeFilter; import org.springframework.core.type.filter.TypeFilter; import org.springframework.util.Assert; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** <<<<<<< Updated upstream diff --git a/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java b/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java index a9705dc2..45e752df 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java @@ -18,12 +18,13 @@ package org.springframework.data.gemfire.function.config; import java.util.Arrays; +import org.w3c.dom.Element; + import org.springframework.beans.factory.xml.ParserContext; import org.springframework.core.type.filter.TypeFilter; import org.springframework.data.gemfire.function.config.TypeFilterParser.Type; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.w3c.dom.Element; /** * @author David Turanski diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java index 7994bf68..40b35ea7 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java @@ -22,8 +22,10 @@ import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionException; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.cache.execute.ResultCollector; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java index e1dace7c..ed40a9b2 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java @@ -15,6 +15,7 @@ package org.springframework.data.gemfire.function.execution; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.ResultCollector; + import org.springframework.beans.factory.InitializingBean; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java index 70bb32d8..70cb35f2 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java @@ -15,6 +15,7 @@ package org.springframework.data.gemfire.function.execution; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.distributed.DistributedMember; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java b/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java index eac369ef..33c41d83 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java @@ -19,6 +19,7 @@ import java.util.Map; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; + import org.springframework.data.gemfire.function.annotation.FunctionId; import org.springframework.util.ReflectionUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java index a9daaf93..caf629dc 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java @@ -22,6 +22,7 @@ import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.BeanClassLoaderAware; diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java index 64512dc3..8f4fb1c8 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java @@ -16,6 +16,7 @@ import java.util.Set; import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.Function; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java index 187c186d..679f71b7 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java @@ -23,6 +23,7 @@ import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolManager; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; + import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.util.CacheUtils; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java index a6d66b81..6349d1f4 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java @@ -16,6 +16,7 @@ package org.springframework.data.gemfire.function.execution; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionService; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java index ef33e800..8553a99a 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java @@ -16,6 +16,7 @@ package org.springframework.data.gemfire.function.execution; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionService; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java index be570970..99120760 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java @@ -16,6 +16,7 @@ package org.springframework.data.gemfire.function.execution; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.FunctionService; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java index fba3ef06..c5d8835a 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java @@ -16,6 +16,7 @@ package org.springframework.data.gemfire.function.execution; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.FunctionService; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java index 406e99a1..f8ed075c 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java @@ -17,6 +17,7 @@ import java.util.Set; import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.FunctionService; + import org.springframework.util.CollectionUtils; /** diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java index cc9640da..cae42444 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java @@ -16,6 +16,7 @@ package org.springframework.data.gemfire.function.execution; import org.apache.geode.cache.RegionService; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.FunctionService; + import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java index 73e5f02d..f7c8a59d 100644 --- a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java +++ b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java @@ -44,8 +44,10 @@ import org.apache.geode.cache.query.CqListener; import org.apache.geode.cache.query.CqQuery; import org.apache.geode.cache.query.QueryException; import org.apache.geode.cache.query.QueryService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; diff --git a/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java b/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java index f478c1d7..41b0733f 100644 --- a/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java @@ -26,8 +26,10 @@ import java.util.Optional; import org.apache.geode.cache.Operation; import org.apache.geode.cache.query.CqEvent; import org.apache.geode.cache.query.CqQuery; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.gemfire.listener.ContinuousQueryListener; diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java b/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java index e4004c4a..9c6b4a9e 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.mapping; import org.springframework.data.gemfire.mapping.model.GemfireSimpleTypeHolder; diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java index 46f72123..10a5a309 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.mapping; import org.apache.geode.pdx.PdxReader; + import org.springframework.data.mapping.model.PropertyValueProvider; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java b/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java index 8a097e79..e51d3768 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java @@ -28,8 +28,10 @@ import java.util.function.Predicate; import org.apache.geode.pdx.PdxReader; import org.apache.geode.pdx.PdxSerializer; import org.apache.geode.pdx.PdxWriter; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; diff --git a/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java b/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java index 0aff2769..6da41b8a 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java @@ -16,6 +16,7 @@ package org.springframework.data.gemfire.mapping; import org.apache.geode.pdx.PdxReader; + import org.springframework.expression.EvaluationContext; import org.springframework.expression.PropertyAccessor; import org.springframework.expression.TypedValue; diff --git a/src/main/java/org/springframework/data/gemfire/mapping/Regions.java b/src/main/java/org/springframework/data/gemfire/mapping/Regions.java index f0c0a5a7..4f607a12 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/Regions.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/Regions.java @@ -23,6 +23,7 @@ import java.util.Map; import java.util.Optional; import org.apache.geode.cache.Region; + import org.springframework.data.mapping.context.MappingContext; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java b/src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java index aa7e3c14..4c6ca6ef 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/annotation/ClientRegion.java @@ -27,6 +27,7 @@ import java.lang.annotation.Target; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; + import org.springframework.core.annotation.AliasFor; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java b/src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java index df283068..b63ab281 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/annotation/Indexed.java @@ -25,6 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.cache.query.Index; + import org.springframework.core.annotation.AliasFor; import org.springframework.data.gemfire.IndexType; import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; diff --git a/src/main/java/org/springframework/data/gemfire/mapping/annotation/LuceneIndexed.java b/src/main/java/org/springframework/data/gemfire/mapping/annotation/LuceneIndexed.java index 46abcfa0..d8821278 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/annotation/LuceneIndexed.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/annotation/LuceneIndexed.java @@ -25,6 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.cache.lucene.LuceneIndex; + import org.springframework.core.annotation.AliasFor; import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; import org.springframework.data.gemfire.mapping.GemfirePersistentProperty; diff --git a/src/main/java/org/springframework/data/gemfire/repository/GemfireRepository.java b/src/main/java/org/springframework/data/gemfire/repository/GemfireRepository.java index cb3d73c2..dc056e4e 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/GemfireRepository.java +++ b/src/main/java/org/springframework/data/gemfire/repository/GemfireRepository.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.repository; import org.springframework.data.domain.Sort; diff --git a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java b/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java index d9671404..ba8eb078 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java @@ -29,6 +29,7 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import org.apache.geode.cache.Region; + import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.gemfire.repository.support.GemfireRepositoryFactory; import org.springframework.data.repository.cdi.CdiRepositoryBean; diff --git a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java b/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java index 1d6c8965..6fdc8c60 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java +++ b/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java @@ -32,8 +32,10 @@ import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.ProcessBean; import org.apache.geode.cache.Region; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.repository.cdi.CdiRepositoryBean; import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport; diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java b/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java index e15c286d..bd3cce7f 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.repository.query; import org.apache.geode.cache.Region; + import org.springframework.data.repository.core.EntityInformation; /** diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreator.java b/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreator.java index a5bd98d6..4b1eacf9 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreator.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryCreator.java @@ -20,6 +20,7 @@ import java.util.Iterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.data.domain.Sort; import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; import org.springframework.data.repository.query.parser.AbstractQueryCreator; diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java b/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java index 15efb8ab..ea883090 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.repository.query; import org.apache.geode.cache.Region; + import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; import org.springframework.data.gemfire.repository.query.support.OqlKeyword; import org.springframework.data.repository.query.parser.PartTree; diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java b/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java index bb8a4800..650872d8 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java @@ -25,6 +25,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.geode.cache.Region; + import org.springframework.data.domain.Sort; import org.springframework.data.gemfire.repository.query.support.OqlKeyword; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java b/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java index 0ed94400..b41fe324 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Collections; import org.apache.geode.cache.query.SelectResults; + import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.repository.Repository; diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java index 07e7c6f2..c4eb69fe 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java +++ b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.repository.support; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; @@ -23,6 +22,7 @@ import java.lang.reflect.Method; import java.util.Optional; import org.apache.geode.cache.Region; + import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; import org.springframework.data.gemfire.mapping.GemfirePersistentProperty; diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java index 7090e2aa..a6e32f80 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.repository.support; import java.util.ArrayList; @@ -25,7 +24,12 @@ import java.util.WeakHashMap; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + import org.apache.geode.cache.Region; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Autowired; @@ -47,10 +51,6 @@ import org.springframework.data.util.TypeInformation; import org.springframework.lang.NonNull; import org.springframework.util.Assert; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - /** * {@link FactoryBean} adapter for {@link GemfireRepositoryFactory}. * diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java b/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java index 712de183..be78c868 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java +++ b/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.repository.support; import java.util.Collection; @@ -29,6 +28,7 @@ import org.apache.geode.cache.CacheTransactionManager; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.SelectResults; + import org.springframework.data.domain.Sort; import org.springframework.data.gemfire.GemfireCallback; import org.springframework.data.gemfire.GemfireTemplate; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java index 60eb9387..00a8a704 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneAccessor.java @@ -29,6 +29,7 @@ import org.apache.geode.cache.lucene.LuceneQueryException; import org.apache.geode.cache.lucene.LuceneQueryFactory; import org.apache.geode.cache.lucene.LuceneService; import org.apache.geode.cache.lucene.LuceneServiceProvider; + import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataRetrievalFailureException; import org.springframework.data.gemfire.search.lucene.support.LuceneOperationsSupport; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java index 6b7c69d6..0ec07391 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBean.java @@ -38,6 +38,7 @@ import org.apache.geode.cache.lucene.LuceneIndexFactory; import org.apache.geode.cache.lucene.LuceneSerializer; import org.apache.geode.cache.lucene.LuceneService; import org.apache.geode.cache.lucene.LuceneServiceProvider; + import org.apache.lucene.analysis.Analyzer; import org.springframework.beans.factory.DisposableBean; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBean.java b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBean.java index 836709aa..69aa1d6b 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBean.java @@ -22,6 +22,7 @@ import java.util.Optional; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.lucene.LuceneService; import org.apache.geode.cache.lucene.LuceneServiceProvider; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.data.gemfire.support.AbstractFactoryBeanSupport; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneTemplate.java b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneTemplate.java index 5ee4d80d..3ef335a3 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/LuceneTemplate.java @@ -27,6 +27,7 @@ import org.apache.geode.cache.lucene.LuceneQueryFactory; import org.apache.geode.cache.lucene.LuceneQueryProvider; import org.apache.geode.cache.lucene.LuceneResultStruct; import org.apache.geode.cache.lucene.PageableLuceneQueryResults; + import org.springframework.data.gemfire.search.lucene.support.LuceneAccessorSupport; /** diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessor.java b/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessor.java index 06111389..97c619a1 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessor.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessor.java @@ -24,6 +24,7 @@ import java.util.stream.Collectors; import org.apache.geode.cache.Region; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneResultStruct; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperations.java b/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperations.java index 9ecffa50..859fbe1f 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperations.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperations.java @@ -20,6 +20,7 @@ package org.springframework.data.gemfire.search.lucene; import java.util.List; import org.apache.geode.cache.lucene.LuceneQueryProvider; + import org.springframework.data.domain.Page; /** diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplate.java b/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplate.java index 96c5d015..ed45d784 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplate.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.geode.cache.Region; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneQueryProvider; + import org.springframework.data.domain.Page; /** diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneAccessorSupport.java b/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneAccessorSupport.java index b3de0062..795517c6 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneAccessorSupport.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneAccessorSupport.java @@ -27,6 +27,7 @@ import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneQueryProvider; import org.apache.geode.cache.lucene.LuceneResultStruct; import org.apache.geode.cache.lucene.PageableLuceneQueryResults; + import org.springframework.data.gemfire.search.lucene.LuceneAccessor; import org.springframework.data.gemfire.util.RuntimeExceptionFactory; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneOperationsSupport.java b/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneOperationsSupport.java index d75b5844..716f8a11 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneOperationsSupport.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/support/LuceneOperationsSupport.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.geode.cache.lucene.LuceneQueryProvider; import org.apache.geode.cache.lucene.LuceneResultStruct; import org.apache.geode.cache.lucene.PageableLuceneQueryResults; + import org.springframework.data.gemfire.search.lucene.LuceneOperations; import org.springframework.data.gemfire.util.RuntimeExceptionFactory; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/LucenePage.java b/src/main/java/org/springframework/data/gemfire/search/lucene/support/LucenePage.java index 6e2b7f80..a12d65ae 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/support/LucenePage.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/support/LucenePage.java @@ -28,6 +28,7 @@ import java.util.stream.Collectors; import org.apache.geode.cache.lucene.LuceneResultStruct; import org.apache.geode.cache.lucene.PageableLuceneQueryResults; + import org.springframework.data.domain.Page; import org.springframework.data.gemfire.domain.support.AbstractPageSupport; import org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptor.java b/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptor.java index 79fb5208..59574a03 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptor.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptor.java @@ -20,10 +20,12 @@ package org.springframework.data.gemfire.search.lucene.support; import java.lang.reflect.Method; import java.util.Arrays; -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; import org.apache.geode.pdx.PdxInstance; import org.apache.geode.pdx.WritablePdxInstance; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + import org.springframework.data.projection.Accessor; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactory.java b/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactory.java index fe185293..4fbbb87c 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactory.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactory.java @@ -19,8 +19,10 @@ package org.springframework.data.gemfire.search.lucene.support; import static org.springframework.data.gemfire.search.lucene.support.PdxInstanceMethodInterceptor.newPdxInstanceMethodInterceptor; -import org.aopalliance.intercept.MethodInterceptor; import org.apache.geode.pdx.PdxInstance; + +import org.aopalliance.intercept.MethodInterceptor; + import org.springframework.data.projection.MethodInterceptorFactory; /** diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneAccessorSupport.java b/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneAccessorSupport.java index 0e5ab1a4..533851a0 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneAccessorSupport.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneAccessorSupport.java @@ -22,6 +22,7 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newU import java.util.List; import org.apache.geode.cache.lucene.LuceneQueryProvider; + import org.springframework.data.domain.Page; import org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor; import org.springframework.data.gemfire.util.RuntimeExceptionFactory; diff --git a/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneOperationsSupport.java b/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneOperationsSupport.java index a0d49c3a..a01742dd 100644 --- a/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneOperationsSupport.java +++ b/src/main/java/org/springframework/data/gemfire/search/lucene/support/ProjectingLuceneOperationsSupport.java @@ -22,6 +22,7 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newU import java.util.List; import org.apache.geode.cache.lucene.LuceneQueryProvider; + import org.springframework.data.domain.Page; import org.springframework.data.gemfire.search.lucene.ProjectingLuceneOperations; import org.springframework.data.gemfire.util.RuntimeExceptionFactory; diff --git a/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java b/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java index db3fdfa0..02833751 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java @@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.geode.DataSerializable; import org.apache.geode.Instantiator; + import org.springframework.asm.ClassWriter; import org.springframework.asm.FieldVisitor; import org.springframework.asm.MethodVisitor; diff --git a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java index ba6fd85e..f2e0854e 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java @@ -23,6 +23,7 @@ import java.util.Map.Entry; import org.apache.geode.DataSerializable; import org.apache.geode.Instantiator; + import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java b/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java index 82e5af8e..f64c1737 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.serialization; import org.apache.geode.DataSerializable; import org.apache.geode.Instantiator; + import org.springframework.beans.BeanUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; diff --git a/src/main/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdvice.java b/src/main/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdvice.java index 297c0689..c0824d45 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdvice.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdvice.java @@ -38,11 +38,13 @@ import org.apache.geode.cache.query.SelectResults; import org.apache.geode.cache.query.internal.ResultsBag; import org.apache.geode.pdx.JSONFormatter; import org.apache.geode.pdx.PdxInstance; + import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java index 3f586100..baf802cf 100644 --- a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java @@ -34,6 +34,7 @@ import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.cache.server.ClientSubscriptionConfig; import org.apache.geode.cache.server.ServerLoadProbe; + import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; @@ -51,6 +52,7 @@ import org.springframework.util.StringUtils; * @see org.apache.geode.cache.Cache * @see org.apache.geode.cache.client.ClientCache * @see org.apache.geode.cache.server.CacheServer + * @see org.apache.geode.cache.server.ClientSubscriptionConfig * @see org.springframework.beans.factory.DisposableBean * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java b/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java index 76fb02c0..608da86e 100644 --- a/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java @@ -43,6 +43,9 @@ import org.apache.geode.cache.snapshot.RegionSnapshotService; import org.apache.geode.cache.snapshot.SnapshotFilter; import org.apache.geode.cache.snapshot.SnapshotOptions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationListener; @@ -55,9 +58,6 @@ import org.springframework.util.FileCopyUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * The SnapshotServiceFactoryBean class is a Spring FactoryBean used to configure and create an instance * of an appropriate Pivotal GemFire Snapshot Service to perform data import and exports. A CacheSnapshotService is created diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java b/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java index 00b69e57..d3f080dc 100644 --- a/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire.snapshot.event; import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata; import org.apache.geode.cache.Region; + import org.springframework.context.ApplicationEvent; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java b/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java index 3d0fe8ab..5d5f1ce8 100644 --- a/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java +++ b/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java @@ -18,6 +18,9 @@ package org.springframework.data.gemfire.support; import java.util.Optional; import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; @@ -25,9 +28,6 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.FactoryBean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * The {@link AbstractFactoryBeanSupport} class is an abstract Spring {@link FactoryBean} base class implementation * encapsulating operations common to SDG's {@link FactoryBean} implementations. diff --git a/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java b/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java index d47e6029..792f78bf 100644 --- a/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java +++ b/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java @@ -21,6 +21,7 @@ import static org.springframework.data.gemfire.support.GemfireBeanFactoryLocator import org.apache.geode.cache.CacheCallback; import org.apache.geode.cache.Declarable; + import org.springframework.beans.factory.BeanFactory; import org.springframework.data.gemfire.PeerRegionFactoryBean; diff --git a/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java b/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java index 7e4c1970..562f9512 100644 --- a/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java +++ b/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanNameAware; diff --git a/src/main/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupport.java b/src/main/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupport.java index c4e13c1c..ab56a55f 100644 --- a/src/main/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupport.java +++ b/src/main/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupport.java @@ -24,6 +24,7 @@ import org.apache.geode.cache.CacheCallback; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.Declarable; import org.apache.geode.cache.LoaderHelper; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java b/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java index 417ca60b..3eca3588 100644 --- a/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java +++ b/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java @@ -24,8 +24,10 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Declarable; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationListener; diff --git a/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java b/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java index 942e309a..f5689c06 100644 --- a/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java +++ b/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java @@ -21,6 +21,7 @@ import org.apache.geode.cache.Cache; import org.apache.geode.distributed.ServerLauncher; import org.apache.geode.distributed.ServerLauncher.Builder; import org.apache.geode.distributed.ServerLauncherCacheProvider; + import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.GemfireUtils; diff --git a/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionManager.java b/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionManager.java index 8c471e76..81f1bc45 100644 --- a/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionManager.java +++ b/src/main/java/org/springframework/data/gemfire/transaction/GemfireTransactionManager.java @@ -27,6 +27,7 @@ import org.apache.geode.cache.CacheTransactionManager; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.TransactionId; + import org.springframework.beans.factory.InitializingBean; import org.springframework.transaction.CannotCreateTransactionException; import org.springframework.transaction.NoTransactionException; diff --git a/src/main/java/org/springframework/data/gemfire/transaction/config/GemfireCacheTransactionsConfiguration.java b/src/main/java/org/springframework/data/gemfire/transaction/config/GemfireCacheTransactionsConfiguration.java index 05b2916f..784c585f 100644 --- a/src/main/java/org/springframework/data/gemfire/transaction/config/GemfireCacheTransactionsConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/transaction/config/GemfireCacheTransactionsConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.transaction.config; import org.apache.geode.cache.GemFireCache; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.gemfire.transaction.GemfireTransactionManager; diff --git a/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java b/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java index 344fe643..303a7c7c 100644 --- a/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java +++ b/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java @@ -28,6 +28,7 @@ import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.cache.client.Pool; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.internal.cache.GemFireCacheImpl; + import org.springframework.util.StringUtils; /** 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 739d6b34..214cbd45 100644 --- a/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java +++ b/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java @@ -27,6 +27,7 @@ import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.distributed.internal.InternalLocator; import org.apache.geode.internal.DistributionLocator; + import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java index 4423c140..1a3a4f7f 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.wan; import static org.springframework.data.gemfire.util.CollectionUtils.nullSafeList; @@ -30,6 +29,7 @@ import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory; import org.apache.geode.cache.wan.GatewayEventFilter; import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; import org.apache.geode.cache.wan.GatewaySender; + import org.springframework.beans.factory.FactoryBean; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java index 3ec89662..bf771653 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderWrapper.java @@ -19,6 +19,7 @@ import org.apache.geode.cache.wan.GatewayEventFilter; import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; import org.apache.geode.cache.wan.GatewaySender; import org.apache.geode.cache.wan.GatewayTransportFilter; + import org.springframework.util.Assert; /** diff --git a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java index cd2f16f2..d380ae70 100644 --- a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java +++ b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java @@ -24,6 +24,7 @@ import javax.annotation.Resource; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; + import org.springframework.context.annotation.DependsOn; import org.springframework.dao.support.DaoSupport; import org.springframework.stereotype.Repository; diff --git a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests.java index f16f81bc..285e37f1 100644 --- a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupIntegrationTests.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java index 8c6478e7..42b83cf4 100644 --- a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java @@ -24,8 +24,10 @@ import javax.annotation.Resource; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests.java index 65c02971..b6ace296 100644 --- a/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/AutoRegionLookupWithComponentScanningIntegrationTests.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/CacheAutoReconnectIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/CacheAutoReconnectIntegrationTests.java index 6fc102a0..4fa42458 100644 --- a/src/test/java/org/springframework/data/gemfire/CacheAutoReconnectIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/CacheAutoReconnectIntegrationTests.java @@ -24,8 +24,10 @@ import static org.junit.Assume.assumeNotNull; import java.io.File; import org.apache.geode.cache.Cache; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.gemfire.config.xml.GemfireConstants; diff --git a/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java index 18d359ba..d19b6281 100644 --- a/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java @@ -31,6 +31,10 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.Scope; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; @@ -40,10 +44,6 @@ import org.junit.rules.TestRule; import org.junit.rules.TestWatcher; import org.junit.runner.Description; -import org.apache.geode.cache.DataPolicy; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.Scope; - import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanInitializationException; import org.springframework.context.ConfigurableApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java index fc1e8ff4..96d79dfa 100644 --- a/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java @@ -62,11 +62,13 @@ import org.apache.geode.cache.util.GatewayConflictResolver; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.pdx.PdxSerializer; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.BeanFactory; import org.springframework.core.io.Resource; import org.springframework.data.gemfire.support.GemfireBeanFactoryLocator; diff --git a/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java index 14b84757..8bfffcf6 100644 --- a/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java @@ -19,9 +19,11 @@ package org.springframework.data.gemfire; import static org.junit.Assert.assertEquals; import org.apache.geode.cache.Cache; + import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTest.java index eb22ea53..c3f3674a 100644 --- a/src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTest.java @@ -25,10 +25,12 @@ import java.io.File; import javax.annotation.Resource; import org.apache.geode.cache.server.CacheServer; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java index 8e5c1514..2ba2e812 100644 --- a/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java @@ -22,8 +22,10 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java b/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java index ed10d06b..f1f7cabc 100644 --- a/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java +++ b/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import org.apache.geode.cache.DataPolicy; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTest.java index 7a13de7a..550de8a6 100644 --- a/src/test/java/org/springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTest.java @@ -24,8 +24,10 @@ import java.util.Map; import javax.annotation.Resource; import org.apache.geode.cache.DiskStore; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/ForkUtil.java b/src/test/java/org/springframework/data/gemfire/ForkUtil.java index 77cc9ff7..f920888e 100644 --- a/src/test/java/org/springframework/data/gemfire/ForkUtil.java +++ b/src/test/java/org/springframework/data/gemfire/ForkUtil.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.data.gemfire.fork.CqCacheServerProcess; import org.springframework.data.gemfire.fork.FunctionCacheServerProcess; import org.springframework.data.gemfire.test.support.IOUtils; diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java index 3c74a03e..96cb8609 100644 --- a/src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java @@ -33,9 +33,11 @@ import javax.annotation.Resource; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.SelectResults; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java index 5df889cc..9d042698 100644 --- a/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java @@ -27,14 +27,20 @@ import java.util.concurrent.TimeUnit; import javax.annotation.PostConstruct; import javax.annotation.Resource; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -56,10 +62,6 @@ import org.springframework.data.gemfire.util.PropertiesBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - /** * Integrations tests for {@link GemfireTemplate} testing proper function and behavior of executing (OQL) queries * from a cache client application using the {@link GemfireTemplate} to a cluster of Pivotal GemFire'servers that have diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java index b8f24f44..16a2670a 100644 --- a/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java @@ -42,11 +42,13 @@ import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.query.Query; import org.apache.geode.cache.query.QueryService; import org.apache.geode.cache.query.SelectResults; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.gemfire.test.support.AbstractUnitAndIntegrationTestsWithMockSupport; diff --git a/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java b/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java index ad0cc7c1..17c55daa 100644 --- a/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java +++ b/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java @@ -30,6 +30,7 @@ import java.util.Properties; import org.apache.geode.cache.Cache; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.distributed.DistributedSystem; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java index 379980ba..62a3532f 100644 --- a/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java @@ -27,9 +27,11 @@ 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.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; + import org.springframework.data.gemfire.test.support.FileSystemUtils; import org.springframework.data.gemfire.util.CacheUtils; diff --git a/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java index 8cffe3fe..7b25fd35 100644 --- a/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java @@ -27,9 +27,11 @@ import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.IndexExistsException; import org.apache.geode.cache.query.IndexNameConflictException; import org.apache.geode.cache.query.QueryService; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java index 4273285d..dfcada90 100644 --- a/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java @@ -44,6 +44,7 @@ import org.apache.geode.cache.query.IndexExistsException; import org.apache.geode.cache.query.IndexNameConflictException; import org.apache.geode.cache.query.IndexStatistics; import org.apache.geode.cache.query.QueryService; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -52,6 +53,7 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.slf4j.Logger; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.data.gemfire.config.xml.GemfireConstants; diff --git a/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java index 7d185801..dc98b6b4 100644 --- a/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify; import org.apache.geode.cache.AttributesFactory; import org.apache.geode.cache.RegionFactory; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/Init.java b/src/test/java/org/springframework/data/gemfire/Init.java index e1e84922..a18f7e8c 100644 --- a/src/test/java/org/springframework/data/gemfire/Init.java +++ b/src/test/java/org/springframework/data/gemfire/Init.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire; import org.apache.geode.cache.server.CacheServer; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; diff --git a/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java index c1e11b78..e3f44109 100644 --- a/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java @@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import org.apache.geode.cache.InterestPolicy; + import org.junit.After; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java index 1b3a6406..76cf6f7f 100644 --- a/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import org.apache.geode.cache.InterestPolicy; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java index 0ee9b804..c5037a90 100644 --- a/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java @@ -22,13 +22,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import org.junit.Test; - import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.RegionShortcut; +import org.junit.Test; + import org.springframework.data.gemfire.test.support.AbstractRegionFactoryBeanTests; /** diff --git a/src/test/java/org/springframework/data/gemfire/LocatorFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/gemfire/LocatorFactoryBeanUnitTests.java index 9f82199b..5eb25a07 100644 --- a/src/test/java/org/springframework/data/gemfire/LocatorFactoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/LocatorFactoryBeanUnitTests.java @@ -35,10 +35,12 @@ import java.util.Properties; import org.apache.geode.distributed.Locator; import org.apache.geode.distributed.LocatorLauncher; + import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; import org.mockito.Mockito; + import org.springframework.data.gemfire.config.annotation.LocatorConfigurer; /** diff --git a/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java index 913733da..6769b095 100644 --- a/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java @@ -39,6 +39,7 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; import org.apache.geode.cache.wan.GatewaySender; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java index 1b8e6428..59356fd8 100644 --- a/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java @@ -46,8 +46,10 @@ import org.apache.geode.cache.RegionEvent; import org.apache.geode.cache.asyncqueue.AsyncEvent; import org.apache.geode.cache.asyncqueue.AsyncEventListener; import org.apache.geode.cache.util.CacheListenerAdapter; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.BeanNameAware; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java b/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java index 120e7897..a85e4eeb 100644 --- a/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java +++ b/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java @@ -21,8 +21,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java index c2fbb9e3..5d53e04a 100644 --- a/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.when; import org.apache.geode.cache.PartitionAttributes; import org.apache.geode.cache.PartitionResolver; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java index 607b866b..f9e24354 100644 --- a/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java @@ -21,11 +21,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import org.junit.Test; - import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.RegionFactory; +import org.junit.Test; + /** * Unit Tests for {@link PartitionedRegionFactoryBean}. * diff --git a/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java index a5e47f0c..6ce2684b 100644 --- a/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire; import static org.junit.Assert.assertEquals; @@ -26,11 +25,13 @@ import java.io.Serializable; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.data.gemfire.test.support.FileSystemUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java index 2497a9bb..7e620d6b 100644 --- a/src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/PeerRegionFactoryBeanTest.java @@ -51,8 +51,10 @@ import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.SubscriptionAttributes; import org.apache.geode.internal.cache.GemFireCacheImpl; + import org.junit.After; import org.junit.Test; + import org.springframework.data.gemfire.test.support.AbstractRegionFactoryBeanTests; import org.springframework.data.gemfire.util.ArrayUtils; diff --git a/src/test/java/org/springframework/data/gemfire/RecreatingContextTest.java b/src/test/java/org/springframework/data/gemfire/RecreatingContextTest.java index b558678e..180ec0bc 100644 --- a/src/test/java/org/springframework/data/gemfire/RecreatingContextTest.java +++ b/src/test/java/org/springframework/data/gemfire/RecreatingContextTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire; import org.junit.After; import org.junit.Before; + import org.springframework.context.support.GenericXmlApplicationContext; /** @@ -32,8 +32,7 @@ public abstract class RecreatingContextTest { protected abstract String location(); - protected void configureContext(){ - } + protected void configureContext() { } @Before public void createCtx() { diff --git a/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java index 7eb27a1c..142284e2 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java @@ -27,8 +27,10 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAlgorithm; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java index bd1ee6e6..089ef87c 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java @@ -28,7 +28,9 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionExistsException; import org.apache.geode.cache.Scope; + import org.junit.Test; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java b/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java index 46176179..d4107811 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java +++ b/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire; import static org.junit.Assert.assertEquals; import org.apache.geode.cache.RegionShortcut; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java index baf147b0..4c27fde4 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java @@ -20,6 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.RegionShortcut; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java b/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java index fb439f2c..ee2ca5fe 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java +++ b/src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.apache.geode.cache.RegionShortcut; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java index ce74fcbf..6c619036 100644 --- a/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java @@ -21,11 +21,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import org.junit.Test; - import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.RegionFactory; +import org.junit.Test; + /** * Unit Tests for {@link ReplicatedRegionFactoryBean}. * diff --git a/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java index cbc5a673..32e18ce0 100644 --- a/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java @@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import org.apache.geode.cache.Scope; + import org.junit.After; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java b/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java index 20301fd6..d9c1e02f 100644 --- a/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire; import static org.junit.Assert.assertEquals; @@ -22,6 +21,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import org.apache.geode.cache.Scope; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java index bbe37d12..0e0fe5e0 100644 --- a/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java @@ -36,8 +36,10 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.ResumptionAction; import org.apache.geode.cache.Scope; import org.apache.geode.cache.SubscriptionAttributes; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java index d2a41d8d..84d10665 100644 --- a/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue; import org.apache.geode.cache.InterestPolicy; import org.apache.geode.cache.SubscriptionAttributes; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java index 09b49c63..528f410e 100644 --- a/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java @@ -25,6 +25,7 @@ import javax.annotation.Resource; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java index 19d5330e..72c9e916 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java @@ -27,8 +27,10 @@ import javax.annotation.PostConstruct; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.test.context.ActiveProfiles; diff --git a/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java b/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java index cdbc6dbd..352c7cb7 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java @@ -17,16 +17,23 @@ package org.springframework.data.gemfire.cache; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import static org.mockito.ArgumentMatchers.*; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.sameInstance; +import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java b/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java index f9019f49..e1a61950 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java +++ b/src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java @@ -16,6 +16,7 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java index 2bf83b5b..c9a10556 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java @@ -30,10 +30,16 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Resource; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + import org.apache.geode.cache.GemFireCache; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java index 227fc09c..c34c4524 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java @@ -28,9 +28,11 @@ import edu.umd.cs.mtc.TestFramework; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.Region; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; + import org.springframework.cache.Cache; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.test.support.AbstractNativeCacheTests; diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java index 66f8e4df..042bfd26 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java @@ -36,6 +36,7 @@ import java.util.Set; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -43,6 +44,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.cache.Cache; /** diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java index 02e16fd4..24c32554 100644 --- a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java @@ -34,12 +34,14 @@ import static org.mockito.Mockito.when; import java.util.concurrent.Callable; import org.apache.geode.cache.Region; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.cache.Cache; /** diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java index 7e9d8960..9688a477 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java @@ -52,7 +52,9 @@ import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.cache.client.Pool; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.pdx.PdxSerializer; + import org.junit.Test; + import org.springframework.beans.factory.BeanFactory; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.data.gemfire.GemfireUtils; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java index 76780134..61effcbc 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java @@ -31,10 +31,12 @@ import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.IndexType; import org.apache.geode.cache.query.QueryService; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.process.ProcessExecutor; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java index bf1af230..86084caa 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheIntegrationTests.java @@ -21,7 +21,9 @@ import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java b/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java index 0f4db076..4a56cb8b 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java @@ -27,10 +27,12 @@ import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.data.gemfire.process.ProcessWrapper; import org.springframework.data.gemfire.test.support.AbstractGemFireClientServerIntegrationTest; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java index a60afcaf..4b4660df 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java @@ -32,10 +32,12 @@ import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.process.ProcessExecutor; import org.springframework.data.gemfire.process.ProcessWrapper; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java index fca8dc69..0d38898a 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java @@ -33,10 +33,12 @@ import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.process.ProcessExecutor; import org.springframework.data.gemfire.process.ProcessWrapper; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java index 33dd9cd7..9eba8db0 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java @@ -33,10 +33,12 @@ import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.process.ProcessExecutor; import org.springframework.data.gemfire.process.ProcessWrapper; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java index 8eefd3d6..e56ab9e7 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java @@ -47,9 +47,11 @@ import org.apache.geode.cache.client.ClientRegionFactory; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; import org.apache.geode.compression.Compressor; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanFactory; import org.springframework.data.gemfire.TestUtils; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java index 7b366b26..549d8741 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionIntegrationTests.java @@ -23,8 +23,10 @@ import javax.annotation.Resource; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.config.annotation.ClientCacheApplication; import org.springframework.data.gemfire.test.mock.annotation.EnableGemFireMockObjects; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java index 37900c7a..5d66f196 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire.client; import static org.junit.Assert.assertEquals; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java index 1d3b65e5..976684ea 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutToDataPolicyConverterUnitTests.java @@ -20,6 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java index 2fc92578..a8577cab 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; /** 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 2cb23a5c..4dff9787 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java @@ -32,8 +32,10 @@ import org.apache.geode.cache.EntryEvent; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; import org.apache.geode.cache.util.CacheWriterAdapter; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java index ec42b0fe..80239866 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionIntegrationTests.java @@ -22,10 +22,12 @@ import javax.annotation.Resource; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.fork.ServerProcess; diff --git a/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java index 8a2aba88..d1fb5e46 100644 --- a/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java @@ -39,6 +39,7 @@ import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.util.CacheListenerAdapter; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -47,6 +48,7 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanPostProcessor; diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java index 7440610a..a2bfa137 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java @@ -27,10 +27,12 @@ import javax.annotation.Resource; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; + import org.junit.AfterClass; 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.GemfireUtils; diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java index 2f3cb8b6..dca24d9a 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTests.java @@ -22,10 +22,12 @@ import java.util.Optional; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.Pool; + import org.junit.AfterClass; 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.GemfireUtils; diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java index a623f640..d8b1dd77 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java @@ -28,11 +28,13 @@ import javax.annotation.Resource; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.distributed.ServerLauncher; + import org.assertj.core.api.Assertions; import org.junit.AfterClass; 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.core.io.ClassPathResource; diff --git a/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java b/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java index 64325aa0..4cded477 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java @@ -51,10 +51,12 @@ import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.execute.Function; import org.apache.geode.management.internal.cli.domain.RegionInformation; import org.apache.geode.management.internal.cli.functions.GetRegionsFunction; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.data.gemfire.client.function.ListRegionsOnServerFunction; import org.springframework.data.gemfire.util.RegionUtils; diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java index bd345d9b..6617d1d8 100644 --- a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java @@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import org.apache.geode.cache.InterestResultPolicy; + import org.junit.After; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java index 22c65d50..5367f767 100644 --- a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import org.apache.geode.cache.InterestResultPolicy; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java b/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java index 3748a2b6..bcc45d83 100644 --- a/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/InterestUnitTests.java @@ -27,6 +27,7 @@ import static org.springframework.data.gemfire.client.Interest.newInterest; import java.util.List; import org.apache.geode.cache.InterestResultPolicy; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java index 12315af4..32b5c987 100644 --- a/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTests.java @@ -27,9 +27,11 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.config.annotation.ClientCacheApplication; import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions; diff --git a/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java index 89d93307..9b32f09d 100644 --- a/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java @@ -42,9 +42,11 @@ import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolFactory; import org.apache.geode.cache.query.QueryService; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; + import org.springframework.beans.factory.BeanFactory; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.support.ConnectionEndpoint; diff --git a/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java index aa361f1d..3f5f9595 100644 --- a/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/SpELExpressionConfiguredPoolsIntegrationTests.java @@ -28,8 +28,10 @@ import java.util.Properties; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolFactory; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java index 31ec1768..9c950333 100644 --- a/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java @@ -27,6 +27,7 @@ import javax.annotation.Resource; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java b/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java index 2b7d9ff7..91b3ab38 100644 --- a/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java @@ -17,10 +17,17 @@ package org.springframework.data.gemfire.client.function; -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.nullValue; +import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doAnswer; +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.Arrays; import java.util.Collections; @@ -32,6 +39,7 @@ import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.ResultSender; + import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java index 7d23cad4..79a40aaf 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java @@ -36,6 +36,7 @@ import java.util.function.Supplier; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.query.QueryService; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -43,6 +44,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.GemfireUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java index 380cd64a..ddcabba9 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java @@ -35,6 +35,7 @@ import java.util.Collections; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolFactory; import org.apache.geode.cache.query.QueryService; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -42,6 +43,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.GemfireUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java index a1a682d9..c6ecff8a 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java @@ -26,9 +26,11 @@ import java.net.InetSocketAddress; import java.util.Collections; import org.apache.geode.cache.client.PoolFactory; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; + import org.springframework.data.gemfire.GemfireUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java index e041ad24..909a5a25 100644 --- a/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/admin/GemfireAdminOperationsUnitTests.java @@ -30,11 +30,13 @@ import java.util.Collections; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.Index; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.config.schema.SchemaObjectDefinition; import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java index 0daae7c3..7ba82220 100644 --- a/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateIndexFunctionUnitTests.java @@ -33,11 +33,13 @@ import org.apache.geode.cache.Cache; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.QueryException; import org.apache.geode.cache.query.QueryService; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.IndexType; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java index b4c09dcb..70a70ff5 100644 --- a/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/admin/functions/CreateRegionFunctionUnitTests.java @@ -32,11 +32,13 @@ import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.RegionShortcut; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; /** diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java index fae9b6dd..2b1ea1b6 100644 --- a/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/admin/functions/ListIndexesFunctionUnitTests.java @@ -28,6 +28,7 @@ import java.util.Arrays; import org.apache.geode.cache.Cache; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.QueryService; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java index 3c2d4ea7..ba95feb5 100644 --- a/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/admin/remote/FunctionGemfireAdminTemplateUnitTests.java @@ -38,11 +38,13 @@ import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.query.Index; import org.apache.geode.management.internal.cli.domain.RegionInformation; import org.apache.geode.management.internal.cli.functions.GetRegionsFunction; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.client.function.ListRegionsOnServerFunction; import org.springframework.data.gemfire.config.admin.functions.CreateIndexFunction; import org.springframework.data.gemfire.config.admin.functions.CreateRegionFunction; diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java index 5c11588b..783a4dcf 100644 --- a/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateBuilderUnitTests.java @@ -24,10 +24,12 @@ import java.util.Arrays; import java.util.Optional; import org.apache.geode.cache.client.ClientCache; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.util.NetworkUtils; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpRequestInterceptor; diff --git a/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateUnitTests.java index 3ceb2280..bd747ee7 100644 --- a/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/admin/remote/RestHttpGemfireAdminTemplateUnitTests.java @@ -35,11 +35,13 @@ import java.util.Optional; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.query.Index; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.IndexType; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationIntegrationTests.java index 6d785039..d259aa60 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationIntegrationTests.java @@ -23,8 +23,10 @@ import java.util.Optional; import org.apache.geode.cache.Cache; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MutablePropertySources; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java index 258e3174..f5b139f5 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java @@ -32,6 +32,11 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.PostConstruct; import javax.annotation.Resource; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.GemFireCache; @@ -41,6 +46,7 @@ import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.ServerOperationException; import org.apache.geode.security.NotAuthorizedException; import org.apache.geode.security.ResourcePermission; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -48,6 +54,7 @@ import org.junit.Test; import org.junit.runners.MethodSorters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; @@ -63,11 +70,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - /** * Abstract base test class for implementing Apache Geode Integrated Security Integration Tests. * diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java index 01577b14..eb7fe73a 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java @@ -25,12 +25,12 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; - import org.apache.geode.security.AuthenticationFailedException; import org.apache.geode.security.ResourcePermission; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.test.context.ActiveProfiles; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java index 17348576..c530c3a9 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java @@ -18,12 +18,12 @@ package org.springframework.data.gemfire.config.annotation; import java.io.IOException; +import org.apache.geode.internal.security.shiro.GeodePermissionResolver; + +import org.apache.shiro.realm.text.PropertiesRealm; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.apache.geode.internal.security.shiro.GeodePermissionResolver; -import org.apache.shiro.realm.text.PropertiesRealm; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java index 55909d12..0a11606b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java @@ -28,10 +28,12 @@ import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurerIntegrationTests.java index cad54344..4de051cb 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurerIntegrationTests.java @@ -25,6 +25,7 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerPropertiesIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerPropertiesIntegrationTests.java index 8de348b7..6eb82078 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerPropertiesIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/CacheServerPropertiesIntegrationTests.java @@ -22,8 +22,10 @@ import java.util.Optional; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.cache.server.ClientSubscriptionConfig; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsAppliesRegionConfigurersIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsAppliesRegionConfigurersIntegrationTests.java index 2337b03e..8048257b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsAppliesRegionConfigurersIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/CachingDefinedRegionsAppliesRegionConfigurersIntegrationTests.java @@ -27,8 +27,10 @@ import java.util.stream.Collectors; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplicationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplicationIntegrationTests.java index 61b048c4..ff82d487 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplicationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplicationIntegrationTests.java @@ -26,8 +26,10 @@ import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurerIntegrationTests.java index 601a9116..22082ce8 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurerIntegrationTests.java @@ -23,12 +23,12 @@ import java.util.Iterator; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.geode.cache.client.ClientCache; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.client.ClientCache; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCachePropertiesIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCachePropertiesIntegrationTests.java index 04fce557..8782ce39 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCachePropertiesIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientCachePropertiesIntegrationTests.java @@ -27,8 +27,10 @@ import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolFactory; import org.apache.geode.cache.control.ResourceManager; import org.apache.geode.pdx.PdxSerializer; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java index df21e7db..87ffd1ee 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java @@ -28,10 +28,12 @@ import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.PartitionedRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java index 16d7108f..c10116f8 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java @@ -27,9 +27,11 @@ import java.util.List; import java.util.Optional; import org.apache.geode.cache.client.ClientCache; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java index 3ff86bca..feac57a6 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java @@ -23,9 +23,11 @@ import static org.springframework.data.gemfire.config.annotation.ClusterConfigur import static org.springframework.data.gemfire.config.annotation.ClusterConfigurationConfiguration.SchemaObjectContext; import org.apache.geode.cache.client.ClientCache; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanPostProcessor; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurerIntegrationTests.java index 8a41964a..69573501 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurerIntegrationTests.java @@ -25,6 +25,7 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStorePropertiesIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStorePropertiesIntegrationTests.java index 4cdaba69..ff7a1699 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStorePropertiesIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/DiskStorePropertiesIntegrationTests.java @@ -22,8 +22,10 @@ import java.util.Optional; import org.apache.geode.cache.DiskStore; import org.apache.geode.cache.DiskStoreFactory; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationIntegrationTests.java index 7f56abb1..295c00c5 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocatorConfigurationIntegrationTests.java @@ -22,6 +22,7 @@ import java.util.Optional; import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.gemfire.CacheFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsIntegrationTests.java index a2967fda..594214b8 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsIntegrationTests.java @@ -26,9 +26,11 @@ import javax.cache.annotation.CacheResult; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsUnitTests.java index 303878a2..7a83a9cb 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCachingDefinedRegionsUnitTests.java @@ -41,8 +41,10 @@ import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.cache.annotation.CacheEvict; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java index 447c82b1..09e6ab56 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationIntegrationTests.java @@ -23,11 +23,13 @@ import java.util.Collections; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java index 63cd0897..c2ed5ff8 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java @@ -44,8 +44,10 @@ import java.util.Optional; import org.apache.geode.cache.Cache; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientCache; + import org.junit.After; import org.junit.Test; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.core.env.Environment; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationWithSecurityIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationWithSecurityIntegrationTests.java index 5f0a3ec0..9b2c5adb 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationWithSecurityIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationWithSecurityIntegrationTests.java @@ -34,9 +34,11 @@ import java.util.Optional; import java.util.Properties; import org.apache.geode.management.internal.security.ResourceConstants; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsIntegrationTests.java index 0c25f626..4819b4bd 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsIntegrationTests.java @@ -25,10 +25,12 @@ import javax.annotation.Resource; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsUnitTests.java index 0c2e1cfd..0d32cd0b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterDefinedRegionsUnitTests.java @@ -26,7 +26,9 @@ import java.util.Map; import org.apache.geode.cache.Cache; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; + import org.springframework.core.type.AnnotationMetadata; import org.springframework.data.gemfire.client.GemfireDataSourcePostProcessor; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java index c424d93e..61bd882a 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableCompressionConfigurationUnitTests.java @@ -28,8 +28,10 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.compression.Compressor; import org.apache.geode.compression.SnappyCompressor; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java index 57911813..34c41fb9 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java @@ -25,6 +25,10 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Resource; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; @@ -36,11 +40,13 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.query.CqEvent; import org.apache.geode.cache.util.CacheListenerAdapter; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -56,10 +62,6 @@ import org.springframework.data.gemfire.test.support.ClientServerIntegrationTest import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - /** * Integration tests for {@link EnableContinuousQueries}, {@link ContinuousQueryConfiguration}, {@link ContinuousQuery} * and {@link ContinuousQueryListenerContainer}. diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java index 846b8c15..a9af0185 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java @@ -28,6 +28,8 @@ import static org.springframework.data.gemfire.util.ArrayUtils.asArray; import java.lang.reflect.Proxy; import java.util.concurrent.Executor; +import lombok.Data; + import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; @@ -37,7 +39,9 @@ import org.apache.geode.cache.query.CqAttributes; import org.apache.geode.cache.query.CqEvent; import org.apache.geode.cache.query.CqQuery; import org.apache.geode.cache.query.QueryService; + import org.junit.Test; + import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Qualifier; @@ -66,8 +70,6 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.springframework.util.ErrorHandler; -import lombok.Data; - /** * Unit tests for {@link EnableContinuousQueries}, {@link ContinuousQueryConfiguration}, {@link ContinuousQuery} * and {@link ContinuousQueryListenerContainer}. diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesWithClusterConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesWithClusterConfigurationIntegrationTests.java index e1fe82d9..38b2bd56 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesWithClusterConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesWithClusterConfigurationIntegrationTests.java @@ -25,10 +25,12 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import org.apache.geode.cache.query.CqEvent; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java index 836e8e07..706df365 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableDiskStoresConfigurationUnitTests.java @@ -25,9 +25,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import org.apache.geode.cache.DiskStore; + import org.junit.After; import org.junit.Test; import org.mockito.stubbing.Answer; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.gemfire.test.mock.annotation.EnableGemFireMockObjects; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsIntegrationTests.java index c3f39052..d56b6de2 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsIntegrationTests.java @@ -22,8 +22,10 @@ import java.util.Optional; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MutablePropertySources; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsUnitTests.java index b8fbce47..0bd278f6 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsUnitTests.java @@ -41,8 +41,10 @@ import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.Scope; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; + import org.junit.After; import org.junit.Test; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationIntegrationTests.java index 21138b29..02a7b123 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationIntegrationTests.java @@ -24,8 +24,10 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.gemfire.eviction.EvictionActionType; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java index 8f4e6194..9b7bc91c 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java @@ -32,9 +32,11 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.util.ObjectSizer; + import org.junit.After; import org.junit.Test; import org.mockito.stubbing.Answer; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java index 783ab7d0..9c1bee53 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java @@ -24,8 +24,10 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.gemfire.expiration.AnnotationBasedExpiration; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java index b96384e1..a995d01c 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java @@ -30,8 +30,10 @@ import org.apache.geode.cache.ExpirationAction; import org.apache.geode.cache.ExpirationAttributes; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiverConfigurationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiverConfigurationTests.java index 8833fcce..201a0bb2 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiverConfigurationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiverConfigurationTests.java @@ -25,12 +25,12 @@ import java.util.Iterator; import java.util.List; import java.util.Optional; -import org.junit.After; -import org.junit.Test; - import org.apache.geode.cache.wan.GatewayReceiver; import org.apache.geode.cache.wan.GatewayTransportFilter; +import org.junit.After; +import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGemFirePropertiesIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGemFirePropertiesIntegrationTests.java index ea9c5a17..1cc21041 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGemFirePropertiesIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableGemFirePropertiesIntegrationTests.java @@ -24,8 +24,10 @@ import java.util.Properties; import org.apache.geode.cache.GemFireCache; import org.apache.geode.pdx.PdxSerializer; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java index d12f8b3c..47e584f5 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java @@ -47,11 +47,13 @@ import org.apache.geode.cache.query.IndexExistsException; import org.apache.geode.cache.query.IndexNameConflictException; import org.apache.geode.cache.query.QueryService; import org.apache.geode.internal.concurrent.ConcurrentHashSet; + import org.apache.lucene.analysis.Analyzer; import org.junit.After; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableLuceneIndexingConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableLuceneIndexingConfigurationIntegrationTests.java index 6d8eeebe..fa66f0c7 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableLuceneIndexingConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableLuceneIndexingConfigurationIntegrationTests.java @@ -24,9 +24,11 @@ import java.util.stream.Collectors; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.DependsOn; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOffHeapConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOffHeapConfigurationUnitTests.java index 6026ed85..a7a7b111 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOffHeapConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOffHeapConfigurationUnitTests.java @@ -24,8 +24,10 @@ import java.util.Optional; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.control.ResourceManager; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOqlIndexingConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOqlIndexingConfigurationIntegrationTests.java index 461a34c6..a2dce600 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOqlIndexingConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableOqlIndexingConfigurationIntegrationTests.java @@ -24,8 +24,10 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.query.Index; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; import org.springframework.data.gemfire.GemfireUtils; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationIntegrationTests.java index de580195..229ab13f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationIntegrationTests.java @@ -24,8 +24,10 @@ import java.util.Optional; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.pdx.PdxSerializer; + import org.junit.After; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.ConfigurableApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java index 7c94b379..eac9107c 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnablePdxConfigurationUnitTests.java @@ -35,10 +35,12 @@ import java.util.Map; import java.util.Optional; import org.apache.geode.pdx.PdxSerializer; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationDefaultContextIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationDefaultContextIntegrationTests.java index 2c93432a..a2f7080b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationDefaultContextIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationDefaultContextIntegrationTests.java @@ -20,13 +20,13 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; import java.util.Properties; -import org.junit.After; -import org.junit.Test; - import org.apache.geode.cache.Cache; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; +import org.junit.After; +import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MutablePropertySources; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java index 6b6d98cd..001dd615 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java @@ -19,11 +19,6 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.GemFireCache; @@ -31,6 +26,11 @@ import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurerTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurerTests.java index 75e7d000..c91ebdbe 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurerTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverConfigurerTests.java @@ -22,12 +22,12 @@ import java.io.OutputStream; import java.util.Arrays; import java.util.Optional; -import org.junit.After; -import org.junit.Test; - import org.apache.geode.cache.wan.GatewayReceiver; import org.apache.geode.cache.wan.GatewayTransportFilter; +import org.junit.After; +import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverPropertiesTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverPropertiesTests.java index acfc6bca..327aaf8f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverPropertiesTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/GatewayReceiverPropertiesTests.java @@ -25,12 +25,12 @@ import java.util.Iterator; import java.util.List; import java.util.Optional; -import org.junit.After; -import org.junit.Test; - import org.apache.geode.cache.wan.GatewayReceiver; import org.apache.geode.cache.wan.GatewayTransportFilter; +import org.junit.After; +import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfigurationUnitTests.java index fd179923..17861f0e 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/GemFireAsLastResourceConfigurationUnitTests.java @@ -29,11 +29,13 @@ import java.util.HashMap; import java.util.Map; import org.apache.geode.cache.GemFireCache; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.context.annotation.AdviceMode; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.AnnotationAttributes; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/IndexConfigurerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/IndexConfigurerIntegrationTests.java index 745ca5ed..ee70c5d8 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/IndexConfigurerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/IndexConfigurerIntegrationTests.java @@ -28,9 +28,11 @@ import java.util.Set; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneService; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.ConfigurableApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java index bb605e01..db7e5483 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java @@ -24,8 +24,10 @@ import java.util.Optional; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.distributed.Locator; + import org.junit.After; import org.junit.Test; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfigurerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfigurerIntegrationTests.java index 3350812e..97dbac3e 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfigurerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationConfigurerIntegrationTests.java @@ -27,6 +27,7 @@ import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationIntegrationTests.java index 8da06a02..94e64013 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationIntegrationTests.java @@ -23,9 +23,11 @@ import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.distributed.Locator; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationPropertiesIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationPropertiesIntegrationTests.java index 1759ef7e..574a889e 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationPropertiesIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationPropertiesIntegrationTests.java @@ -23,8 +23,10 @@ import java.util.Optional; import java.util.Properties; import org.apache.geode.distributed.Locator; + import org.junit.After; import org.junit.Test; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.ConfigurableApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/LoggingConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/LoggingConfigurationIntegrationTests.java index 5844c27f..51c8aa81 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/LoggingConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/LoggingConfigurationIntegrationTests.java @@ -24,13 +24,13 @@ import java.util.Optional; import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.distributed.internal.DistributionConfig; + import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.distributed.internal.DistributionConfig; - import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.PropertiesPropertySource; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java index 6faac816..66f00c46 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java @@ -26,8 +26,10 @@ import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.PartitionedRegionFactoryBean; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationWithAddedCacheServerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationWithAddedCacheServerIntegrationTests.java index 3cd29466..9cd42afa 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationWithAddedCacheServerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationWithAddedCacheServerIntegrationTests.java @@ -19,16 +19,16 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.distributed.internal.DistributionConfig; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.Cache; -import org.apache.geode.cache.server.CacheServer; -import org.apache.geode.distributed.internal.DistributionConfig; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.gemfire.process.ProcessWrapper; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurerIntegrationTests.java index 88dc1f50..49811193 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurerIntegrationTests.java @@ -24,9 +24,11 @@ import java.util.Iterator; import java.util.Set; import org.apache.geode.cache.Cache; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCachePropertiesIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCachePropertiesIntegrationTests.java index 0143d801..185f5899 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCachePropertiesIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCachePropertiesIntegrationTests.java @@ -24,8 +24,10 @@ import java.util.Properties; import org.apache.geode.cache.Cache; import org.apache.geode.cache.control.ResourceManager; import org.apache.geode.pdx.PdxSerializer; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PoolConfigurerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/PoolConfigurerIntegrationTests.java index f4d91bd4..b52bd898 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/PoolConfigurerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/PoolConfigurerIntegrationTests.java @@ -25,6 +25,7 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PoolPropertiesIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/PoolPropertiesIntegrationTests.java index 65ed3bf6..0cbbc115 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/PoolPropertiesIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/PoolPropertiesIntegrationTests.java @@ -24,8 +24,10 @@ import java.util.Optional; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolFactory; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/RegionConfigurerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/RegionConfigurerIntegrationTests.java index 17c22c45..845a51d0 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/RegionConfigurerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/RegionConfigurerIntegrationTests.java @@ -23,11 +23,11 @@ import java.util.Iterator; import java.util.Optional; import java.util.Set; +import org.apache.geode.cache.GemFireCache; + import org.junit.After; import org.junit.Test; -import org.apache.geode.cache.GemFireCache; - import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingAspectUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingAspectUnitTests.java index cf8915dd..2b341033 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingAspectUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/RegionDataAccessTracingAspectUnitTests.java @@ -27,10 +27,12 @@ import javax.annotation.Resource; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; import org.springframework.data.gemfire.config.annotation.support.RegionDataAccessTracingAspect; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/TestSecurityManager.java b/src/test/java/org/springframework/data/gemfire/config/annotation/TestSecurityManager.java index 3cb17480..dedda1dd 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/TestSecurityManager.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/TestSecurityManager.java @@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.geode.security.AuthenticationFailedException; + import org.springframework.util.StringUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java index ea5591e8..56e8ceae 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupportTests.java @@ -37,6 +37,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java index 9f8b8289..0a722c22 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/support/AbstractGemFireAsLastResourceAspectSupportUnitTests.java @@ -41,6 +41,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.apache.geode.cache.GemFireCache; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/EnableGemFireAsLastResourceIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/support/EnableGemFireAsLastResourceIntegrationTests.java index d4cba47e..369588b9 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/support/EnableGemFireAsLastResourceIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/support/EnableGemFireAsLastResourceIntegrationTests.java @@ -32,8 +32,10 @@ import javax.resource.ResourceException; import org.apache.geode.cache.GemFireCache; import org.apache.geode.ra.GFConnection; import org.apache.geode.ra.GFConnectionFactory; + import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspectUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspectUnitTests.java index 0ef349e4..33c9322c 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspectUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspectUnitTests.java @@ -32,6 +32,7 @@ import javax.resource.ResourceException; import org.apache.geode.ra.GFConnection; import org.apache.geode.ra.GFConnectionFactory; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspectUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspectUnitTests.java index 6c23a4b5..8297944f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspectUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspectUnitTests.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; import javax.resource.ResourceException; import org.apache.geode.ra.GFConnection; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java index fcba8d63..a4ca52d3 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/test/entities/ClientRegionEntity.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.config.annotation.test.entities; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.springframework.data.annotation.Id; import org.springframework.data.gemfire.mapping.annotation.ClientRegion; diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinitionUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinitionUnitTests.java index a6e1f7c6..43ee3070 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinitionUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectDefinitionUnitTests.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire.config.schema; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; + import org.springframework.core.Ordered; /** diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectTypeUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectTypeUnitTests.java index a68e18cb..2a0c4d5b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectTypeUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/SchemaObjectTypeUnitTests.java @@ -35,6 +35,7 @@ import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.wan.GatewayReceiver; import org.apache.geode.cache.wan.GatewaySender; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinitionUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinitionUnitTests.java index af85691f..676bcd4f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinitionUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/definitions/IndexDefinitionUnitTests.java @@ -27,11 +27,13 @@ import java.io.IOException; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.Index; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.IndexType; import org.springframework.data.gemfire.config.admin.GemfireAdminOperations; import org.springframework.data.gemfire.config.schema.SchemaObjectType; diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinitionUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinitionUnitTests.java index 4858b322..95fd7970 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinitionUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/definitions/RegionDefinitionUnitTests.java @@ -27,11 +27,13 @@ import java.io.IOException; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.config.admin.GemfireAdminOperations; import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.test.support.IOUtils; diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java index 17e5a11e..f74ee681 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/support/ClientRegionCollectorUnitTests.java @@ -33,10 +33,12 @@ import java.util.stream.Collectors; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.context.ApplicationContext; /** diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollectorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollectorUnitTests.java index d6b2c305..85d675e8 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollectorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectCollectorUnitTests.java @@ -26,18 +26,20 @@ import static org.springframework.data.gemfire.util.CollectionUtils.asSet; import java.util.Collections; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + import org.apache.geode.cache.GemFireCache; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.config.schema.SchemaObjectCollector; import org.springframework.data.gemfire.config.schema.SchemaObjectType; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - /** * Unit tests for {@link ComposableSchemaObjectCollector}. * diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java index 2a08f2cd..593cf776 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/support/ComposableSchemaObjectDefinerUnitTests.java @@ -32,10 +32,12 @@ import java.util.Collections; import java.util.Optional; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.config.schema.SchemaObjectDefiner; import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java index 3898a547..75434237 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexCollectorUnitTests.java @@ -34,11 +34,13 @@ import java.util.stream.Collectors; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.QueryService; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.context.ApplicationContext; /** diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java index 045aaf91..aa384967 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/support/IndexDefinerUnitTests.java @@ -21,11 +21,13 @@ import static org.mockito.Mockito.when; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.Index; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.IndexType; import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.IndexDefinition; diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java index 65a6b97d..11201293 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionCollectorUnitTests.java @@ -33,10 +33,12 @@ import java.util.stream.Collectors; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.context.ApplicationContext; /** diff --git a/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java index 3e535a1a..d2f975b5 100644 --- a/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/schema/support/RegionDefinerUnitTests.java @@ -24,11 +24,13 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.query.Index; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.config.schema.SchemaObjectType; import org.springframework.data.gemfire.config.schema.definitions.RegionDefinition; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java index 9d571ee6..437c0810 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java @@ -38,6 +38,7 @@ import java.util.Set; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -45,6 +46,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.data.gemfire.util.CollectionUtils; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java index 64d64b94..2450880b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java @@ -17,9 +17,14 @@ package org.springframework.data.gemfire.config.support; -import static org.assertj.core.api.Assertions.*; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; +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.util.Arrays; @@ -27,6 +32,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java index 21402993..f681b646 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java @@ -29,7 +29,9 @@ import org.apache.geode.cache.InterestPolicy; import org.apache.geode.cache.InterestResultPolicy; import org.apache.geode.cache.Scope; import org.apache.geode.cache.util.Gateway; + import org.junit.Test; + import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.data.gemfire.IndexMaintenancePolicyConverter; import org.springframework.data.gemfire.IndexMaintenancePolicyType; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java index 9bd9659a..5207f573 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java @@ -32,12 +32,14 @@ import java.util.HashMap; import org.apache.geode.cache.query.MultiIndexCreationException; import org.apache.geode.cache.query.QueryService; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.slf4j.Logger; + import org.springframework.context.ApplicationContext; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.data.gemfire.config.xml.GemfireConstants; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java index 34da9a76..5d630365 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java @@ -33,9 +33,11 @@ import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.QueryService; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java index 330f3c07..3f588ffc 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java @@ -23,10 +23,12 @@ import java.util.Arrays; import java.util.Collections; import org.apache.geode.cache.GemFireCache; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.DiskStoreFactoryBean; import org.springframework.data.gemfire.config.annotation.PeerCacheApplication; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java index 8c80a2f1..e5808e88 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java @@ -33,7 +33,9 @@ import org.apache.geode.cache.DiskStore; import org.apache.geode.cache.Region; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; import org.apache.geode.internal.cache.PartitionedRegion; + import org.junit.Test; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.AbstractBeanDefinition; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java index b147c219..7d885264 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/AbstractRegionParserUnitTests.java @@ -28,14 +28,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.junit.Test; +import org.w3c.dom.Element; +import org.w3c.dom.Node; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.beans.factory.xml.XmlReaderContext; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - /** * Unit tests for {@link AbstractRegionParser}. * diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest.java index f37db80a..7cbfc3df 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceTest.java @@ -35,9 +35,11 @@ import org.apache.geode.cache.wan.GatewayEventFilter; import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; import org.apache.geode.cache.wan.GatewayQueueEvent; import org.apache.geode.cache.wan.GatewaySender; + import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java index 40956202..adb7557b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java @@ -29,8 +29,10 @@ import org.apache.geode.cache.Cache; import org.apache.geode.cache.util.GatewayConflictHelper; import org.apache.geode.cache.util.GatewayConflictResolver; import org.apache.geode.cache.util.TimestampedEntryEvent; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java index 017a8606..2d13923a 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java @@ -22,8 +22,10 @@ import static org.junit.Assert.assertTrue; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.cache.server.ClientSubscriptionConfig; + 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.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java index 14203408..8f11187a 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java @@ -23,8 +23,10 @@ import static org.junit.Assert.assertTrue; import org.apache.geode.cache.InterestPolicy; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.SubscriptionAttributes; + 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.PeerRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java index 4848209e..8ac9c793 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java @@ -22,8 +22,10 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import org.apache.geode.pdx.PdxSerializer; + 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.CacheFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java index e830cb3e..5c456204 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java @@ -24,8 +24,10 @@ import static org.junit.Assert.assertThat; import java.util.Properties; import org.apache.geode.pdx.PdxSerializer; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java index fc27b46d..8c084588 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java @@ -29,14 +29,15 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + import org.springframework.beans.PropertyValues; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; /** * Unit tests for {@link ClientCacheParser}. diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java index 865d8c11..58896a9f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java @@ -45,9 +45,11 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.util.CacheWriterAdapter; import org.apache.geode.compression.Compressor; + import org.junit.AfterClass; 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.SimpleCacheListener; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionUsingDataPolicyAndShortcutTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionUsingDataPolicyAndShortcutTest.java index 4cafb179..c3c521d1 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionUsingDataPolicyAndShortcutTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionUsingDataPolicyAndShortcutTest.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire.config.xml; import static org.junit.Assert.assertTrue; import org.junit.Test; + import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java index f2f5cfbe..a84e6e97 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java @@ -32,10 +32,12 @@ import javax.annotation.Resource; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.query.CqListener; import org.apache.geode.cache.query.CqQuery; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.fork.CqCacheServerProcess; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java index 4d88a4da..1c903217 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java @@ -41,10 +41,12 @@ import org.apache.geode.cache.Region.Entry; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.Scope; import org.apache.geode.cache.util.ObjectSizer; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java index 543ffd7d..a102927c 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java @@ -23,8 +23,10 @@ import java.io.File; import java.util.Properties; import org.apache.geode.cache.DiskStore; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/DynamicRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/DynamicRegionNamespaceTest.java index cf034710..828cb458 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/DynamicRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/DynamicRegionNamespaceTest.java @@ -25,8 +25,10 @@ import java.io.File; import org.apache.geode.cache.Cache; import org.apache.geode.cache.DynamicRegionFactory; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java index 6409c2af..3c291efe 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java @@ -22,8 +22,10 @@ import static org.junit.Assert.assertNotNull; import org.apache.geode.cache.execute.FunctionAdapter; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.FunctionService; + 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; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java index 6a17ea83..85b934dc 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; +import org.apache.geode.cache.wan.GatewayReceiver; + import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.wan.GatewayReceiver; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.data.gemfire.wan.GatewayReceiverFactoryBean; import org.springframework.test.context.ActiveProfiles; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java index 84168b4c..90ce3d23 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; +import org.apache.geode.cache.wan.GatewayReceiver; + import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.wan.GatewayReceiver; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.data.gemfire.wan.GatewayReceiverFactoryBean; import org.springframework.test.context.ActiveProfiles; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java index 334565ca..ec8f16fd 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; +import org.apache.geode.cache.wan.GatewayReceiver; + import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.wan.GatewayReceiver; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.data.gemfire.wan.GatewayReceiverFactoryBean; import org.springframework.test.context.ActiveProfiles; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java index 3e651700..7bbac12b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.config.xml; import static org.junit.Assert.assertEquals; @@ -28,9 +27,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import org.junit.AfterClass; -import org.junit.Test; - import org.apache.geode.cache.Region; import org.apache.geode.cache.asyncqueue.AsyncEvent; import org.apache.geode.cache.asyncqueue.AsyncEventListener; @@ -42,6 +38,9 @@ import org.apache.geode.cache.wan.GatewaySender; import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; import org.apache.geode.cache.wan.GatewayTransportFilter; +import org.junit.AfterClass; +import org.junit.Test; + import org.springframework.data.gemfire.PeerRegionFactoryBean; import org.springframework.data.gemfire.RecreatingContextTest; import org.springframework.data.gemfire.TestUtils; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java index 48589013..88f39c1b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java @@ -24,8 +24,10 @@ import static org.junit.Assert.assertTrue; import org.apache.geode.cache.EntryEvent; import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; import org.apache.geode.cache.wan.GatewaySender; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java index 40193799..072c4c30 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java @@ -23,8 +23,10 @@ import javax.annotation.Resource; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.Index; + 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.IndexFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionDefinitionUsingBeansNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionDefinitionUsingBeansNamespaceTest.java index 77c4e0a2..0e141f7b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionDefinitionUsingBeansNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionDefinitionUsingBeansNamespaceTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.gemfire.PeerRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java index ad6931ca..266eba7e 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/InvalidRegionExpirationAttributesNamespaceTest.java @@ -19,12 +19,14 @@ package org.springframework.data.gemfire.config.xml; import static org.assertj.core.api.Assertions.assertThat; import org.apache.geode.cache.Region; + import org.junit.Test; +import org.xml.sax.SAXParseException; + import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.data.gemfire.test.GemfireTestBeanPostProcessor; -import org.xml.sax.SAXParseException; /** * Unit test testing the proper syntax for declaring "custom" expiration attributes on a {@link Region}. diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java index ca9d30f5..1fc5b1ff 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java @@ -25,8 +25,10 @@ import java.util.List; import java.util.Map; import org.apache.geode.internal.datasource.ConfigProperty; + 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.CacheFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java index 2903c653..c852765c 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java @@ -21,8 +21,10 @@ import static org.junit.Assert.assertTrue; import org.apache.geode.cache.Cache; import org.apache.geode.internal.datasource.GemFireBasicDataSource; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java index 07c1d334..ce9e6c6e 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java @@ -30,8 +30,10 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.Scope; import org.apache.geode.compression.Compressor; + 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.PeerRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java index 008480cf..c83cc01f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java @@ -25,8 +25,10 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.Region; import org.apache.geode.cache.Scope; + 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; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java index 06f76f62..d7a22f08 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/LookupRegionWithAsyncEventQueuesAndGatewaySendersIntegrationTests.java @@ -20,14 +20,14 @@ import static org.mockito.Mockito.mock; import javax.annotation.Resource; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.data.gemfire.support.AbstractFactoryBeanSupport; import org.springframework.lang.Nullable; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java index c797f90c..343aabc5 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java @@ -41,10 +41,12 @@ import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneIndexFactory; import org.apache.geode.cache.lucene.LuceneSerializer; import org.apache.geode.cache.lucene.LuceneService; + import org.apache.lucene.analysis.Analyzer; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.stubbing.Answer; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java index 435ffe0d..3eb94742 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java @@ -24,8 +24,10 @@ import org.apache.geode.cache.MembershipAttributes; import org.apache.geode.cache.Region; import org.apache.geode.cache.ResumptionAction; import org.apache.geode.distributed.Role; + 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.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java index b51d7883..ff3eb9d1 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java @@ -18,7 +18,9 @@ import static org.junit.Assert.assertSame; import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; + import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java index dd4155ac..9235a3aa 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java @@ -36,8 +36,10 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.partition.PartitionListener; import org.apache.geode.cache.partition.PartitionListenerAdapter; import org.apache.geode.compression.Compressor; + 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.PartitionedRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java index 587e9507..ebd49e36 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java @@ -21,8 +21,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Iterator; import org.apache.geode.cache.client.Pool; + 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.TestUtils; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java index 0a418527..0b4b1f42 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java @@ -35,6 +35,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + import org.springframework.beans.PropertyValues; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConstructorArgumentValues; @@ -48,8 +51,6 @@ import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.gemfire.client.PoolFactoryBean; import org.springframework.data.gemfire.support.ConnectionEndpoint; import org.springframework.data.gemfire.support.ConnectionEndpointList; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; /** * Unit tests for {@link PoolParser}. diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java index e9f31f03..2c29d5ac 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java @@ -26,8 +26,10 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.PartitionAttributes; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; + 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.PeerRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java index 1eefccfe..ad0d9bdd 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java @@ -26,8 +26,10 @@ import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAlgorithm; import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.Region; + 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.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java index fa103eb7..749aec30 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java @@ -28,8 +28,10 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.ExpirationAction; import org.apache.geode.cache.ExpirationAttributes; import org.apache.geode.cache.Region; + 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.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java index 428cbcd1..186cd617 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java @@ -24,8 +24,10 @@ import javax.annotation.Resource; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.InterestPolicy; import org.apache.geode.cache.Region; + 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; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest.java index e3575d1b..1ddb7693 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionWithSubRegionBeanDefinitionHashCodeTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.support.AbstractApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java index 3909ea24..306e420e 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java @@ -25,8 +25,10 @@ import javax.annotation.Resource; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.Region; + 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; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java index 98e21b17..ab37887f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java @@ -31,13 +31,15 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.Scope; import org.apache.geode.compression.Compressor; + 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.PeerRegionFactoryBean; -import org.springframework.data.gemfire.ResolvableRegionFactoryBean; import org.springframework.data.gemfire.ReplicatedRegionFactoryBean; +import org.springframework.data.gemfire.ResolvableRegionFactoryBean; import org.springframework.data.gemfire.SimpleCacheListener; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.test.mock.context.GemFireMockObjectsApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java index 6d41a72c..690ecdf2 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java @@ -23,8 +23,10 @@ import static org.junit.Assert.assertSame; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.Region; + 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.ReplicatedRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java index 815cea7d..c74debbd 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.config.xml; import static org.junit.Assert.assertNotNull; @@ -28,8 +27,10 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.asyncqueue.AsyncEvent; import org.apache.geode.cache.asyncqueue.AsyncEventListener; import org.apache.geode.cache.util.CacheListenerAdapter; + 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; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java index 68526604..2bfa59c8 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionWithInvalidDataPolicyTest.java @@ -20,10 +20,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.xml.sax.SAXParseException; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.xml.sax.SAXParseException; /** * The SubRegionWithInvalidDataPolicyTest class is a test suite of test cases testing the data-policy and persistent diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java index f52de73c..9eb6a330 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java @@ -41,8 +41,10 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.util.CacheListenerAdapter; import org.apache.geode.cache.util.CacheWriterAdapter; import org.apache.geode.cache.util.ObjectSizer; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StringUtils; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java index f1b3c2be..c858ba30 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java @@ -30,9 +30,11 @@ import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAlgorithm; import org.apache.geode.cache.PartitionResolver; import org.apache.geode.cache.Region; + import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.data.gemfire.test.support.FileSystemUtils; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest.java index a5bd563c..53412e53 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionDefinitionOrderErrorNamespaceTest.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire.config.xml; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; + import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java index 49a041d6..9d9cc030 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java @@ -57,8 +57,10 @@ import org.apache.geode.cache.util.CacheListenerAdapter; import org.apache.geode.cache.util.CacheWriterAdapter; import org.apache.geode.cache.util.ObjectSizer; import org.apache.geode.distributed.Role; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanIsAbstractException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java index 21e67127..f1b6c51b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java @@ -25,8 +25,10 @@ import org.apache.geode.cache.TransactionEvent; import org.apache.geode.cache.TransactionListener; import org.apache.geode.cache.TransactionWriter; import org.apache.geode.cache.TransactionWriterException; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java index c7531799..c8e97d1f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; 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.transaction.GemfireTransactionManager; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java index f2886b06..1333f697 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java @@ -23,8 +23,10 @@ import java.util.function.Function; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.Pool; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.function.annotation.OnRegion; diff --git a/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java index f08e22d7..05334255 100644 --- a/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java @@ -21,12 +21,14 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import org.apache.geode.cache.Region; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.GemfireOperations; import org.springframework.data.gemfire.GemfireTemplate; diff --git a/src/test/java/org/springframework/data/gemfire/domain/ListablePageUnitTests.java b/src/test/java/org/springframework/data/gemfire/domain/ListablePageUnitTests.java index f0af39f0..bb2f348a 100644 --- a/src/test/java/org/springframework/data/gemfire/domain/ListablePageUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/domain/ListablePageUnitTests.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.List; import org.junit.Test; + import org.springframework.data.domain.Page; /** diff --git a/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java index af65573e..86c51d3f 100644 --- a/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java @@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import org.apache.geode.cache.EvictionAction; + import org.junit.After; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java index 54af0f9c..2849524c 100644 --- a/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import org.apache.geode.cache.EvictionAction; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java index 6f0c8c52..c5b894c5 100644 --- a/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java @@ -27,6 +27,7 @@ import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAlgorithm; import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.util.ObjectSizer; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java index 8f9491c0..a3361ad6 100644 --- a/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.apache.geode.cache.EvictionAlgorithm; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java index 32eb9344..3eaceb70 100644 --- a/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java @@ -33,11 +33,13 @@ import org.apache.geode.cache.CustomExpiry; import org.apache.geode.cache.ExpirationAction; import org.apache.geode.cache.ExpirationAttributes; import org.apache.geode.cache.Region; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java index a40b48f6..37c219e0 100644 --- a/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java @@ -36,10 +36,12 @@ import static org.springframework.data.gemfire.expiration.AnnotationBasedExpirat import org.apache.geode.cache.ExpirationAction; import org.apache.geode.cache.ExpirationAttributes; import org.apache.geode.cache.Region; + import org.junit.Test; import org.mockito.Matchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.core.convert.ConversionService; diff --git a/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java index 59a594dd..b557df2c 100644 --- a/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java @@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import org.apache.geode.cache.ExpirationAction; + import org.junit.After; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java index fa14a8ab..be86734b 100644 --- a/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import org.apache.geode.cache.ExpirationAction; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java index 6f8181df..8f942b4a 100644 --- a/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import org.apache.geode.cache.ExpirationAction; import org.apache.geode.cache.ExpirationAttributes; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/fork/CqCacheServerProcess.java b/src/test/java/org/springframework/data/gemfire/fork/CqCacheServerProcess.java index dc3849dd..57a7cbd7 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/CqCacheServerProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/CqCacheServerProcess.java @@ -27,6 +27,7 @@ import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.Scope; import org.apache.geode.cache.server.CacheServer; + import org.springframework.data.gemfire.ForkUtil; /** diff --git a/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java b/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java index faffe5b8..a2844fa5 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java @@ -30,6 +30,7 @@ import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.cache.server.CacheServer; + import org.springframework.data.gemfire.ForkUtil; /** diff --git a/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java b/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java index dde1e9a6..c01f57d5 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java @@ -20,6 +20,7 @@ import java.io.File; import org.apache.geode.distributed.ServerLauncher; import org.apache.geode.distributed.internal.DistributionConfig; + import org.springframework.data.gemfire.process.support.ProcessUtils; import org.springframework.data.gemfire.test.support.FileSystemUtils; diff --git a/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java b/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java index cfa1abe1..47a3a135 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java @@ -25,6 +25,7 @@ import org.apache.geode.distributed.Locator; import org.apache.geode.distributed.LocatorLauncher; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.InternalLocator; + import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.process.support.ProcessUtils; import org.springframework.data.gemfire.test.support.FileSystemUtils; diff --git a/src/test/java/org/springframework/data/gemfire/fork/ServerProcess.java b/src/test/java/org/springframework/data/gemfire/fork/ServerProcess.java index ec522c66..40f2a2da 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/ServerProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/ServerProcess.java @@ -21,6 +21,7 @@ import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.gemfire.process.support.ProcessUtils; diff --git a/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java b/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java index ff22d462..9fa7327d 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/SpringContainerProcess.java @@ -18,6 +18,7 @@ import java.util.Scanner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.gemfire.ForkUtil; diff --git a/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java b/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java index 7aa84326..4ac03441 100644 --- a/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java @@ -23,6 +23,7 @@ import java.util.Optional; import java.util.stream.IntStream; import org.apache.geode.cache.execute.ResultSender; + import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java index e8317a8e..455d10f1 100644 --- a/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java @@ -32,10 +32,12 @@ import org.apache.geode.pdx.PdxReader; import org.apache.geode.pdx.PdxSerializer; import org.apache.geode.pdx.PdxWriter; import org.apache.geode.pdx.internal.PdxInstanceEnum; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java index ea18e413..3890018c 100644 --- a/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java @@ -28,12 +28,14 @@ import java.util.concurrent.TimeUnit; import org.apache.geode.cache.execute.FunctionAdapter; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.FunctionException; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.function.sample.ExceptionThrowingFunctionExecution; diff --git a/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java b/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java index 80d6511e..1d9f931a 100644 --- a/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java @@ -28,7 +28,9 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.RegionFunctionContext; import org.apache.geode.cache.execute.ResultSender; + import org.junit.Test; + import org.springframework.data.gemfire.function.annotation.Filter; import org.springframework.data.gemfire.function.annotation.RegionData; diff --git a/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java index d72dd407..a4c8744d 100644 --- a/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java @@ -22,7 +22,9 @@ import java.lang.reflect.Method; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.RegionFunctionContext; + import org.junit.Test; + import org.springframework.data.gemfire.function.annotation.GemfireFunction; import org.springframework.data.gemfire.util.ArrayUtils; diff --git a/src/test/java/org/springframework/data/gemfire/function/FunctionWithRequiredPermissionsRegistrationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/function/FunctionWithRequiredPermissionsRegistrationIntegrationTests.java index 5eeaaa6b..9952f700 100644 --- a/src/test/java/org/springframework/data/gemfire/function/FunctionWithRequiredPermissionsRegistrationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/FunctionWithRequiredPermissionsRegistrationIntegrationTests.java @@ -23,8 +23,10 @@ import java.lang.annotation.Annotation; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.security.ResourcePermission; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.gemfire.function.annotation.GemfireFunction; diff --git a/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java b/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java index b69da1c2..ec8484d5 100644 --- a/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java @@ -22,7 +22,9 @@ import java.lang.reflect.Method; import java.util.Arrays; import org.apache.geode.security.ResourcePermission; + import org.junit.Test; + import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.data.gemfire.function.annotation.GemfireFunction; diff --git a/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java b/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java index d8941756..f15fba20 100644 --- a/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java @@ -37,9 +37,11 @@ import org.apache.geode.pdx.PdxSerializer; import org.apache.geode.pdx.PdxWriter; import org.apache.geode.pdx.internal.PdxInstanceEnum; import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; + import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java b/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java index 72c69cb7..cb7303e0 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java @@ -21,8 +21,10 @@ import java.util.Set; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionService; + 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.function.annotation.Filter; diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java index 0d44afb1..412dee0a 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java @@ -25,8 +25,10 @@ import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.execute.FunctionException; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProviderTest.java b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProviderTest.java index c8eed65e..82b6f07d 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProviderTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProviderTest.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Set; import org.junit.Test; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.ScannedGenericBeanDefinition; import org.springframework.core.type.filter.AssignableTypeFilter; diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java index d9d1d6b4..824b1a71 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java @@ -16,8 +16,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java b/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java index 27180453..c079d3b3 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java @@ -14,6 +14,7 @@ package org.springframework.data.gemfire.function.config; 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; diff --git a/src/test/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java b/src/test/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java index 6686325f..d8ec71d2 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java @@ -27,6 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java b/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java index d51568d6..75d538cb 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilderUnitTests.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.junit.Test; + import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.config.RuntimeBeanReference; diff --git a/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java index 8bac6727..edf1c114 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java @@ -16,8 +16,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import org.apache.geode.cache.Region; + 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.TestUtils; diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java index 2a524ba5..d795ee58 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java @@ -41,6 +41,7 @@ import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionException; import org.apache.geode.cache.execute.ResultCollector; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java index b86bf61e..4eb474ac 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java @@ -30,6 +30,7 @@ import java.util.List; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.ResultCollector; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionIntegrationTests.java index dcc1a1e8..62572513 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionIntegrationTests.java @@ -22,11 +22,13 @@ import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolManager; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; + import org.springframework.data.gemfire.fork.FunctionCacheServerProcess; import org.springframework.data.gemfire.process.ProcessWrapper; import org.springframework.data.gemfire.test.support.ClientServerIntegrationTestsSupport; diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java index 89084a94..425fd308 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java @@ -26,11 +26,13 @@ import java.util.Map; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.function.annotation.GemfireFunction; import org.springframework.data.gemfire.function.annotation.RegionData; diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanUnitTests.java index bedb9f4d..88abae46 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanUnitTests.java @@ -27,6 +27,7 @@ import java.util.Map; import org.aopalliance.intercept.MethodInvocation; import org.junit.Before; import org.junit.Test; + import org.springframework.data.gemfire.function.annotation.FunctionId; /** diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateIntegrationTests.java index 999cb340..60013f18 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateIntegrationTests.java @@ -21,11 +21,13 @@ import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolManager; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; + import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.fork.FunctionCacheServerProcess; import org.springframework.data.gemfire.process.ProcessWrapper; diff --git a/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java b/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java index 75d6fade..3a4e857b 100644 --- a/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java +++ b/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.function.sample; import org.apache.geode.pdx.PdxInstance; + import org.springframework.data.gemfire.function.ClientCacheFunctionExecutionWithPdxIntegrationTest; import org.springframework.data.gemfire.function.annotation.OnServer; diff --git a/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerTests.java b/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerTests.java index 45fbf537..a8367303 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerTests.java +++ b/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerTests.java @@ -49,11 +49,13 @@ import org.apache.geode.cache.query.CqState; import org.apache.geode.cache.query.QueryException; import org.apache.geode.cache.query.QueryService; import org.apache.geode.internal.cache.PoolManagerImpl; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerIntegrationTests.java index ca66053b..4ed3f519 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerIntegrationTests.java @@ -27,11 +27,13 @@ import org.apache.geode.cache.CacheClosedException; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.cache.query.CqEvent; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; + import org.springframework.data.gemfire.fork.CqCacheServerProcess; import org.springframework.data.gemfire.listener.adapter.ContinuousQueryListenerAdapter; import org.springframework.data.gemfire.process.ProcessWrapper; diff --git a/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests.java index 2582c5de..7769450d 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupIntegrationTests.java @@ -21,10 +21,12 @@ import static org.assertj.core.api.Assertions.assertThat; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.query.CqQuery; + import org.junit.AfterClass; 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.fork.CqCacheServerProcess; diff --git a/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java b/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java index 80f21973..580994a1 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java @@ -29,8 +29,10 @@ import static org.mockito.Mockito.verify; import org.apache.geode.cache.Operation; import org.apache.geode.cache.query.CqEvent; import org.apache.geode.cache.query.CqQuery; + import org.junit.Before; import org.junit.Test; + import org.springframework.data.gemfire.listener.ContinuousQueryListener; /** diff --git a/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java index 158bd905..6dbc6200 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java @@ -21,11 +21,12 @@ import static org.assertj.core.api.Assertions.assertThat; import java.math.BigDecimal; import java.math.BigInteger; -import org.junit.Test; -import org.springframework.data.gemfire.mapping.annotation.Region; - import lombok.Data; +import org.junit.Test; + +import org.springframework.data.gemfire.mapping.annotation.Region; + /** * Unit tests for {@link GemfireMappingContext} class. * diff --git a/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java index 83add4bc..9828ca56 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/GemfirePersistentEntityUnitTests.java @@ -26,6 +26,7 @@ import java.math.BigInteger; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; + import org.springframework.data.annotation.Id; import org.springframework.data.gemfire.mapping.annotation.Region; import org.springframework.data.mapping.IdentifierAccessor; diff --git a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java index 82738d59..1314f358 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java @@ -36,6 +36,13 @@ import java.util.Base64; import java.util.Collections; import java.util.Optional; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import lombok.Setter; + import org.apache.geode.DataSerializable; import org.apache.geode.Instantiator; import org.apache.geode.cache.Cache; @@ -45,23 +52,18 @@ import org.apache.geode.cache.Region; import org.apache.geode.pdx.PdxReader; import org.apache.geode.pdx.PdxSerializer; import org.apache.geode.pdx.PdxWriter; + import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; + import org.springframework.data.annotation.ReadOnlyProperty; import org.springframework.data.annotation.Transient; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.repository.sample.Address; import org.springframework.data.gemfire.repository.sample.Person; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.Getter; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import lombok.Setter; - /** * Integration tests for {@link MappingPdxSerializer}. * diff --git a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java index 5b15a1df..ed4a0809 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java @@ -45,11 +45,13 @@ import com.gemstone.gemfire.TestGemStoneGemFireType; import org.apache.geode.pdx.PdxReader; import org.apache.geode.pdx.PdxSerializer; import org.apache.geode.pdx.PdxWriter; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.core.Ordered; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java index 346c26fa..0133592e 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java @@ -24,10 +24,12 @@ import java.util.Arrays; import java.util.List; import org.apache.geode.pdx.PdxReader; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.core.convert.TypeDescriptor; import org.springframework.expression.TypedValue; diff --git a/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java b/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java index 61390b0e..70326d9e 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java @@ -29,6 +29,7 @@ import java.util.Arrays; import java.util.List; import org.apache.geode.cache.Region; + import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -37,6 +38,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.repository.sample.User; import org.springframework.data.mapping.context.MappingContext; diff --git a/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java index 2357d675..68604bf8 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java @@ -41,6 +41,7 @@ import java.time.chrono.Chronology; import java.time.chrono.Era; import org.junit.Test; + import org.springframework.data.gemfire.test.model.Person; /** diff --git a/src/test/java/org/springframework/data/gemfire/process/ProcessExecutor.java b/src/test/java/org/springframework/data/gemfire/process/ProcessExecutor.java index 3b065039..b5e5d92a 100644 --- a/src/test/java/org/springframework/data/gemfire/process/ProcessExecutor.java +++ b/src/test/java/org/springframework/data/gemfire/process/ProcessExecutor.java @@ -22,7 +22,6 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java index 688279d9..11d30899 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java @@ -30,8 +30,10 @@ import java.util.Properties; import org.apache.geode.cache.Cache; import org.apache.geode.cache.RegionAttributes; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/repository/OqlKeywordUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/OqlKeywordUnitTests.java index 04a02427..c072f5b2 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/OqlKeywordUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/OqlKeywordUnitTests.java @@ -24,6 +24,7 @@ import static org.hamcrest.Matchers.nullValue; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; + import org.springframework.data.gemfire.repository.query.support.OqlKeyword; /** diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java index 8aad0228..1a7a7c21 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java @@ -29,6 +29,7 @@ import static org.junit.Assert.assertThat; import org.apache.geode.cache.CacheClosedException; import org.apache.geode.cache.CacheFactory; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java index ba1bd1de..f274fadb 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java @@ -25,6 +25,7 @@ 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.springframework.data.gemfire.repository.sample.Person; import org.springframework.util.Assert; diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java index ff48d29a..13f8f5f5 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java @@ -48,12 +48,14 @@ import javax.enterprise.inject.spi.BeanManager; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.core.env.StandardEnvironment; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.data.gemfire.GemfireAccessor; diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java index 9586e357..b590d212 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java @@ -43,10 +43,12 @@ import javax.enterprise.inject.spi.ProcessBean; import javax.inject.Qualifier; import org.apache.geode.cache.Region; + import org.junit.Before; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.gemfire.repository.GemfireRepository; diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java index aad56177..6cdc503f 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java @@ -18,8 +18,10 @@ package org.springframework.data.gemfire.repository.config; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java index 085ec57b..87ad64dd 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoryConfigurationExtensionTest.java @@ -33,6 +33,9 @@ import java.util.Collection; import java.util.Optional; import org.junit.Test; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; @@ -50,8 +53,6 @@ import org.springframework.data.gemfire.repository.GemfireRepository; import org.springframework.data.gemfire.repository.support.GemfireRepositoryFactoryBean; import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource; import org.springframework.data.repository.config.XmlRepositoryConfigurationSource; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; /** * Unit tests for {@link GemfireRepositoryConfigurationExtension}. diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/IncompatibleRegionKeyRepositoryIdAndEntityIdRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/config/IncompatibleRegionKeyRepositoryIdAndEntityIdRepositoryIntegrationTests.java index d4133ae5..6ae1b300 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/config/IncompatibleRegionKeyRepositoryIdAndEntityIdRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/config/IncompatibleRegionKeyRepositoryIdAndEntityIdRepositoryIntegrationTests.java @@ -24,7 +24,9 @@ import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests.java index 63feb1bd..907470e3 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/config/RepositoryClientRegionIntegrationTests.java @@ -18,6 +18,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.process.ProcessWrapper; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java b/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java index a4b7074f..27eeda9b 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java @@ -25,6 +25,7 @@ import java.io.Serializable; import org.junit.Before; import org.junit.Test; + import org.springframework.data.annotation.Id; import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; 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 67805ee5..626ad7ad 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 @@ -21,6 +21,7 @@ import static org.junit.Assert.assertThat; import org.junit.Before; import org.junit.Test; + import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; import org.springframework.data.gemfire.repository.sample.Person; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java index ab98f1ea..648f8c8b 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java @@ -33,6 +33,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.gemfire.mapping.GemfireMappingContext; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/PredicatesUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/PredicatesUnitTests.java index dcb0fb1c..f8d6f7c0 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/PredicatesUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/PredicatesUnitTests.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.Iterator; import org.junit.Test; + import org.springframework.data.gemfire.repository.query.Predicates.AtomicPredicate; import org.springframework.data.repository.query.parser.Part; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java index 08581a8c..0c6f889b 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/QueryBuilderUnitTests.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.junit.Test; + import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; import org.springframework.data.repository.query.parser.PartTree; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorIntegrationTests.java index 7db28afe..d574faf9 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorIntegrationTests.java @@ -25,9 +25,11 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorUnitTests.java index 8eb08d20..bdfac35f 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/QueryPostProcessorUnitTests.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.when; import org.junit.Test; import org.mockito.InOrder; + import org.springframework.data.repository.query.QueryMethod; /** diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java index 3213888d..d5dabec0 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java @@ -29,12 +29,14 @@ import java.util.Arrays; import java.util.regex.Pattern; import org.apache.geode.cache.Region; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.domain.Sort; import org.springframework.data.gemfire.repository.sample.Person; import org.springframework.data.gemfire.repository.sample.RootUser; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java b/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java index b0675518..5e43691a 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java @@ -39,6 +39,7 @@ import java.util.List; import org.apache.geode.cache.query.SelectResults; import org.apache.geode.cache.query.internal.ResultsBag; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java index c1efd35c..f9494c53 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java @@ -24,8 +24,10 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest.java index d4f2dccc..427b018f 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest.java @@ -22,6 +22,7 @@ import java.util.Optional; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java index b6500af1..da9dabf9 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java @@ -18,13 +18,13 @@ package org.springframework.data.gemfire.repository.sample; import java.util.Objects; +import lombok.Data; + import org.springframework.data.annotation.Id; import org.springframework.data.gemfire.mapping.annotation.Region; import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion; import org.springframework.util.ObjectUtils; -import lombok.Data; - /** * The Customer class is a class abstraction modeling a Customer. * diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java index 06758026..b0a7795f 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java @@ -28,9 +28,11 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.geode.cache.Cache; import org.apache.geode.cache.RegionAttributes; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java b/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java index 4bc5457e..d43fdaff 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java @@ -15,6 +15,7 @@ package org.springframework.data.gemfire.repository.sample; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.springframework.beans.factory.InitializingBean; /** diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RepositoryQueriesWithJoinsIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/RepositoryQueriesWithJoinsIntegrationTest.java index 7602ad2f..0a46b6ce 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/RepositoryQueriesWithJoinsIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/RepositoryQueriesWithJoinsIntegrationTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java index 93a3c339..acdc0463 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java @@ -31,9 +31,11 @@ import java.util.Map; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.repository.Wrapper; import org.springframework.test.context.ContextConfiguration; 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 a1f236e7..2efcb2e6 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 @@ -29,9 +29,11 @@ import java.util.List; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java index 0af37db2..da75b71b 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java @@ -27,9 +27,11 @@ import java.util.List; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; 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 5953c405..6188cad1 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 @@ -27,10 +27,12 @@ import java.util.Arrays; import java.util.List; import org.apache.geode.cache.Region; + import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.data.gemfire.GemfireTemplate; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java index 2a9a7aed..ac90ff34 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java @@ -26,10 +26,12 @@ import java.util.Collections; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; + import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.gemfire.repository.sample.PersonRepository; 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 5e0bb148..07a91a1f 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 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertThat; import java.util.Collections; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.mapping.GemfireMappingContext; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java index 7d9db2ec..ed9d1f28 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java @@ -33,11 +33,13 @@ import java.util.Collections; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.aop.framework.Advised; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.mapping.GemfireMappingContext; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java index bea9b77c..a4d2ac80 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java @@ -29,9 +29,11 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionEvent; import org.apache.geode.cache.query.SelectResults; import org.apache.geode.cache.util.CacheListenerAdapter; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.GemfireTemplate; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java index 15aebf03..f4ad8558 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java @@ -29,10 +29,12 @@ import java.util.concurrent.atomic.AtomicLong; import javax.annotation.Resource; import org.apache.geode.cache.Region; + import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.mapping.GemfireMappingContext; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java index 5eb57984..b1b057d1 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java @@ -50,11 +50,13 @@ import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.query.SelectResults; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.repository.Wrapper; import org.springframework.data.gemfire.repository.sample.Animal; diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java index 913414c9..f222049c 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java @@ -39,6 +39,7 @@ import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneQueryException; import org.apache.geode.cache.lucene.LuceneQueryFactory; import org.apache.geode.cache.lucene.LuceneService; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -46,6 +47,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.dao.DataRetrievalFailureException; import org.springframework.data.gemfire.search.lucene.support.LuceneAccessorSupport; diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java index fae962a4..049c825f 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java @@ -40,12 +40,14 @@ import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneIndexFactory; import org.apache.geode.cache.lucene.LuceneSerializer; import org.apache.geode.cache.lucene.LuceneService; + import org.apache.lucene.analysis.Analyzer; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.data.gemfire.GemfireUtils; diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java index d00c4ded..6783340a 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsIntegrationTests.java @@ -28,13 +28,17 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; -import org.junit.Test; -import org.junit.runner.RunWith; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.lucene.LuceneService; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.DependsOn; @@ -47,10 +51,6 @@ import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - /** * Integration tests for the Spring Data Geode, Apache Geode and Apache Lucene Integration. * diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java index 048a0e2f..bd600c78 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.apache.geode.cache.lucene.LuceneQueryProvider; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java index 415d4e13..a7cbd3a2 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.verify; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.lucene.LuceneService; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java index 389632f6..565856a9 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java @@ -40,6 +40,7 @@ import org.apache.geode.cache.lucene.LuceneQueryProvider; import org.apache.geode.cache.lucene.LuceneResultStruct; import org.apache.geode.cache.lucene.LuceneService; import org.apache.geode.cache.lucene.PageableLuceneQueryResults; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java index ce237e7e..7faf8728 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java @@ -28,11 +28,13 @@ import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.lucene.LuceneIndex; import org.apache.geode.cache.lucene.LuceneService; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.BeanFactory; import org.springframework.data.gemfire.search.lucene.support.ProjectingLuceneAccessorSupport; import org.springframework.data.projection.ProjectionFactory; diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java index 0e90fc51..9b6955d6 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.apache.geode.cache.lucene.LuceneQueryProvider; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java index 7e06daad..098501cf 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java @@ -32,21 +32,23 @@ import static org.mockito.Mockito.when; import java.util.List; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + import org.apache.geode.cache.lucene.LuceneQueryProvider; import org.apache.geode.cache.lucene.LuceneResultStruct; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.annotation.Id; import org.springframework.data.gemfire.mapping.annotation.Region; import org.springframework.data.projection.ProjectionFactory; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - /** * Unit tests for {@link ProjectingLuceneTemplate}. * diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java index c5de02bf..6c2aefdd 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java @@ -36,19 +36,21 @@ import java.util.List; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + import org.apache.geode.cache.lucene.LuceneResultStruct; import org.apache.geode.cache.lucene.PageableLuceneQueryResults; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.domain.Page; import org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - /** * Unit tests for {@link LucenePage}. * diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java index abcd0070..a3b2cd13 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java @@ -19,8 +19,9 @@ package org.springframework.data.gemfire.search.lucene.support; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import org.aopalliance.intercept.MethodInterceptor; import org.apache.geode.pdx.PdxInstance; + +import org.aopalliance.intercept.MethodInterceptor; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java index 38194506..1c5acb03 100644 --- a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java @@ -30,18 +30,19 @@ import static org.springframework.data.gemfire.search.lucene.support.PdxInstance import java.lang.reflect.Method; -import org.aopalliance.intercept.MethodInvocation; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + import org.apache.geode.pdx.PdxInstance; import org.apache.geode.pdx.WritablePdxInstance; + +import org.aopalliance.intercept.MethodInvocation; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - /** * Unit tests for {@link PdxInstanceMethodInterceptor}. * diff --git a/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java b/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java index 5ddfdede..55e2ab97 100644 --- a/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java +++ b/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java @@ -27,6 +27,7 @@ import java.io.Serializable; import org.apache.geode.DataSerializable; import org.apache.geode.Instantiator; + import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java b/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java index 9e8b1f78..c7549603 100644 --- a/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java +++ b/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java @@ -31,8 +31,10 @@ import java.util.List; import org.apache.geode.DataSerializable; import org.apache.geode.Instantiator; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java index 0cb2064b..ba161914 100644 --- a/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java @@ -31,9 +31,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.SelectResults; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.GemfireOperations; import org.springframework.data.gemfire.repository.sample.Person; diff --git a/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java index fe8ca783..ce6a63f3 100644 --- a/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java @@ -39,6 +39,7 @@ import org.apache.geode.cache.InterestRegistrationListener; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.cache.server.ClientSubscriptionConfig; import org.apache.geode.cache.server.ServerLoadProbe; + import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java b/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java index f4019af3..de1a28a5 100644 --- a/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java +++ b/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import org.apache.geode.cache.server.ClientSubscriptionConfig; + import org.junit.Test; /** diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java index 089e21e3..93ac8b7a 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java @@ -30,14 +30,14 @@ import java.util.concurrent.atomic.AtomicLong; import javax.annotation.Resource; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.snapshot.SnapshotFilter; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.snapshot.SnapshotFilter; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.gemfire.repository.sample.Person; diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java index 87499bc3..5650fbec 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java @@ -28,6 +28,7 @@ import java.util.Arrays; import java.util.List; import org.junit.Test; + import org.springframework.core.io.ClassPathResource; import org.springframework.data.gemfire.test.support.FileSystemUtils; diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java index e6366e57..f91cfe9d 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java @@ -47,13 +47,6 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; -import org.junit.After; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.mockito.ArgumentMatchers; - import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.cache.snapshot.CacheSnapshotService; @@ -61,14 +54,20 @@ import org.apache.geode.cache.snapshot.RegionSnapshotService; import org.apache.geode.cache.snapshot.SnapshotFilter; import org.apache.geode.cache.snapshot.SnapshotOptions; +import org.junit.After; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.ArgumentMatchers; +import org.slf4j.Logger; + import org.springframework.core.io.ClassPathResource; import org.springframework.data.gemfire.snapshot.event.ExportSnapshotApplicationEvent; import org.springframework.data.gemfire.snapshot.event.ImportSnapshotApplicationEvent; import org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent; import org.springframework.data.gemfire.test.support.FileSystemUtils; -import org.slf4j.Logger; - /** * The SnapshotServiceFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the SnapshotServiceFactoryBean class. diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java index 7fad6559..1f15316f 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java @@ -26,10 +26,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.apache.geode.cache.Region; + import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.io.ClassPathResource; diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java index ef09ad34..21311214 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java @@ -30,10 +30,12 @@ import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBe import org.apache.geode.cache.Region; import org.apache.geode.cache.snapshot.SnapshotOptions; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.data.gemfire.test.support.FileSystemUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java index f0bc8ace..a755a21c 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java @@ -28,7 +28,9 @@ import static org.mockito.Mockito.when; import java.util.concurrent.atomic.AtomicInteger; import org.apache.geode.cache.snapshot.SnapshotFilter; + import org.junit.Test; + import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.snapshot.filter.ComposableSnapshotFilter.Operator; diff --git a/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java index ecdf90c4..eacb91a4 100644 --- a/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java @@ -32,6 +32,7 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.slf4j.Logger; + import org.springframework.beans.factory.BeanFactory; /** diff --git a/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java index 515fa5e4..ea7615c5 100644 --- a/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java @@ -31,6 +31,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.BeanFactory; /** diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorAnnotationConfigIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorAnnotationConfigIntegrationTests.java index 26cffbc2..689f7ae1 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorAnnotationConfigIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorAnnotationConfigIntegrationTests.java @@ -24,6 +24,7 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests.java index 2ffee39f..da9c95dc 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorIntegrationTests.java @@ -24,6 +24,7 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorJavaConfigIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorJavaConfigIntegrationTests.java index fea04518..5e0965f1 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorJavaConfigIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorJavaConfigIntegrationTests.java @@ -24,6 +24,7 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java index 396eafbb..b1f0154e 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java @@ -43,6 +43,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.factory.BeanFactory; /** 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 9a4ef8d6..9f69691a 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest.java @@ -22,8 +22,10 @@ import java.util.Map; import org.apache.geode.cache.query.FunctionDomainException; import org.apache.geode.cache.query.QueryException; import org.apache.geode.cache.query.QueryInvocationTargetException; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.ApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java index f1e74364..6f5a2e29 100644 --- a/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java @@ -24,8 +24,10 @@ import java.util.Properties; import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionContext; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.gemfire.function.sample.HelloFunctionExecution; diff --git a/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests.java index 29a8ba5b..813dd781 100644 --- a/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportIntegrationTests.java @@ -31,6 +31,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.event.ContextRefreshedEvent; diff --git a/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportUnitTests.java index 2c8789c9..63bfe3b9 100644 --- a/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportUnitTests.java @@ -38,6 +38,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ConfigurableApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/support/SmartLifecycleSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/SmartLifecycleSupportUnitTests.java index 8a527aaf..eefc137a 100644 --- a/src/test/java/org/springframework/data/gemfire/support/SmartLifecycleSupportUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/SmartLifecycleSupportUnitTests.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.junit.Test; + import org.springframework.context.SmartLifecycle; /** diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java index 21737466..42b6a7d4 100644 --- a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java @@ -39,9 +39,11 @@ import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java b/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java index ec275eb6..4c06ae64 100644 --- a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerTest.java @@ -46,9 +46,11 @@ import java.util.Arrays; import java.util.Properties; import org.apache.geode.cache.Cache; + import org.junit.After; import org.junit.Test; import org.slf4j.Logger; + import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationListener; diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTests.java index 5449ac4e..28e8deb5 100644 --- a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTests.java @@ -24,8 +24,10 @@ import org.apache.geode.cache.Cache; import org.apache.geode.distributed.AbstractLauncher.Status; import org.apache.geode.distributed.ServerLauncher; import org.apache.geode.distributed.ServerLauncher.ServerState; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.data.gemfire.GemfireUtils; diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderUnitTests.java index d350d817..b312cbbc 100644 --- a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderUnitTests.java @@ -29,8 +29,10 @@ import java.util.Properties; import org.apache.geode.cache.Cache; import org.apache.geode.distributed.ServerLauncher; + import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.data.gemfire.GemfireUtils; diff --git a/src/test/java/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests.java index 206e7306..5681898e 100644 --- a/src/test/java/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/WiringDeclarableSupportIntegrationTests.java @@ -22,21 +22,23 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; +import lombok.Data; +import lombok.NoArgsConstructor; + import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import lombok.Data; -import lombok.NoArgsConstructor; - /** * Integration test for {@link WiringDeclarableSupport} and {@link GemfireBeanFactoryLocator}. * diff --git a/src/test/java/org/springframework/data/gemfire/test/GemfireTestApplicationContextInitializer.java b/src/test/java/org/springframework/data/gemfire/test/GemfireTestApplicationContextInitializer.java index e3c2dbf3..13575e4a 100644 --- a/src/test/java/org/springframework/data/gemfire/test/GemfireTestApplicationContextInitializer.java +++ b/src/test/java/org/springframework/data/gemfire/test/GemfireTestApplicationContextInitializer.java @@ -15,6 +15,7 @@ package org.springframework.data.gemfire.test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.StringUtils; diff --git a/src/test/java/org/springframework/data/gemfire/test/GemfireTestBeanPostProcessor.java b/src/test/java/org/springframework/data/gemfire/test/GemfireTestBeanPostProcessor.java index 0d83bf33..869dbfc1 100644 --- a/src/test/java/org/springframework/data/gemfire/test/GemfireTestBeanPostProcessor.java +++ b/src/test/java/org/springframework/data/gemfire/test/GemfireTestBeanPostProcessor.java @@ -14,6 +14,7 @@ package org.springframework.data.gemfire.test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.data.gemfire.CacheFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java b/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java index fce6fedf..2c414fd9 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java @@ -16,6 +16,7 @@ package org.springframework.data.gemfire.test; import java.util.Optional; import org.apache.geode.cache.GemFireCache; + import org.springframework.data.gemfire.CacheFactoryBean; /** diff --git a/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java b/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java index 70db0f61..cf91f9ef 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java @@ -15,6 +15,7 @@ package org.springframework.data.gemfire.test; import java.util.Optional; import org.apache.geode.cache.GemFireCache; + import org.springframework.data.gemfire.client.ClientCacheFactoryBean; /** diff --git a/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java b/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java index 424d991b..9970a75a 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java @@ -34,8 +34,10 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionFactory; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.compression.Compressor; + import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.util.StringUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java index 6cbed385..d7b314ca 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java @@ -39,8 +39,10 @@ import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.Scope; import org.apache.geode.cache.SubscriptionAttributes; import org.apache.geode.cache.query.QueryService; + import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.util.ReflectionUtils; /** 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 266726ce..b7728f39 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.Scope; + import org.junit.Test; public class MockRegionFactoryTest { @Test diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java index 8246df94..df179527 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java @@ -25,8 +25,10 @@ import java.util.Random; import org.apache.geode.cache.wan.GatewayReceiver; import org.apache.geode.cache.wan.GatewayReceiverFactory; import org.apache.geode.cache.wan.GatewayTransportFilter; + import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.util.StringUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java index 8a273e2d..3cad1428 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java @@ -26,6 +26,7 @@ import org.apache.geode.cache.wan.GatewaySender; import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; import org.apache.geode.cache.wan.GatewaySenderFactory; import org.apache.geode.cache.wan.GatewayTransportFilter; + import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java b/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java index 1d1fcff6..f81eac2e 100644 --- a/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java +++ b/src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.test.mock; import static org.assertj.core.api.Assertions.assertThat; @@ -127,9 +126,11 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.internal.concurrent.ConcurrentHashSet; import org.apache.geode.pdx.PdxSerializer; + import org.apache.lucene.analysis.Analyzer; import org.mockito.ArgumentMatchers; import org.mockito.stubbing.Answer; + import org.springframework.data.gemfire.IndexType; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; import org.springframework.data.gemfire.test.mock.support.MockObjectInvocationException; diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/MockObjectsSupport.java b/src/test/java/org/springframework/data/gemfire/test/mock/MockObjectsSupport.java index 2bf8d06e..f5468643 100644 --- a/src/test/java/org/springframework/data/gemfire/test/mock/MockObjectsSupport.java +++ b/src/test/java/org/springframework/data/gemfire/test/mock/MockObjectsSupport.java @@ -29,6 +29,7 @@ import java.util.function.Supplier; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; + import org.springframework.util.StringUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/annotation/EnableGemFireMockObjects.java b/src/test/java/org/springframework/data/gemfire/test/mock/annotation/EnableGemFireMockObjects.java index 1bf53bcb..634b1be1 100644 --- a/src/test/java/org/springframework/data/gemfire/test/mock/annotation/EnableGemFireMockObjects.java +++ b/src/test/java/org/springframework/data/gemfire/test/mock/annotation/EnableGemFireMockObjects.java @@ -24,6 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.cache.GemFireCache; + import org.springframework.context.annotation.Import; /** diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireUnitTest.java b/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireUnitTest.java index 0a578405..ef7d6ad8 100644 --- a/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireUnitTest.java +++ b/src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireUnitTest.java @@ -24,6 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.junit.runner.RunWith; + import org.springframework.data.gemfire.test.mock.context.GemFireMockObjectsApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/test/mock/config/GemFireMockObjectsBeanPostProcessor.java b/src/test/java/org/springframework/data/gemfire/test/mock/config/GemFireMockObjectsBeanPostProcessor.java index 405ddf27..8eb3fd6e 100644 --- a/src/test/java/org/springframework/data/gemfire/test/mock/config/GemFireMockObjectsBeanPostProcessor.java +++ b/src/test/java/org/springframework/data/gemfire/test/mock/config/GemFireMockObjectsBeanPostProcessor.java @@ -25,6 +25,7 @@ import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCacheFactory; import org.apache.geode.cache.client.PoolFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.data.gemfire.CacheFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/test/model/Book.java b/src/test/java/org/springframework/data/gemfire/test/model/Book.java index cb269e8d..b407c9c2 100644 --- a/src/test/java/org/springframework/data/gemfire/test/model/Book.java +++ b/src/test/java/org/springframework/data/gemfire/test/model/Book.java @@ -18,14 +18,14 @@ package org.springframework.data.gemfire.test.model; import java.io.Serializable; -import org.springframework.data.annotation.Id; -import org.springframework.data.gemfire.mapping.annotation.LuceneIndexed; -import org.springframework.data.gemfire.mapping.annotation.Region; - import lombok.Data; import lombok.NonNull; import lombok.RequiredArgsConstructor; +import org.springframework.data.annotation.Id; +import org.springframework.data.gemfire.mapping.annotation.LuceneIndexed; +import org.springframework.data.gemfire.mapping.annotation.Region; + /** * Abstract Data Type (ADT) modeling a {@literal Book} application domain type. * diff --git a/src/test/java/org/springframework/data/gemfire/test/support/AbstractNativeCacheTests.java b/src/test/java/org/springframework/data/gemfire/test/support/AbstractNativeCacheTests.java index ead880a8..8d0b0260 100644 --- a/src/test/java/org/springframework/data/gemfire/test/support/AbstractNativeCacheTests.java +++ b/src/test/java/org/springframework/data/gemfire/test/support/AbstractNativeCacheTests.java @@ -21,6 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; + import org.springframework.cache.Cache; /** diff --git a/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java b/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java index 906fb070..05560e44 100644 --- a/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java +++ b/src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java @@ -23,10 +23,12 @@ import java.util.HashMap; import java.util.Map; import org.apache.geode.cache.GemFireCache; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; + import org.springframework.data.gemfire.PeerRegionFactoryBean; import org.springframework.data.gemfire.test.StubCache; diff --git a/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java index a0d7bc94..7c4305db 100644 --- a/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java @@ -35,8 +35,10 @@ import lombok.RequiredArgsConstructor; import org.apache.geode.cache.CacheTransactionManager; import org.apache.geode.cache.CommitConflictException; import org.apache.geode.cache.client.ClientRegionShortcut; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.data.annotation.Id; diff --git a/src/test/java/org/springframework/data/gemfire/transaction/GemfireTransactionManagerIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/transaction/GemfireTransactionManagerIntegrationTests.java index 5d087d88..b30d6ea9 100644 --- a/src/test/java/org/springframework/data/gemfire/transaction/GemfireTransactionManagerIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/transaction/GemfireTransactionManagerIntegrationTests.java @@ -23,8 +23,10 @@ import javax.annotation.Resource; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.LocalRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java index 0d95df5f..76e25379 100644 --- a/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java @@ -22,8 +22,10 @@ import javax.annotation.Resource; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.LocalRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java b/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java index 20070a7a..ce6b3a82 100644 --- a/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/util/CollectionUtilsUnitTests.java @@ -37,6 +37,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import org.junit.Test; + import org.springframework.data.gemfire.test.support.MapBuilder; /** diff --git a/src/test/java/org/springframework/data/gemfire/util/RegionUtilsUnitTests.java b/src/test/java/org/springframework/data/gemfire/util/RegionUtilsUnitTests.java index 30ad8dab..90c5a5cc 100644 --- a/src/test/java/org/springframework/data/gemfire/util/RegionUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/util/RegionUtilsUnitTests.java @@ -23,12 +23,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.Test; - import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionService; +import org.junit.Test; + /** * Unit tests for {@link RegionUtils}. * diff --git a/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java b/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java index 3366c34d..01a1a510 100644 --- a/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java @@ -40,6 +40,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java index 69003570..5166c324 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueByIdXmlConfigurationIntegrationTests.java @@ -22,11 +22,6 @@ import java.io.IOException; import javax.annotation.Resource; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.Cache; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.GemFireCache; @@ -35,6 +30,11 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.asyncqueue.AsyncEventListener; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.PartitionedRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanTest.java index c2f71afa..16deeafd 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanTest.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.wan; import static org.assertj.core.api.Assertions.assertThat; @@ -21,8 +20,8 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -38,7 +37,9 @@ import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory; import org.apache.geode.cache.wan.GatewayEventFilter; import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; import org.apache.geode.cache.wan.GatewaySender; + import org.junit.Test; + import org.springframework.data.gemfire.TestUtils; /** diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java index e29dc03b..d56e8b27 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java @@ -30,8 +30,10 @@ import org.apache.geode.cache.asyncqueue.AsyncEvent; import org.apache.geode.cache.asyncqueue.AsyncEventListener; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; import org.apache.geode.cache.wan.GatewaySender; + 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; diff --git a/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java index 172d3d1d..bfc3f14c 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java @@ -31,8 +31,10 @@ import org.apache.geode.cache.asyncqueue.AsyncEvent; import org.apache.geode.cache.asyncqueue.AsyncEventListener; import org.apache.geode.cache.asyncqueue.AsyncEventQueue; import org.apache.geode.cache.wan.GatewaySender; + import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java index 86a0fa58..141a330e 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java @@ -24,12 +24,12 @@ import static org.mockito.Mockito.when; import java.util.Collections; -import org.junit.Test; - import org.apache.geode.cache.Cache; import org.apache.geode.cache.wan.GatewayReceiverFactory; import org.apache.geode.cache.wan.GatewayTransportFilter; +import org.junit.Test; + /** * The GatewayReceiverFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the GatewayReceiverFactoryBean class. diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java index 4d1a08cc..436b07dd 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderByIdXmlConfigurationIntegrationTests.java @@ -21,11 +21,6 @@ import java.io.IOException; import javax.annotation.Resource; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.Cache; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.GemFireCache; @@ -33,6 +28,11 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.wan.GatewaySender; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.ReplicatedRegionFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java index 7f20ced6..001dcc85 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java @@ -24,11 +24,11 @@ import java.io.IOException; import javax.annotation.Resource; +import org.apache.geode.cache.wan.GatewayReceiver; + import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.geode.cache.wan.GatewayReceiver; - import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java b/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java index ce13a2b5..89f09b2e 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java @@ -20,14 +20,14 @@ import static org.mockito.Mockito.mock; import javax.annotation.Resource; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.data.gemfire.support.AbstractFactoryBeanSupport; import org.springframework.lang.Nullable; import org.springframework.test.context.ContextConfiguration;