http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java index db0d9b5..a409983 100644 --- a/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java @@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer; import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -36,9 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(HessianDataFormatAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + HessianDataFormatAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @EnableConfigurationProperties({DataFormatConfigurationProperties.class, HessianDataFormatConfiguration.class}) -public class HessianDataFormatAutoConfiguration extends AllNestedConditions { +public class HessianDataFormatAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(HessianDataFormatAutoConfiguration.class); @@ -67,31 +67,18 @@ public class HessianDataFormatAutoConfiguration extends AllNestedConditions { @Autowired private HessianDataFormatConfiguration dataformatConfiguration; - public HessianDataFormatAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.dataformat", "camel.dataformat.hessian"); } } @Bean(name = "hessian-dataformat-factory") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HessianDataFormat.class) public DataFormatFactory configureHessianDataFormatFactory() throws Exception { return new DataFormatFactory() { + @Override public DataFormat newInstance() { HessianDataFormat dataformat = new HessianDataFormat(); if (CamelContextAware.class
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java index 045eb7c..96cf954 100644 --- a/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.hipchat.HipchatComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(HipchatComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + HipchatComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, HipchatComponentConfiguration.class}) -public class HipchatComponentAutoConfiguration extends AllNestedConditions { +public class HipchatComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(HipchatComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class HipchatComponentAutoConfiguration extends AllNestedConditions { @Autowired private HipchatComponentConfiguration componentConfiguration; - public HipchatComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.hipchat"); } } @Lazy @Bean(name = "hipchat-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HipchatComponent.class) public HipchatComponent configureHipchatComponent() throws Exception { HipchatComponent component = new HipchatComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java index 98f4d65..63f7139 100644 --- a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java @@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer; import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -36,9 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(HL7DataFormatAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + HL7DataFormatAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @EnableConfigurationProperties({DataFormatConfigurationProperties.class, HL7DataFormatConfiguration.class}) -public class HL7DataFormatAutoConfiguration extends AllNestedConditions { +public class HL7DataFormatAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(HL7DataFormatAutoConfiguration.class); @@ -67,30 +67,17 @@ public class HL7DataFormatAutoConfiguration extends AllNestedConditions { @Autowired private HL7DataFormatConfiguration dataformatConfiguration; - public HL7DataFormatAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.dataformat", "camel.dataformat.hl7"); } } @Bean(name = "hl7-dataformat-factory") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HL7DataFormat.class) public DataFormatFactory configureHL7DataFormatFactory() throws Exception { return new DataFormatFactory() { + @Override public DataFormat newInstance() { HL7DataFormat dataformat = new HL7DataFormat(); if (CamelContextAware.class http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java index d291ce7..01c0b46 100644 --- a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java @@ -26,16 +26,16 @@ import org.apache.camel.component.hl7.TerserLanguage; import org.apache.camel.spi.LanguageCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.LanguageConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -48,11 +48,12 @@ import org.springframework.context.annotation.Scope; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(TerserLanguageAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + TerserLanguageAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({LanguageConfigurationProperties.class, TerserLanguageConfiguration.class}) -public class TerserLanguageAutoConfiguration extends AllNestedConditions { +public class TerserLanguageAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(TerserLanguageAutoConfiguration.class); @@ -65,28 +66,14 @@ public class TerserLanguageAutoConfiguration extends AllNestedConditions { @Autowired private TerserLanguageConfiguration languageConfiguration; - public TerserLanguageAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.terser"); } } @Bean(name = "terser-language") - @Scope("prototype") - @ConditionalOnClass(CamelContext.class) + @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @ConditionalOnMissingBean(TerserLanguage.class) public TerserLanguage configureTerserLanguage() throws Exception { TerserLanguage language = new TerserLanguage(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java index d1bbd2c..828ce41 100644 --- a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.http.HttpComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(HttpComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + HttpComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, HttpComponentConfiguration.class}) -public class HttpComponentAutoConfiguration extends AllNestedConditions { +public class HttpComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(HttpComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class HttpComponentAutoConfiguration extends AllNestedConditions { @Autowired private HttpComponentConfiguration componentConfiguration; - public HttpComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.http"); } } @Lazy @Bean(name = {"http-component", "https-component"}) - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HttpComponent.class) public HttpComponent configureHttpComponent() throws Exception { HttpComponent component = new HttpComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java index 06dbbe0..634bcb0 100644 --- a/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.http4.HttpComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(HttpComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + HttpComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, HttpComponentConfiguration.class}) -public class HttpComponentAutoConfiguration extends AllNestedConditions { +public class HttpComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(HttpComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class HttpComponentAutoConfiguration extends AllNestedConditions { @Autowired private HttpComponentConfiguration componentConfiguration; - public HttpComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.http4"); } } @Lazy @Bean(name = "http4-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HttpComponent.class) public HttpComponent configureHttpComponent() throws Exception { HttpComponent component = new HttpComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java index ce17ac5..b232923 100644 --- a/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java @@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer; import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -36,9 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(ICalDataFormatAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + ICalDataFormatAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @EnableConfigurationProperties({DataFormatConfigurationProperties.class, ICalDataFormatConfiguration.class}) -public class ICalDataFormatAutoConfiguration extends AllNestedConditions { +public class ICalDataFormatAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(ICalDataFormatAutoConfiguration.class); @@ -67,30 +67,17 @@ public class ICalDataFormatAutoConfiguration extends AllNestedConditions { @Autowired private ICalDataFormatConfiguration dataformatConfiguration; - public ICalDataFormatAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.dataformat", "camel.dataformat.ical"); } } @Bean(name = "ical-dataformat-factory") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ICalDataFormat.class) public DataFormatFactory configureICalDataFormatFactory() throws Exception { return new DataFormatFactory() { + @Override public DataFormat newInstance() { ICalDataFormat dataformat = new ICalDataFormat(); if (CamelContextAware.class http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentAutoConfiguration.java index fb79afa..7130582 100644 --- a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/cache/springboot/IgniteCacheComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.ignite.cache.IgniteCacheComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(IgniteCacheComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + IgniteCacheComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, IgniteCacheComponentConfiguration.class}) -public class IgniteCacheComponentAutoConfiguration extends AllNestedConditions { +public class IgniteCacheComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(IgniteCacheComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class IgniteCacheComponentAutoConfiguration extends AllNestedConditions { @Autowired private IgniteCacheComponentConfiguration componentConfiguration; - public IgniteCacheComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.ignite-cache"); } } @Lazy @Bean(name = "ignite-cache-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(IgniteCacheComponent.class) public IgniteCacheComponent configureIgniteCacheComponent() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentAutoConfiguration.java index e5eca96..0fb6703 100644 --- a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.ignite.compute.IgniteComputeComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,13 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(IgniteComputeComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + IgniteComputeComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, IgniteComputeComponentConfiguration.class}) -public class IgniteComputeComponentAutoConfiguration - extends - AllNestedConditions { +public class IgniteComputeComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(IgniteComputeComponentAutoConfiguration.class); @@ -66,27 +64,14 @@ public class IgniteComputeComponentAutoConfiguration @Autowired private IgniteComputeComponentConfiguration componentConfiguration; - public IgniteComputeComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.ignite-compute"); } } @Lazy @Bean(name = "ignite-compute-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(IgniteComputeComponent.class) public IgniteComputeComponent configureIgniteComputeComponent() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentAutoConfiguration.java index f603db0..4735ac8 100644 --- a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.ignite.events.IgniteEventsComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(IgniteEventsComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + IgniteEventsComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, IgniteEventsComponentConfiguration.class}) -public class IgniteEventsComponentAutoConfiguration extends AllNestedConditions { +public class IgniteEventsComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(IgniteEventsComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class IgniteEventsComponentAutoConfiguration extends AllNestedConditions @Autowired private IgniteEventsComponentConfiguration componentConfiguration; - public IgniteEventsComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.ignite-events"); } } @Lazy @Bean(name = "ignite-events-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(IgniteEventsComponent.class) public IgniteEventsComponent configureIgniteEventsComponent() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentAutoConfiguration.java index 904af77..fc5a067 100644 --- a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.ignite.idgen.IgniteIdGenComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(IgniteIdGenComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + IgniteIdGenComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, IgniteIdGenComponentConfiguration.class}) -public class IgniteIdGenComponentAutoConfiguration extends AllNestedConditions { +public class IgniteIdGenComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(IgniteIdGenComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class IgniteIdGenComponentAutoConfiguration extends AllNestedConditions { @Autowired private IgniteIdGenComponentConfiguration componentConfiguration; - public IgniteIdGenComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.ignite-idgen"); } } @Lazy @Bean(name = "ignite-idgen-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(IgniteIdGenComponent.class) public IgniteIdGenComponent configureIgniteIdGenComponent() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentAutoConfiguration.java index c968475..3b241b1 100644 --- a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/messaging/springboot/IgniteMessagingComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.ignite.messaging.IgniteMessagingComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,13 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(IgniteMessagingComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + IgniteMessagingComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, IgniteMessagingComponentConfiguration.class}) -public class IgniteMessagingComponentAutoConfiguration - extends - AllNestedConditions { +public class IgniteMessagingComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(IgniteMessagingComponentAutoConfiguration.class); @@ -66,27 +64,14 @@ public class IgniteMessagingComponentAutoConfiguration @Autowired private IgniteMessagingComponentConfiguration componentConfiguration; - public IgniteMessagingComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.ignite-messaging"); } } @Lazy @Bean(name = "ignite-messaging-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(IgniteMessagingComponent.class) public IgniteMessagingComponent configureIgniteMessagingComponent() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentAutoConfiguration.java index 3857ef3..a8ebd04 100644 --- a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.ignite.queue.IgniteQueueComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(IgniteQueueComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + IgniteQueueComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, IgniteQueueComponentConfiguration.class}) -public class IgniteQueueComponentAutoConfiguration extends AllNestedConditions { +public class IgniteQueueComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(IgniteQueueComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class IgniteQueueComponentAutoConfiguration extends AllNestedConditions { @Autowired private IgniteQueueComponentConfiguration componentConfiguration; - public IgniteQueueComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.ignite-queue"); } } @Lazy @Bean(name = "ignite-queue-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(IgniteQueueComponent.class) public IgniteQueueComponent configureIgniteQueueComponent() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentAutoConfiguration.java index 398d1ce..073b3fc 100644 --- a/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.ignite.set.IgniteSetComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(IgniteSetComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + IgniteSetComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, IgniteSetComponentConfiguration.class}) -public class IgniteSetComponentAutoConfiguration extends AllNestedConditions { +public class IgniteSetComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(IgniteSetComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class IgniteSetComponentAutoConfiguration extends AllNestedConditions { @Autowired private IgniteSetComponentConfiguration componentConfiguration; - public IgniteSetComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.ignite-set"); } } @Lazy @Bean(name = "ignite-set-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(IgniteSetComponent.class) public IgniteSetComponent configureIgniteSetComponent() throws Exception { IgniteSetComponent component = new IgniteSetComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/InfinispanComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/InfinispanComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/InfinispanComponentAutoConfiguration.java index 94dfd58..85344c6 100644 --- a/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/InfinispanComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/InfinispanComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.infinispan.InfinispanComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(InfinispanComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + InfinispanComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, InfinispanComponentConfiguration.class}) -public class InfinispanComponentAutoConfiguration extends AllNestedConditions { +public class InfinispanComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(InfinispanComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class InfinispanComponentAutoConfiguration extends AllNestedConditions { @Autowired private InfinispanComponentConfiguration componentConfiguration; - public InfinispanComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.infinispan"); } } @Lazy @Bean(name = "infinispan-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(InfinispanComponent.class) public InfinispanComponent configureInfinispanComponent() throws Exception { InfinispanComponent component = new InfinispanComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentAutoConfiguration.java index 3e99e92..6e0dba6 100644 --- a/platforms/spring-boot/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.influxdb.InfluxDbComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(InfluxDbComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + InfluxDbComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, InfluxDbComponentConfiguration.class}) -public class InfluxDbComponentAutoConfiguration extends AllNestedConditions { +public class InfluxDbComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(InfluxDbComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class InfluxDbComponentAutoConfiguration extends AllNestedConditions { @Autowired private InfluxDbComponentConfiguration componentConfiguration; - public InfluxDbComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.influxdb"); } } @Lazy @Bean(name = "influxdb-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(InfluxDbComponent.class) public InfluxDbComponent configureInfluxDbComponent() throws Exception { InfluxDbComponent component = new InfluxDbComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-irc-starter/src/main/java/org/apache/camel/component/irc/springboot/IrcComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-irc-starter/src/main/java/org/apache/camel/component/irc/springboot/IrcComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-irc-starter/src/main/java/org/apache/camel/component/irc/springboot/IrcComponentAutoConfiguration.java index bd0c5d4..21bfd84 100644 --- a/platforms/spring-boot/components-starter/camel-irc-starter/src/main/java/org/apache/camel/component/irc/springboot/IrcComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-irc-starter/src/main/java/org/apache/camel/component/irc/springboot/IrcComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.irc.IrcComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(IrcComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + IrcComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, IrcComponentConfiguration.class}) -public class IrcComponentAutoConfiguration extends AllNestedConditions { +public class IrcComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(IrcComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class IrcComponentAutoConfiguration extends AllNestedConditions { @Autowired private IrcComponentConfiguration componentConfiguration; - public IrcComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.irc"); } } @Lazy @Bean(name = "irc-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(IrcComponent.class) public IrcComponent configureIrcComponent() throws Exception { IrcComponent component = new IrcComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ironmq-starter/src/main/java/org/apache/camel/component/ironmq/springboot/IronMQComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ironmq-starter/src/main/java/org/apache/camel/component/ironmq/springboot/IronMQComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ironmq-starter/src/main/java/org/apache/camel/component/ironmq/springboot/IronMQComponentAutoConfiguration.java index aff18a9..a6512ce 100644 --- a/platforms/spring-boot/components-starter/camel-ironmq-starter/src/main/java/org/apache/camel/component/ironmq/springboot/IronMQComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ironmq-starter/src/main/java/org/apache/camel/component/ironmq/springboot/IronMQComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.ironmq.IronMQComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(IronMQComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + IronMQComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, IronMQComponentConfiguration.class}) -public class IronMQComponentAutoConfiguration extends AllNestedConditions { +public class IronMQComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(IronMQComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class IronMQComponentAutoConfiguration extends AllNestedConditions { @Autowired private IronMQComponentConfiguration componentConfiguration; - public IronMQComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.ironmq"); } } @Lazy @Bean(name = "ironmq-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(IronMQComponent.class) public IronMQComponent configureIronMQComponent() throws Exception { IronMQComponent component = new IronMQComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java index f1055ec..e5d3222 100644 --- a/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java @@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer; import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -36,9 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(JacksonDataFormatAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + JacksonDataFormatAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @EnableConfigurationProperties({DataFormatConfigurationProperties.class, JacksonDataFormatConfiguration.class}) -public class JacksonDataFormatAutoConfiguration extends AllNestedConditions { +public class JacksonDataFormatAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(JacksonDataFormatAutoConfiguration.class); @@ -67,31 +67,18 @@ public class JacksonDataFormatAutoConfiguration extends AllNestedConditions { @Autowired private JacksonDataFormatConfiguration dataformatConfiguration; - public JacksonDataFormatAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.dataformat", "camel.dataformat.json-jackson"); } } @Bean(name = "json-jackson-dataformat-factory") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JacksonDataFormat.class) public DataFormatFactory configureJacksonDataFormatFactory() throws Exception { return new DataFormatFactory() { + @Override public DataFormat newInstance() { JacksonDataFormat dataformat = new JacksonDataFormat(); if (CamelContextAware.class http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java index d15e27c..1e115aa 100644 --- a/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java @@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer; import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -36,9 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(JacksonXMLDataFormatAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + JacksonXMLDataFormatAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @EnableConfigurationProperties({DataFormatConfigurationProperties.class, JacksonXMLDataFormatConfiguration.class}) -public class JacksonXMLDataFormatAutoConfiguration extends AllNestedConditions { +public class JacksonXMLDataFormatAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(JacksonXMLDataFormatAutoConfiguration.class); @@ -67,31 +67,18 @@ public class JacksonXMLDataFormatAutoConfiguration extends AllNestedConditions { @Autowired private JacksonXMLDataFormatConfiguration dataformatConfiguration; - public JacksonXMLDataFormatAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.dataformat", "camel.dataformat.jacksonxml"); } } @Bean(name = "jacksonxml-dataformat-factory") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JacksonXMLDataFormat.class) public DataFormatFactory configureJacksonXMLDataFormatFactory() throws Exception { return new DataFormatFactory() { + @Override public DataFormat newInstance() { JacksonXMLDataFormat dataformat = new JacksonXMLDataFormat(); if (CamelContextAware.class http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-javaspace-starter/src/main/java/org/apache/camel/component/javaspace/springboot/JavaSpaceComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-javaspace-starter/src/main/java/org/apache/camel/component/javaspace/springboot/JavaSpaceComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-javaspace-starter/src/main/java/org/apache/camel/component/javaspace/springboot/JavaSpaceComponentAutoConfiguration.java index 42486bc..90b6ce3 100644 --- a/platforms/spring-boot/components-starter/camel-javaspace-starter/src/main/java/org/apache/camel/component/javaspace/springboot/JavaSpaceComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-javaspace-starter/src/main/java/org/apache/camel/component/javaspace/springboot/JavaSpaceComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.javaspace.JavaSpaceComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(JavaSpaceComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, + JavaSpaceComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, JavaSpaceComponentConfiguration.class}) -public class JavaSpaceComponentAutoConfiguration extends AllNestedConditions { +public class JavaSpaceComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(JavaSpaceComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class JavaSpaceComponentAutoConfiguration extends AllNestedConditions { @Autowired private JavaSpaceComponentConfiguration componentConfiguration; - public JavaSpaceComponentAutoConfiguration() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnBean(CamelContext.class) - public static class OnCamelContext { - } - - @ConditionalOnBean(CamelAutoConfiguration.class) - public static class OnCamelAutoConfiguration { - } - - public static class Condition extends GroupCondition { - public Condition() { + static class GroupConditions extends GroupCondition { + public GroupConditions() { super("camel.component", "camel.component.javaspace"); } } @Lazy @Bean(name = "javaspace-component") - @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JavaSpaceComponent.class) public JavaSpaceComponent configureJavaSpaceComponent() throws Exception { JavaSpaceComponent component = new JavaSpaceComponent();