SGF-878 - Optimize imports.

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;

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;
 
 /**

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;

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;

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;

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;

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;
 
 /**

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;
 
 /**

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;
 

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;
 
 /**

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;
 
 /**

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;

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

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;

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;
 
 /**

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;

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;

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;
 
 /**

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;
 

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 

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;
 
 /**

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;

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;

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;

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;

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;
 
 /**

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;
 

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;
 
 /**

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;

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;

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;
 
 /**

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;

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;
 
 /**

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;
 

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;

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;

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;

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;
 

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;
 

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;
 
 /**

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;

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;
 
 /**

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;
 

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;
 

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;

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;

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;

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;

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;
 
 /**

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;
 

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;
 

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;
 

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;
 

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}.

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;
 

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;

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;

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;

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;

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;
 
 /**

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;

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;
 
 /**

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;
 
 /**

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;

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;

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;

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;
 

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;

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;
 

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;

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;
 

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;

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;

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;

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);

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;

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;

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;

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;

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.
  *

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.
  *

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.

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.

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.

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.

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.