diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurer.java index 9d58f838..171993e1 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfigurer.java @@ -14,10 +14,11 @@ * limitations under the License. * */ - package org.springframework.data.gemfire.config.annotation; import org.apache.geode.cache.server.CacheServer; + +import org.springframework.data.gemfire.config.annotation.support.Configurer; import org.springframework.data.gemfire.server.CacheServerFactoryBean; /** @@ -29,19 +30,10 @@ import org.springframework.data.gemfire.server.CacheServerFactoryBean; * @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.support.Configurer * @see org.springframework.data.gemfire.server.CacheServerFactoryBean * @since 1.9.0 */ -public interface CacheServerConfigurer { - - /** - * Configuration callback method providing a reference to a {@link CacheServerFactoryBean} used to construct, - * configure and initialize an instance of {@link CacheServer}. - * - * @param beanName name of {@link CacheServer} bean declared in the Spring application context. - * @param bean reference to the {@link CacheServerFactoryBean}. - * @see org.springframework.data.gemfire.server.CacheServerFactoryBean - */ - void configure(String beanName, CacheServerFactoryBean bean); +public interface CacheServerConfigurer extends Configurer { } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurer.java index 4851ad00..27346ade 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfigurer.java @@ -14,11 +14,12 @@ * limitations under the License. * */ - package org.springframework.data.gemfire.config.annotation; import org.apache.geode.cache.client.ClientCache; + 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 @@ -28,18 +29,9 @@ import org.springframework.data.gemfire.client.ClientCacheFactoryBean; * @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 */ -public interface ClientCacheConfigurer { - - /** - * Configuration callback method providing a reference to a {@link ClientCacheFactoryBean} used to construct, - * configure and initialize an instance of {@link ClientCache}. - * - * @param beanName name of {@link ClientCache} bean declared in the Spring application context. - * @param bean reference to the {@link ClientCacheFactoryBean}. - * @see org.springframework.data.gemfire.CacheFactoryBean - */ - void configure(String beanName, ClientCacheFactoryBean bean); +public interface ClientCacheConfigurer extends Configurer { } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurer.java index a7ec4382..15f56ffb 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/DiskStoreConfigurer.java @@ -13,11 +13,12 @@ * 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.DiskStore; + 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 @@ -28,18 +29,9 @@ import org.springframework.data.gemfire.DiskStoreFactoryBean; * @see org.springframework.data.gemfire.DiskStoreFactoryBean * @see org.springframework.data.gemfire.config.annotation.EnableDiskStore * @see org.springframework.data.gemfire.config.annotation.EnableDiskStores - * @since 1.1.0 + * @see org.springframework.data.gemfire.config.annotation.support.Configurer + * @since 2.0.0 */ -public interface DiskStoreConfigurer { - - /** - * Configuration callback method providing a reference to a {@link DiskStoreFactoryBean} used to construct, - * configure and initialize an instance of {@link DiskStore}. - * - * @param beanName name of the {@link DiskStore} bean declared in the Spring application context. - * @param bean reference to the {@link DiskStoreFactoryBean}. - * @see org.springframework.data.gemfire.DiskStoreFactoryBean - */ - void configure(String beanName, DiskStoreFactoryBean bean); +public interface DiskStoreConfigurer extends Configurer { } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfigurer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfigurer.java index 41eefde8..926d92f9 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfigurer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/IndexConfigurer.java @@ -13,13 +13,14 @@ * 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.lucene.LuceneIndex; import org.apache.geode.cache.query.Index; + import org.springframework.context.annotation.Configuration; import org.springframework.data.gemfire.IndexFactoryBean; +import org.springframework.data.gemfire.config.annotation.support.Configurer; import org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean; /** @@ -33,10 +34,11 @@ import org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean; * @see org.springframework.data.gemfire.IndexFactoryBean * @see org.springframework.data.gemfire.config.annotation.EnableIndexing * @see org.springframework.data.gemfire.config.annotation.IndexConfiguration + * @see org.springframework.data.gemfire.config.annotation.support.Configurer * @see org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean - * @since 1.1.0 + * @since 2.0.0 */ -public interface IndexConfigurer { +public interface IndexConfigurer extends Configurer { /** * Configuration callback method providing a reference to a {@link IndexFactoryBean} used to construct, configure @@ -46,8 +48,7 @@ public interface IndexConfigurer { * @param bean reference to the {@link IndexFactoryBean}. * @see org.springframework.data.gemfire.IndexFactoryBean */ - default void configure(String beanName, IndexFactoryBean bean) { - } + default void configure(String beanName, IndexFactoryBean bean) { } /** * Configuration callback method providing a reference to a {@link LuceneIndexFactoryBean} used to construct, @@ -57,6 +58,6 @@ public interface IndexConfigurer { * @param bean reference to the {@link LuceneIndexFactoryBean}. * @see org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean */ - default void configure(String beanName, LuceneIndexFactoryBean bean) { - } + default void configure(String beanName, LuceneIndexFactoryBean bean) { } + } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurer.java index dcbb7bfc..a2af05ea 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfigurer.java @@ -14,11 +14,12 @@ * limitations under the License. * */ - package org.springframework.data.gemfire.config.annotation; import org.apache.geode.cache.Cache; + 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 @@ -28,18 +29,9 @@ import org.springframework.data.gemfire.CacheFactoryBean; * @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 */ -public interface PeerCacheConfigurer { - - /** - * Configuration callback method providing a reference to a {@link CacheFactoryBean} used to construct, - * configure and initialize an instance of a peer {@link Cache}. - * - * @param beanName name of peer {@link Cache} bean declared in the Spring application context. - * @param bean reference to the {@link CacheFactoryBean}. - * @see org.springframework.data.gemfire.CacheFactoryBean - */ - void configure(String beanName, CacheFactoryBean bean); +public interface PeerCacheConfigurer extends Configurer { } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PoolConfigurer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/PoolConfigurer.java index 8af07874..83a81640 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/PoolConfigurer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/PoolConfigurer.java @@ -13,11 +13,11 @@ * 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.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 @@ -30,18 +30,9 @@ import org.springframework.data.gemfire.client.PoolFactoryBean; * @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 */ -public interface PoolConfigurer { - - /** - * Configuration callback method providing a reference to a {@link PoolFactoryBean} used to construct, - * configure and initialize an instance of a {@link Pool}. - * - * @param beanName name of the {@link Pool} bean declared in the Spring application context. - * @param bean reference to the {@link PoolFactoryBean}. - * @see org.springframework.data.gemfire.client.PoolFactoryBean - */ - void configure(String beanName, PoolFactoryBean bean); +public interface PoolConfigurer extends Configurer { } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/RegionConfigurer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/RegionConfigurer.java index 73a401b6..7727f307 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/RegionConfigurer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/RegionConfigurer.java @@ -13,14 +13,15 @@ * 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.Region; + import org.springframework.context.annotation.Configuration; 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 @@ -29,13 +30,15 @@ import org.springframework.data.gemfire.config.annotation.support.CacheTypeAware * * @author John Blum * @see org.apache.geode.cache.Region - * @see PeerRegionFactoryBean + * @see org.springframework.data.gemfire.PeerRegionFactoryBean * @see org.springframework.data.gemfire.client.ClientRegionFactoryBean + * @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 - * @since 1.1.0 + * @since 2.0.0 */ -public interface RegionConfigurer { +public interface RegionConfigurer extends Configurer> { /** * Configuration callback method providing a reference to a {@link PeerRegionFactoryBean} used to construct, configure @@ -45,8 +48,7 @@ public interface RegionConfigurer { * @param bean reference to the {@link PeerRegionFactoryBean}. * @see PeerRegionFactoryBean */ - default void configure(String beanName, PeerRegionFactoryBean bean) { - } + default void configure(String beanName, PeerRegionFactoryBean bean) { } /** * Configuration callback method providing a reference to a {@link ClientRegionFactoryBean} used to construct, @@ -56,6 +58,6 @@ public interface RegionConfigurer { * @param bean reference to the {@link ClientRegionFactoryBean}. * @see org.springframework.data.gemfire.client.ClientRegionFactoryBean */ - default void configure(String beanName, ClientRegionFactoryBean bean) { - } + default void configure(String beanName, ClientRegionFactoryBean bean) { } + }