From ff7872d82711825bb467bde6b87728eafbd6f378 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 22 May 2018 13:21:02 -0700 Subject: [PATCH] Prevent the auto-configuration and enabling of Continuous Queries when the user explicility configures a peer Cache application. --- .../autoconfigure/ContinuousQueryAutoConfiguration.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ContinuousQueryAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ContinuousQueryAutoConfiguration.java index 553853be..c2588985 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ContinuousQueryAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ContinuousQueryAutoConfiguration.java @@ -16,16 +16,12 @@ package org.springframework.boot.data.geode.autoconfigure; -import org.apache.geode.cache.Cache; -import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.gemfire.client.ClientCacheFactoryBean; import org.springframework.data.gemfire.config.annotation.EnableContinuousQueries; /** @@ -43,9 +39,8 @@ import org.springframework.data.gemfire.config.annotation.EnableContinuousQuerie * @since 1.0.0 */ @Configuration -@ConditionalOnBean(GemFireCache.class) -@ConditionalOnClass({ ClientCacheFactoryBean.class, ClientCache.class }) -@ConditionalOnMissingBean(name = "continuousQueryBeanPostProcessor", value = Cache.class) +@ConditionalOnBean(ClientCache.class) +@ConditionalOnMissingBean(name = "continuousQueryBeanPostProcessor") @AutoConfigureAfter(ClientCacheAutoConfiguration.class) @EnableContinuousQueries public class ContinuousQueryAutoConfiguration {