This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 14a0fc0bafff39b53a54204e9a76276f1c78c2a8
Author: Zoran Regvart <zregv...@apache.org>
AuthorDate: Wed May 9 14:25:00 2018 +0200
CAMEL-11430: Fix camel-infinispan starter
---
.../customizer/EmbeddedCacheManagerCustomizer.java | 33 ++--------------------
1 file changed, 3 insertions(+), 30 deletions(-)
diff --git
a/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/customizer/EmbeddedCacheManagerCustomizer.java
b/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/customizer/EmbeddedCacheManagerCustomizer.java
index 08f6dfe..e7758ac 100644
---
a/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/customizer/EmbeddedCacheManagerCustomizer.java
+++
b/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/customizer/EmbeddedCacheManagerCustomizer.java
@@ -26,17 +26,16 @@ import org.infinispan.manager.EmbeddedCacheManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
+import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
@Order(101)
@Configuration
-@Conditional(EmbeddedCacheManagerCustomizer.Conditions.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@ConditionalOnBean({ EmbeddedCacheManager.class, CamelAutoConfiguration.class
})
+@AutoConfigureAfter({ CamelAutoConfiguration.class,
CacheAutoConfiguration.class })
@AutoConfigureBefore(InfinispanComponentAutoConfiguration.class)
@EnableConfigurationProperties(EmbeddedCacheManagerCustomizerConfiguration.class)
public class EmbeddedCacheManagerCustomizer implements HasId,
ComponentCustomizer<InfinispanComponent> {
@@ -58,30 +57,4 @@ public class EmbeddedCacheManagerCustomizer implements
HasId, ComponentCustomize
public String getId() {
return "camel.component.infinispan.customizer.embedded-cache-manager";
}
-
- //
*************************************************************************
- // By default ConditionalOnBean works using an OR operation so if you list
- // a number of classes, the condition succeeds if a single instance of the
- // classes is found.
- //
- // A workaround is to use AllNestedConditions and creates some dummy
classes
- // annotated @ConditionalOnBean
- //
- // This should be fixed in spring-boot 2.0 where ConditionalOnBean uses and
- // AND operation instead of the OR as it does today.
- //
*************************************************************************
-
- static class Conditions extends AllNestedConditions {
- public Conditions() {
- super(ConfigurationPhase.REGISTER_BEAN);
- }
-
- @ConditionalOnBean(EmbeddedCacheManager.class)
- static class OnCacheManager {
- }
-
- @ConditionalOnBean(CamelAutoConfiguration.class)
- static class OnCamelAutoConfiguration {
- }
- }
}
--
To stop receiving notification emails like this one, please contact
zregv...@apache.org.
