Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Review, refactor and reorganize auto-configuration annotations and conditions.

Browse Source
This commit is contained in:
John Blum
2018-05-29 15:24:41 -07:00
parent 0990c6462d
commit 034890eb4d
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/CachingProviderAutoConfiguration.java
View File

@@ -54,13 +54,13 @@ import org.springframework.data.gemfire.cache.config.EnableGemfireCaching;
* @since 1.0.0
*/
@Configuration
@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
@ConditionalOnBean(GemFireCache.class)
@ConditionalOnClass({ GemfireCacheManager.class, GemFireCache.class })
@ConditionalOnMissingBean(CacheManager.class)
@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
@EnableGemfireCaching
@SuppressWarnings("all")
class CachingProviderAutoConfiguration {
public class CachingProviderAutoConfiguration {
private final CacheManagerCustomizers cacheManagerCustomizers;

5
geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientSecurityAutoConfiguration.java
View File

@@ -19,6 +19,7 @@ package org.springframework.boot.data.geode.autoconfigure;
import java.util.Optional;
import java.util.Properties;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.client.ClientCache;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -26,6 +27,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.cloud.CloudPlatform;
import org.springframework.boot.data.geode.core.env.VcapPropertySource;
@@ -47,12 +49,14 @@ import org.springframework.data.gemfire.config.annotation.support.AutoConfigured
*
* @author John Blum
* @see java.util.Properties
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.client.ClientCache
* @see org.springframework.boot.SpringApplication
* @see org.springframework.boot.autoconfigure.EnableAutoConfiguration
* @see org.springframework.boot.cloud.CloudPlatform
* @see org.springframework.boot.data.geode.autoconfigure.ClientCacheAutoConfiguration
* @see org.springframework.boot.data.geode.core.env.VcapPropertySource
* @see org.springframework.boot.data.geode.core.env.support.CloudCacheService
* @see org.springframework.boot.env.EnvironmentPostProcessor
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.core.env.Environment
@@ -65,6 +69,7 @@ import org.springframework.data.gemfire.config.annotation.support.AutoConfigured
@AutoConfigureBefore(ClientCacheAutoConfiguration.class)
@Conditional(ClientSecurityAutoConfiguration.EnableSecurityCondition.class)
@ConditionalOnClass({ ClientCacheFactoryBean.class, ClientCache.class })
@ConditionalOnMissingBean(GemFireCache.class)
@EnableSecurity
@SuppressWarnings("unused")
public class ClientSecurityAutoConfiguration {

2
geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/FunctionExecutionAutoConfiguration.java
View File

@@ -44,9 +44,9 @@ import org.springframework.data.gemfire.function.execution.GemfireFunctionOperat
* @since 1.0.0
*/
@Configuration
@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
@ConditionalOnBean(GemFireCache.class)
@ConditionalOnClass({ GemfireFunctionOperations.class, GemFireCache.class })
@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
@EnableGemfireFunctions
@Import(GemFireFunctionExecutionAutoConfigurationRegistrar.class)
@SuppressWarnings("unused")

2
geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/RepositoriesAutoConfiguration.java
View File

@@ -58,12 +58,12 @@ import org.springframework.data.gemfire.repository.support.GemfireRepositoryFact
* @since 1.0.0
*/
@Configuration
@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
@ConditionalOnBean(GemFireCache.class)
@ConditionalOnClass(GemfireRepository.class)
@ConditionalOnMissingBean({ GemfireRepositoryConfigurationExtension.class, GemfireRepositoryFactoryBean.class })
@ConditionalOnProperty(prefix = "spring.data.gemfire.repositories", name = "enabled", havingValue = "true",
matchIfMissing = true)
@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
@Import(GemFireRepositoriesAutoConfigurationRegistrar.class)
public class RepositoriesAutoConfiguration {