DATAGEODE-198 - Change the generic signature of the Configurer interface.

src/main/java/org/springframework/data/gemfire/ConfigurableRegionFactoryBean.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.springframework.data.gemfire.util.ArrayUtils.nullSafeArray;
@@ -23,10 +22,10 @@ import static org.springframework.data.gemfire.util.CollectionUtils.nullSafeIter
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.StreamSupport;
 
 import org.apache.geode.cache.Region;
+
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
 import org.springframework.data.gemfire.config.annotation.RegionConfigurer;
@@ -57,6 +56,12 @@ public abstract class ConfigurableRegionFactoryBean<K, V> extends ResolvableRegi
 			nullSafeCollection(regionConfigurers)
 				.forEach(regionConfigurer -> regionConfigurer.configure(beanName, bean));
 		}
+
+		@Override
+		public void configure(String beanName, PeerRegionFactoryBean<?, ?> bean) {
+			nullSafeCollection(regionConfigurers)
+				.forEach(regionConfigurer -> regionConfigurer.configure(beanName, bean));
+		}
 	};
 
 	/**
@@ -92,7 +97,10 @@ public abstract class ConfigurableRegionFactoryBean<K, V> extends ResolvableRegi
 	 * @see org.springframework.data.gemfire.config.annotation.RegionConfigurer
 	 */
 	public void setRegionConfigurers(List<RegionConfigurer> regionConfigurers) {
-		this.regionConfigurers = Optional.ofNullable(regionConfigurers).orElseGet(Collections::emptyList);
+
+		this.regionConfigurers = regionConfigurers != null
+			? regionConfigurers
+			: Collections.emptyList();
 	}
 
 	/**
@@ -135,13 +143,13 @@ public abstract class ConfigurableRegionFactoryBean<K, V> extends ResolvableRegi
 	 */
 	protected void applyRegionConfigurers(String regionName, Iterable<RegionConfigurer> regionConfigurers) {
 
-		if (this instanceof PeerRegionFactoryBean) {
-			StreamSupport.stream(nullSafeIterable(regionConfigurers).spliterator(), false)
-				.forEach(regionConfigurer -> regionConfigurer.configure(regionName, (PeerRegionFactoryBean<K, V>) this));
-		}
-		else if (this instanceof ClientRegionFactoryBean) {
+		if (this instanceof ClientRegionFactoryBean) {
 			StreamSupport.stream(nullSafeIterable(regionConfigurers).spliterator(), false)
 				.forEach(regionConfigurer -> regionConfigurer.configure(regionName, (ClientRegionFactoryBean<K, V>) this));
 		}
+		else if (this instanceof PeerRegionFactoryBean) {
+			StreamSupport.stream(nullSafeIterable(regionConfigurers).spliterator(), false)
+				.forEach(regionConfigurer -> regionConfigurer.configure(regionName, (PeerRegionFactoryBean<K, V>) this));
+		}
 	}
 }

src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java

@@ -13,16 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.client;
 
 import static java.util.Arrays.stream;
 import static org.springframework.data.gemfire.util.ArrayUtils.nullSafeArray;
-import static org.springframework.data.gemfire.util.CollectionUtils.nullSafeCollection;
 import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -42,11 +38,11 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.cache.client.Pool;
 import org.apache.geode.cache.client.PoolManager;
 import org.apache.geode.compression.Compressor;
+
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.data.gemfire.ConfigurableRegionFactoryBean;
 import org.springframework.data.gemfire.GemfireUtils;
-import org.springframework.data.gemfire.config.annotation.RegionConfigurer;
 import org.springframework.data.gemfire.config.xml.GemfireConstants;
 import org.springframework.data.gemfire.eviction.EvictingRegionFactoryBean;
 import org.springframework.data.gemfire.expiration.ExpiringRegionFactoryBean;
@@ -126,19 +122,8 @@ public class ClientRegionFactoryBean<K, V> extends ConfigurableRegionFactoryBean
 
 	private Float loadFactor;
 
-	private List<RegionConfigurer> regionConfigurers = Collections.emptyList();
-
 	private RegionAttributes<K, V> attributes;
 
-	private RegionConfigurer compositeRegionConfigurer = new RegionConfigurer() {
-
-		@Override
-		public void configure(String beanName, ClientRegionFactoryBean<?, ?> bean) {
-			nullSafeCollection(regionConfigurers)
-				.forEach(regionConfigurer -> regionConfigurer.configure(beanName, bean));
-		}
-	};
-
 	private String diskStoreName;
 	private String poolName;
 
@@ -154,7 +139,7 @@ public class ClientRegionFactoryBean<K, V> extends ConfigurableRegionFactoryBean
 	 * @see org.apache.geode.cache.Region
 	 */
 	@Override
-	protected Region<K, V> createRegion(GemFireCache gemfireCache, String regionName) throws Exception {
+	protected Region<K, V> createRegion(GemFireCache gemfireCache, String regionName) {
 
 		applyRegionConfigurers(regionName);
 
@@ -186,7 +171,7 @@ public class ClientRegionFactoryBean<K, V> extends ConfigurableRegionFactoryBean
 			logInfo("Creating client sub-Region [%1$s] with parent Region [%2$s]",
 				regionName, parent.getName());
 
-			return clientRegionFactory.<K, V>createSubregion(parent, regionName);
+			return clientRegionFactory.createSubregion(parent, regionName);
 		}
 		else {
 			logInfo("Creating client Region [%s]", regionName);

src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurer.java

@@ -22,18 +22,21 @@ import org.springframework.data.gemfire.config.annotation.support.Configurer;
 import org.springframework.data.gemfire.server.CacheServerFactoryBean;
 
 /**
- * The {@link CacheServerConfigurer} interface defines a contract for implementations to customize the configuration
- * of a {@link CacheServerFactoryBean} used to construct, configure and initialize an instance of a {@link CacheServer}.
+ * The {@link CacheServerConfigurer} interface defines a contract for implementing {@link Object Objects} in order to
+ * customize the configuration of a {@link CacheServerFactoryBean} used to construct, configure and initialize
+ * an instance of {@link CacheServer}.
  *
  * @author John Blum
+ * @see java.lang.FunctionalInterface
  * @see org.apache.geode.cache.server.CacheServer
  * @see org.springframework.data.gemfire.config.annotation.CacheServerApplication
- * @see org.springframework.data.gemfire.config.annotation.EnableCacheServers
  * @see org.springframework.data.gemfire.config.annotation.EnableCacheServer
+ * @see org.springframework.data.gemfire.config.annotation.EnableCacheServers
  * @see org.springframework.data.gemfire.config.annotation.support.Configurer
  * @see org.springframework.data.gemfire.server.CacheServerFactoryBean
- * @since 1.9.0
+ * @since 2.0.0
  */
+@FunctionalInterface
 public interface CacheServerConfigurer extends Configurer<CacheServerFactoryBean> {
 
 }

src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurer.java

@@ -22,16 +22,19 @@ import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
 import org.springframework.data.gemfire.config.annotation.support.Configurer;
 
 /**
- * The {@link ClientCacheConfigurer} interface defines a contract for implementations to customize the configuration
- * of a {@link ClientCacheFactoryBean} used to construct, configure and initialize an instance of a {@link ClientCache}.
+ * The {@link ClientCacheConfigurer} interface defines a contract for implementing {@link Object Objects} in order to
+ * customize the configuration of a {@link ClientCacheFactoryBean} used to construct, configure and initialize
+ * an instance of a {@link ClientCache}.
  *
  * @author John Blum
+ * @see java.lang.FunctionalInterface
  * @see org.apache.geode.cache.client.ClientCache
  * @see org.springframework.data.gemfire.client.ClientCacheFactoryBean
  * @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication
  * @see org.springframework.data.gemfire.config.annotation.support.Configurer
- * @since 1.9.0
+ * @since 2.0.0
  */
+@FunctionalInterface
 public interface ClientCacheConfigurer extends Configurer<ClientCacheFactoryBean> {
 
 }

src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java

@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.config.annotation;
 
 import static java.util.Arrays.stream;
-import static org.springframework.data.gemfire.util.CollectionUtils.nullSafeMap;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
@@ -31,10 +28,10 @@ import java.util.stream.Collectors;
 import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.query.CqQuery;
 import org.apache.geode.cache.query.QueryService;
+
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.Bean;
@@ -135,6 +132,7 @@ public class ContinuousQueryConfiguration extends AbstractAnnotationConfigSuppor
 			public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 
 				if (bean instanceof ContinuousQueryListenerContainer) {
+
 					this.container = (ContinuousQueryListenerContainer) bean;
 					this.continuousQueryDefinitions.forEach(this.container::addListener);
 					this.continuousQueryDefinitions.clear();
@@ -216,21 +214,8 @@ public class ContinuousQueryConfiguration extends AbstractAnnotationConfigSuppor
 	protected List<ContinuousQueryListenerContainerConfigurer> resolveContinuousQueryListenerContainerConfigurers() {
 
 		return Optional.ofNullable(this.configurers)
-			.filter(configurers -> !configurers.isEmpty())
 			.orElseGet(() ->
-				Optional.of(this.getBeanFactory())
-					.filter(beanFactory -> beanFactory instanceof ListableBeanFactory)
-					.map(beanFactory -> {
-
-						Map<String, ContinuousQueryListenerContainerConfigurer> beansOfType =
-							((ListableBeanFactory) beanFactory).getBeansOfType(ContinuousQueryListenerContainerConfigurer.class,
-								true, false);
-
-						return nullSafeMap(beansOfType).values().stream().collect(Collectors.toList());
-
-					})
-					.orElseGet(Collections::emptyList)
-			);
+				Collections.singletonList(LazyResovlingComposableContinuousQueryListenerContainerConfigurer.create(getBeanFactory())));
 	}
 
 	protected Optional<ErrorHandler> resolveErrorHandler() {

src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryListenerContainerConfigurer.java

@@ -13,29 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.config.annotation;
 
+import org.apache.geode.cache.client.ClientCache;
+
+import org.springframework.data.gemfire.config.annotation.support.Configurer;
 import org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer;
 
 /**
- * The {@link ContinuousQueryListenerContainerConfigurer} interfaces defines a contract for implementations to customize
- * the configuration of SDG's {@link ContinuousQueryListenerContainer} when enabling Continuous Query (CQ) functionality
- * in Spring Boot, GemFire/Geode cache client applications.
+ * The {@link ContinuousQueryListenerContainerConfigurer} interfaces defines a contract for implementing {@link Object Objects}
+ * in order to customize the configuration of a {@link ContinuousQueryListenerContainer} when enabling Continuous Query
+ * (CQ) functionality in a Spring Boot, Apache Geode/Pivotal GemFire {@link ClientCache} applications.
  *
  * @author John Blum
+ * @see java.lang.FunctionalInterface
+ * @see org.apache.geode.cache.client.ClientCache
+ * @see org.springframework.data.gemfire.config.annotation.support.Configurer
  * @see org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer
  * @since 2.0.0
  */
-public interface ContinuousQueryListenerContainerConfigurer {
-
-	/**
-	 * Applies addditional configuration to the declared/defined {@link ContinuousQueryListenerContainer}.
-	 *
-	 * @param beanName {@link String name} of the {@link ContinuousQueryListenerContainer} bean definition.
-	 * @param container reference to the {@link ContinuousQueryListenerContainer} instance.
-	 * @see org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer
-	 */
-	void configure(String beanName, ContinuousQueryListenerContainer container);
+@FunctionalInterface
+public interface ContinuousQueryListenerContainerConfigurer extends Configurer<ContinuousQueryListenerContainer> {
 
 }

src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurer.java

@@ -21,10 +21,12 @@ import org.springframework.data.gemfire.DiskStoreFactoryBean;
 import org.springframework.data.gemfire.config.annotation.support.Configurer;
 
 /**
- * The {@link DiskStoreConfigurer} interface defines a contract for implementations to customize the configuration
- * of a {@link DiskStoreFactoryBean} used to construct, configure and initialize a {@link DiskStore}.
+ * The {@link DiskStoreConfigurer} interface defines a contract for implementing {@link Object Objects} in order to
+ * customize the configuration of a {@link DiskStoreFactoryBean} used to construct, configure and initialize
+ * a {@link DiskStore}.
  *
  * @author John Blum
+ * @see java.lang.FunctionalInterface
  * @see org.apache.geode.cache.DiskStore
  * @see org.springframework.data.gemfire.DiskStoreFactoryBean
  * @see org.springframework.data.gemfire.config.annotation.EnableDiskStore
@@ -32,6 +34,7 @@ import org.springframework.data.gemfire.config.annotation.support.Configurer;
  * @see org.springframework.data.gemfire.config.annotation.support.Configurer
  * @since 2.0.0
  */
+@FunctionalInterface
 public interface DiskStoreConfigurer extends Configurer<DiskStoreFactoryBean> {
 
 }

src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfigurer.java

@@ -24,9 +24,9 @@ import org.springframework.data.gemfire.config.annotation.support.Configurer;
 import org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean;
 
 /**
- * The {@link IndexConfigurer} interface defines a contract for implementations to customize the configuration
- * of Entity-defined {@link Index Indexes} when a user annotates her Spring application {@link Configuration}
- * class with {@link EnableIndexing}.
+ * The {@link IndexConfigurer} interface defines a contract for implementing {@link Object Objects} in order to
+ * customize the configuration of Entity-defined {@link Index Indexes} when a user annotates her Spring application
+ * {@link Configuration} {@link Class} with {@link EnableIndexing}.
  *
  * @author John Blum
  * @see org.apache.geode.cache.lucene.LuceneIndex
@@ -44,7 +44,7 @@ public interface IndexConfigurer extends Configurer<IndexFactoryBean> {
 	 * Configuration callback method providing a reference to a {@link IndexFactoryBean} used to construct, configure
 	 * and initialize an instance of a peer {@link Index}.
 	 *
-	 * @param beanName name of {@link Index} bean declared in the Spring application context.
+	 * @param beanName name of the {@link Index} bean declared in the Spring application context.
 	 * @param bean reference to the {@link IndexFactoryBean}.
 	 * @see org.springframework.data.gemfire.IndexFactoryBean
 	 */
@@ -54,7 +54,7 @@ public interface IndexConfigurer extends Configurer<IndexFactoryBean> {
 	 * Configuration callback method providing a reference to a {@link LuceneIndexFactoryBean} used to construct,
 	 * configure and initialize an instance of a peer {@link LuceneIndex}.
 	 *
-	 * @param beanName name of {@link LuceneIndex} bean declared in the Spring application context.
+	 * @param beanName name of the {@link LuceneIndex} bean declared in the Spring application context.
 	 * @param bean reference to the {@link LuceneIndexFactoryBean}.
 	 * @see org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean
 	 */

src/main/java/org/springframework/data/gemfire/config/annotation/LazyResolvingComposableRegionConfigurer.java

@@ -16,6 +16,7 @@
 package org.springframework.data.gemfire.config.annotation;
 
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.data.gemfire.ConfigurableRegionFactoryBean;
 import org.springframework.data.gemfire.PeerRegionFactoryBean;
 import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
 import org.springframework.data.gemfire.config.annotation.support.AbstractLazyResolvingComposableConfigurer;
@@ -25,6 +26,8 @@ import org.springframework.lang.Nullable;
  * Composition for {@link RegionConfigurer}.
  *
  * @author John Blum
+ * @see org.springframework.beans.factory.BeanFactory
+ * @see org.springframework.data.gemfire.ConfigurableRegionFactoryBean
  * @see org.springframework.data.gemfire.PeerRegionFactoryBean
  * @see org.springframework.data.gemfire.client.ClientRegionFactoryBean
  * @see org.springframework.data.gemfire.config.annotation.RegionConfigurer
@@ -32,7 +35,7 @@ import org.springframework.lang.Nullable;
  * @since 2.2.0
  */
 public class LazyResolvingComposableRegionConfigurer
-		extends AbstractLazyResolvingComposableConfigurer<ClientRegionFactoryBean<?, ?>, RegionConfigurer>
+		extends AbstractLazyResolvingComposableConfigurer<ConfigurableRegionFactoryBean<?, ?>, RegionConfigurer>
 		implements RegionConfigurer {
 
 	public static LazyResolvingComposableRegionConfigurer create() {
@@ -49,9 +52,12 @@ public class LazyResolvingComposableRegionConfigurer
 	}
 
 	@Override
-	public void configure(String beanName, PeerRegionFactoryBean<?, ?> peerRegionFactoryBean) {
+	public void configure(String beanName, ClientRegionFactoryBean<?, ?> bean) {
+		resolveConfigurers().forEach(configurer -> configurer.configure(beanName, bean));
+	}
 
-		resolveConfigurers().forEach(configurer ->
-			configurer.configure(beanName, peerRegionFactoryBean));
+	@Override
+	public void configure(String beanName, PeerRegionFactoryBean<?, ?> peerRegionFactoryBean) {
+		resolveConfigurers().forEach(configurer -> configurer.configure(beanName, peerRegionFactoryBean));
 	}
 }

src/main/java/org/springframework/data/gemfire/config/annotation/LazyResovlingComposableContinuousQueryListenerContainerConfigurer.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.gemfire.config.annotation;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.data.gemfire.config.annotation.support.AbstractLazyResolvingComposableConfigurer;
+import org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer;
+import org.springframework.lang.Nullable;
+
+/**
+ * Composition of {@link ContinuousQueryListenerContainerConfigurer}.
+ *
+ * @author John Blum
+ * @see org.springframework.beans.factory.BeanFactory
+ * @see org.springframework.data.gemfire.config.annotation.ContinuousQueryListenerContainerConfigurer
+ * @see org.springframework.data.gemfire.config.annotation.support.AbstractLazyResolvingComposableConfigurer
+ * @see org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer
+ * @since 2.2.0
+ */
+public class LazyResovlingComposableContinuousQueryListenerContainerConfigurer
+		extends AbstractLazyResolvingComposableConfigurer<ContinuousQueryListenerContainer, ContinuousQueryListenerContainerConfigurer>
+		implements ContinuousQueryListenerContainerConfigurer {
+
+	public static LazyResovlingComposableContinuousQueryListenerContainerConfigurer create() {
+		return create(null);
+	}
+
+	public static LazyResovlingComposableContinuousQueryListenerContainerConfigurer create(@Nullable BeanFactory beanFactory) {
+		return new LazyResovlingComposableContinuousQueryListenerContainerConfigurer().with(beanFactory);
+	}
+
+	@Override
+	protected Class<ContinuousQueryListenerContainerConfigurer> getConfigurerType() {
+		return ContinuousQueryListenerContainerConfigurer.class;
+	}
+}

src/main/java/org/springframework/data/gemfire/config/annotation/LocatorConfigurer.java

@@ -21,14 +21,14 @@ import org.springframework.data.gemfire.LocatorFactoryBean;
 import org.springframework.data.gemfire.config.annotation.support.Configurer;
 
 /**
- * A Spring Configurer used to apply additional, customized configuration for an Apache Geode or Pivotal GemFire
+ * A Spring {@link Configurer} used to apply additional, customized configuration for an Apache Geode or Pivotal GemFire
  * {@link Locator}.
  *
- * This Configurer is particularly useful when using {@link LocatorApplication} annotation to configure and bootstrap
- * an Apache Geode or Pivotal GemFire {@link Locator}.
+ * This {@link Configurer} is particularly useful when using {@link LocatorApplication} annotation to configure
+ * and bootstrap an Apache Geode or Pivotal GemFire {@link Locator}.
  *
- * This Configurer is NOT applied when configuring an enabling an embedded {@link Locator}
- * using SDG's {@link @EnableLocator} annotation.
+ * This {@link Configurer} is NOT applied when configuring and enabling an embedded {@link Locator}
+ * using the {@link @EnableLocator} annotation.
  *
  * @author John Blum
  * @see java.lang.FunctionalInterface

src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurer.java

@@ -22,16 +22,19 @@ import org.springframework.data.gemfire.CacheFactoryBean;
 import org.springframework.data.gemfire.config.annotation.support.Configurer;
 
 /**
- * The {@link PeerCacheConfigurer} interface defines a contract for implementations to customize the configuration
- * of a {@link CacheFactoryBean} used to construct, configure and initialize an instance of a peer {@link Cache}.
+ * The {@link PeerCacheConfigurer} interface defines a contract for implementing {@link Object Objects} in order to
+ * customize the configuration of a {@link CacheFactoryBean} used to construct, configure and initialize
+ * an instance of a peer {@link Cache}.
  *
  * @author John Blum
+ * @see java.lang.FunctionalInterface
  * @see org.apache.geode.cache.Cache
  * @see org.springframework.data.gemfire.CacheFactoryBean
  * @see org.springframework.data.gemfire.config.annotation.PeerCacheApplication
  * @see org.springframework.data.gemfire.config.annotation.support.Configurer
  * @since 1.9.0
  */
+@FunctionalInterface
 public interface PeerCacheConfigurer extends Configurer<CacheFactoryBean> {
 
 }

src/main/java/org/springframework/data/gemfire/config/annotation/PoolConfigurer.java

@@ -16,23 +16,24 @@
 package org.springframework.data.gemfire.config.annotation;
 
 import org.apache.geode.cache.client.Pool;
+
 import org.springframework.data.gemfire.client.PoolFactoryBean;
 import org.springframework.data.gemfire.config.annotation.support.Configurer;
 
 /**
- * The {@link PoolConfigurer} interface defines a contract for implementations to customize the configuration
- * of a {@link PoolFactoryBean} used to construct, configure and initialize a {@link Pool}.
+ * The {@link PoolConfigurer} interface defines a contract for implementing {@link Object Objects} in order to
+ * customize the configuration of a {@link PoolFactoryBean} used to construct, configure and initialize a {@link Pool}.
  *
  * @author John Blum
+ * @see java.lang.FunctionalInterface
  * @see org.apache.geode.cache.client.Pool
  * @see org.springframework.data.gemfire.client.PoolFactoryBean
- * @see org.springframework.data.gemfire.config.annotation.AddPoolConfiguration
- * @see org.springframework.data.gemfire.config.annotation.AddPoolsConfiguration
  * @see org.springframework.data.gemfire.config.annotation.EnablePool
  * @see org.springframework.data.gemfire.config.annotation.EnablePools
  * @see org.springframework.data.gemfire.config.annotation.support.Configurer
- * @since 1.1.0
+ * @since 2.0.0
  */
+@FunctionalInterface
 public interface PoolConfigurer extends Configurer<PoolFactoryBean> {
 
 }

src/main/java/org/springframework/data/gemfire/config/annotation/RegionConfigurer.java

@@ -18,15 +18,15 @@ package org.springframework.data.gemfire.config.annotation;
 import org.apache.geode.cache.Region;
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.gemfire.ConfigurableRegionFactoryBean;
 import org.springframework.data.gemfire.PeerRegionFactoryBean;
 import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
-import org.springframework.data.gemfire.config.annotation.support.CacheTypeAwareRegionFactoryBean;
 import org.springframework.data.gemfire.config.annotation.support.Configurer;
 
 /**
- * The {@link RegionConfigurer} interface defines a contract for implementations to customize the configuration
- * of Entity-defined {@link Region Regions} when a user annotates her Spring application {@link Configuration}
- * class with {@link EnableEntityDefinedRegions}.
+ * The {@link RegionConfigurer} interface defines a contract for implementing {@link Object Objects} in order to
+ * customize the configuration of Entity-defined {@link Region Regions} when a user annotates her Spring application
+ * {@link Configuration} {@link Class} with {@link EnableEntityDefinedRegions} or {@link EnableCachingDefinedRegions}.
  *
  * @author John Blum
  * @see org.apache.geode.cache.Region
@@ -35,29 +35,49 @@ import org.springframework.data.gemfire.config.annotation.support.Configurer;
  * @see org.springframework.data.gemfire.config.annotation.EnableCachingDefinedRegions
  * @see org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions
  * @see org.springframework.data.gemfire.config.annotation.support.Configurer
- * @see CacheTypeAwareRegionFactoryBean
+ * @see org.springframework.data.gemfire.config.annotation.support.CacheTypeAwareRegionFactoryBean
  * @since 2.0.0
  */
-public interface RegionConfigurer extends Configurer<ClientRegionFactoryBean<?, ?>> {
+public interface RegionConfigurer extends Configurer<ConfigurableRegionFactoryBean<?, ?>> {
 
 	/**
-	 * Configuration callback method providing a reference to a {@link PeerRegionFactoryBean} used to construct, configure
-	 * and initialize an instance of a peer {@link Region}.
+	 * Applies additional user-defined configuration to the {@link ConfigurableRegionFactoryBean}.
 	 *
-	 * @param beanName name of {@link Region} bean declared in the Spring application context.
-	 * @param bean reference to the {@link PeerRegionFactoryBean}.
-	 * @see PeerRegionFactoryBean
+	 * @param beanName {@link String} containing the name of the Spring bean (component).
+	 * @param bean Spring component used to construct, configure and initialize the Apache Geode or Pivotal GemFire
+	 * @see org.springframework.data.gemfire.ConfigurableRegionFactoryBean
+	 * @see #configure(String, ClientRegionFactoryBean)
+	 * @see #configure(String, PeerRegionFactoryBean)
 	 */
-	default void configure(String beanName, PeerRegionFactoryBean<?, ?> bean) { }
+	@Override
+	default void configure(String beanName, ConfigurableRegionFactoryBean<?, ?> bean) {
+
+		if (bean instanceof ClientRegionFactoryBean) {
+			configure(beanName, (ClientRegionFactoryBean<?, ?>) bean);
+		}
+		else {
+			configure(beanName, (PeerRegionFactoryBean<?, ?>) bean);
+		}
+	}
 
 	/**
 	 * Configuration callback method providing a reference to a {@link ClientRegionFactoryBean} used to construct,
 	 * configure and initialize an instance of a client {@link Region}.
 	 *
 	 * @param beanName name of {@link Region} bean declared in the Spring application context.
-	 * @param bean reference to the {@link ClientRegionFactoryBean}.
+	 * @param bean reference to the {@link ClientRegionFactoryBean} used to create the client {@link Region}.
 	 * @see org.springframework.data.gemfire.client.ClientRegionFactoryBean
 	 */
 	default void configure(String beanName, ClientRegionFactoryBean<?, ?> bean) { }
 
+	/**
+	 * Configuration callback method providing a reference to a {@link PeerRegionFactoryBean} used to construct,
+	 * configure and initialize an instance of a peer {@link Region}.
+	 *
+	 * @param beanName name of {@link Region} bean declared in the Spring application context.
+	 * @param bean reference to the {@link PeerRegionFactoryBean} used to create the peer {@link Region}.
+	 * @see org.springframework.data.gemfire.PeerRegionFactoryBean
+	 */
+	default void configure(String beanName, PeerRegionFactoryBean<?, ?> bean) { }
+
 }

src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java

@@ -14,7 +14,6 @@
  * limitations under the License.
  *
  */
-
 package org.springframework.data.gemfire.config.annotation.support;
 
 import static org.springframework.data.gemfire.util.CollectionUtils.asSet;
@@ -31,8 +30,6 @@ import java.util.Optional;
 import java.util.Set;
 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;
@@ -60,6 +57,9 @@ import org.springframework.expression.spel.support.StandardTypeLocator;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * The {@link AbstractAnnotationConfigSupport} class is an abstract base class encapsulating functionality
  * common to all Annotations and configuration classes used to configure Pivotal GemFire/Apache Geode objects
@@ -151,6 +151,7 @@ public abstract class AbstractAnnotationConfigSupport
 	 * @see #newEvaluationContext(BeanFactory)
 	 */
 	public AbstractAnnotationConfigSupport(BeanFactory beanFactory) {
+
 		this.evaluationContext = newEvaluationContext(beanFactory);
 		this.log = newLog();
 	}

src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractLazyResolvingComposableConfigurer.java

@@ -25,23 +25,24 @@ import java.util.stream.Stream;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.core.OrderComparator;
 import org.springframework.lang.Nullable;
 
 /**
  * Abstract base class for {@link Configurer} interface implementations, encapsulating logic and functionality
- * common to all {@link Configurer} implementations
+ * common to all lazy resolving, composable {@link Configurer} implementations.
  *
  * @author John Blum
+ * @param <T> {@link Class} type of the configurable Spring component processed by this {@link Configurer}.
+ * @param <C> {@link Class sub-Class} type of {@link Configurer}.
  * @see org.springframework.beans.factory.BeanFactory
  * @see org.springframework.beans.factory.BeanFactoryAware
- * @see org.springframework.beans.factory.FactoryBean
+ * @see org.springframework.core.OrderComparator
  * @see org.springframework.data.gemfire.config.annotation.support.Configurer
  * @since 2.2.0
  */
-public abstract class AbstractLazyResolvingComposableConfigurer<T extends FactoryBean<?>, C extends Configurer<T>>
+public abstract class AbstractLazyResolvingComposableConfigurer<T, C extends Configurer<T>>
 		implements BeanFactoryAware, Configurer<T> {
 
 	private BeanFactory beanFactory;
@@ -109,18 +110,18 @@ public abstract class AbstractLazyResolvingComposableConfigurer<T extends Factor
 	}
 
 	/**
-	 * Applies the configuration from the composition of {@link Configurer Configurers} composed by this
-	 * {@link Configurer} to the given {@link FactoryBean}.
+	 * Applies the configuration from the composition of {@link Configurer Configurers} composed by
+	 * this {@link Configurer} to the given Spring component (bean).
 	 *
 	 * @param beanName {@link String} containing the name of the Spring bean.
-	 * @param factoryBean {@link FactoryBean} used to construct, configure and initialize the {@link Object}
+	 * @param bean Spring component used to construct, configure and initialize the {@link Object}.
 	 * @see #resolveConfigurers()
 	 */
 	@Override
-	public synchronized void configure(String beanName, T factoryBean) {
+	public synchronized void configure(String beanName, T bean) {
 
 		resolveConfigurers().forEach(configurer ->
-			configurer.configure(beanName, factoryBean));
+			configurer.configure(beanName, bean));
 	}
 
 	/**

src/main/java/org/springframework/data/gemfire/config/annotation/support/Configurer.java

@@ -15,35 +15,38 @@
  */
 package org.springframework.data.gemfire.config.annotation.support;
 
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.core.Ordered;
 
 /**
- * The {@link Configurer} interface defines a contract for implementing objects that can modify
- * some aspect of configuration given a reference to the Spring {@link FactoryBean} responsible
- * for the configuration of some {@link Object} or Spring bean.
+ * The {@link Configurer} interface defines a contract for implementing objects that can modify some aspect
+ * of configuration given a reference to the Spring component responsible for the configuration of some
+ * Apache Geode or Pivotal GemFire {@link Object} declared as a bean in the Spring container.
  *
  * @author John Blum
- * @see org.springframework.beans.factory.FactoryBean
+ * @param <T> {@link Class} type of the configurable Spring component processed by this {@link Configurer}.
  * @see org.springframework.core.Ordered
  * @since 2.2.0
  */
 @FunctionalInterface
-public interface Configurer<T extends FactoryBean<?>> extends Ordered {
+public interface Configurer<T> extends Ordered {
 
 	/**
-	 * Applies additional configuration to the given Spring {@link FactoryBean}.
+	 * Applies additional user-defined configuration to the given Spring component.
 	 *
-	 * @param beanName {@link String} containing the name of the Spring bean.
-	 * @param factoryBean {@link FactoryBean} used to construct, configure and initialize the {@link Object}
-	 * or Spring Bean.
+	 * @param beanName {@link String} containing the name of the Spring bean (component).
+	 * @param bean Spring component used to construct, configure and initialize the Apache Geode or Pivotal GemFire
+	 * {@link Object} declared as a bean in the Spring container.
 	 */
-	void configure(String beanName, T factoryBean);
+	void configure(String beanName, T bean);
 
 	/**
-	 * Defines the {@literal order} of this {@link Configurer} bean relative to other {@link Configurer Configurers}.
+	 * Determines the {@literal order} of this {@link Configurer} bean relative to other {@link Configurer Configurers}
+	 * of the same {@link Class type}.
+	 *
+	 * Returns {@literal 0} by default.
 	 *
 	 * @return the {@literal order} in which this {@link Configurer} is applied.
+	 * @see org.springframework.core.Ordered#getOrder()
 	 */
 	@Override
 	default int getOrder() {

src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java

@@ -62,7 +62,7 @@ import org.springframework.util.StringUtils;
  */
 @SuppressWarnings("unused")
 public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnotationConfigSupport
-	implements ImportBeanDefinitionRegistrar {
+		implements ImportBeanDefinitionRegistrar {
 
 	public static final Integer DEFAULT_PORT = 0;
 	public static final String DEFAULT_HOST = "localhost";
@@ -81,13 +81,14 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
 	 */
 	@SuppressWarnings("unchecked")
 	protected <T extends AbstractCacheConfiguration> T getCacheConfiguration() {
+
 		return Optional.ofNullable((T) this.cacheConfiguration)
 			.orElseThrow(() -> newIllegalStateException("AbstractCacheConfiguration is required"));
 	}
 
 	@Override
 	public final void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
-		BeanDefinitionRegistry registry) {
+			BeanDefinitionRegistry registry) {
 
 		if (isAnnotationPresent(importingClassMetadata)) {
 			Map<String, Object> annotationAttributes = getAnnotationAttributes(importingClassMetadata);
@@ -98,11 +99,12 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
 
 	@SuppressWarnings("unused")
 	protected void registerBeanDefinitions(AnnotationMetadata importingClassMetaData,
-		Map<String, Object> annotationAttributes, BeanDefinitionRegistry registry) {
+			Map<String, Object> annotationAttributes, BeanDefinitionRegistry registry) {
+
 	}
 
 	protected void setGemFireProperties(AnnotationMetadata importingClassMetadata,
-		Map<String, Object> annotationAttributes, BeanDefinitionRegistry registry) {
+			Map<String, Object> annotationAttributes, BeanDefinitionRegistry registry) {
 
 		Properties gemfireProperties = toGemFireProperties(annotationAttributes);
 
@@ -125,7 +127,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
 	}
 
 	protected void registerGemFirePropertiesBeanPostProcessor(BeanDefinitionRegistry registry,
-		Properties customGemFireProperties) {
+			Properties customGemFireProperties) {
 
 		BeanDefinitionBuilder builder =
 			BeanDefinitionBuilder.genericBeanDefinition(GemFirePropertiesBeanPostProcessor.class);
@@ -142,7 +144,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
 	}
 
 	protected void registerClientGemFirePropertiesConfigurer(BeanDefinitionRegistry registry,
-		Properties gemfireProperties) {
+			Properties gemfireProperties) {
 
 		BeanDefinitionBuilder builder =
 			BeanDefinitionBuilder.genericBeanDefinition(ClientGemFirePropertiesConfigurer.class);
@@ -153,7 +155,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
 	}
 
 	protected void registerPeerGemFirePropertiesConfigurer(BeanDefinitionRegistry registry,
-		Properties gemfireProperties) {
+			Properties gemfireProperties) {
 
 		BeanDefinitionBuilder builder =
 			BeanDefinitionBuilder.genericBeanDefinition(PeerGemFirePropertiesConfigurer.class);
@@ -165,8 +167,9 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
 
 	protected BeanDefinitionHolder newBeanDefinitionHolder(BeanDefinitionBuilder builder) {
 
-		return new BeanDefinitionHolder(builder.getBeanDefinition(),
-			generateBeanName(builder.getRawBeanDefinition().getBeanClass().getSimpleName()));
+		String beanName = generateBeanName(builder.getRawBeanDefinition().getBeanClass().getSimpleName());
+
+		return new BeanDefinitionHolder(builder.getBeanDefinition(), beanName);
 	}
 
 	protected String generateBeanName() {
@@ -221,7 +224,10 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
 	}
 
 	protected String resolveHost(String hostname, String defaultHostname) {
-		return Optional.ofNullable(hostname).filter(StringUtils::hasText).orElse(defaultHostname);
+
+		return Optional.ofNullable(hostname)
+			.filter(StringUtils::hasText)
+			.orElse(defaultHostname);
 	}
 
 	protected Integer resolvePort(Integer port) {
@@ -229,7 +235,9 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
 	}
 
 	protected Integer resolvePort(Integer port, Integer defaultPort) {
-		return Optional.ofNullable(port).orElse(defaultPort);
+
+		return Optional.ofNullable(port)
+			.orElse(defaultPort);
 	}
 
 	protected static class AbstractGemFirePropertiesConfigurer {