http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-routebox-starter/src/main/java/org/apache/camel/component/routebox/springboot/RouteboxComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-routebox-starter/src/main/java/org/apache/camel/component/routebox/springboot/RouteboxComponentAutoConfiguration.java b/components-starter/camel-routebox-starter/src/main/java/org/apache/camel/component/routebox/springboot/RouteboxComponentAutoConfiguration.java index 315396b..a5e8023 100644 --- a/components-starter/camel-routebox-starter/src/main/java/org/apache/camel/component/routebox/springboot/RouteboxComponentAutoConfiguration.java +++ b/components-starter/camel-routebox-starter/src/main/java/org/apache/camel/component/routebox/springboot/RouteboxComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class RouteboxComponentAutoConfiguration { + @Lazy @Bean(name = "routebox-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(RouteboxComponent.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentAutoConfiguration.java b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentAutoConfiguration.java index 6a77a46..6d0a272 100644 --- a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentAutoConfiguration.java +++ b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class RssComponentAutoConfiguration { + @Lazy @Bean(name = "rss-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(RssComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java index e09ac53..b38fd21 100644 --- a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java +++ b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SalesforceComponentConfiguration.class) public class SalesforceComponentAutoConfiguration { + @Lazy @Bean(name = "salesforce-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SalesforceComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentAutoConfiguration.java b/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentAutoConfiguration.java index 8c7a7fc..f58e734 100644 --- a/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentAutoConfiguration.java +++ b/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class NetWeaverComponentAutoConfiguration { + @Lazy @Bean(name = "sap-netweaver-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(NetWeaverComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java index ab5bff5..f81c5bd 100644 --- a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java +++ b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(XQueryComponentConfiguration.class) public class XQueryComponentAutoConfiguration { + @Lazy @Bean(name = "xquery-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(XQueryComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java b/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java index 1a14bd6..30d3f0f 100644 --- a/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java +++ b/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class SchematronComponentAutoConfiguration { + @Lazy @Bean(name = "schematron-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SchematronComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentAutoConfiguration.java b/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentAutoConfiguration.java index 6bc4738..3ef4ed8 100644 --- a/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentAutoConfiguration.java +++ b/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(ServiceNowComponentConfiguration.class) public class ServiceNowComponentAutoConfiguration { + @Lazy @Bean(name = "servicenow-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ServiceNowComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java index 2a93d4b..86cc6be 100644 --- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java +++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(ServletComponentConfiguration.class) public class ServletComponentAutoConfiguration { + @Lazy @Bean(name = "servlet-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ServletComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-sip-starter/src/main/java/org/apache/camel/component/sip/springboot/SipComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-sip-starter/src/main/java/org/apache/camel/component/sip/springboot/SipComponentAutoConfiguration.java b/components-starter/camel-sip-starter/src/main/java/org/apache/camel/component/sip/springboot/SipComponentAutoConfiguration.java index 8565407..48122e0 100644 --- a/components-starter/camel-sip-starter/src/main/java/org/apache/camel/component/sip/springboot/SipComponentAutoConfiguration.java +++ b/components-starter/camel-sip-starter/src/main/java/org/apache/camel/component/sip/springboot/SipComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class SipComponentAutoConfiguration { + @Lazy @Bean(name = {"sip-component", "sips-component"}) @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SipComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java index 1ff0553..442a3e7 100644 --- a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java +++ b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SjmsBatchComponentConfiguration.class) public class SjmsBatchComponentAutoConfiguration { + @Lazy @Bean(name = "sjms-batch-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SjmsBatchComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java index 909a965..a931c21 100644 --- a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java +++ b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SjmsComponentConfiguration.class) public class SjmsComponentAutoConfiguration { + @Lazy @Bean(name = "sjms-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SjmsComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-slack-starter/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-slack-starter/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java b/components-starter/camel-slack-starter/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java index 8db9c60..296d80e 100644 --- a/components-starter/camel-slack-starter/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java +++ b/components-starter/camel-slack-starter/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SlackComponentConfiguration.class) public class SlackComponentAutoConfiguration { + @Lazy @Bean(name = "slack-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SlackComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java b/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java index a9c9205..8f62937 100644 --- a/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java +++ b/components-starter/camel-smpp-starter/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SmppComponentConfiguration.class) public class SmppComponentAutoConfiguration { + @Lazy @Bean(name = {"smpp-component", "smpps-component"}) @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SmppComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java b/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java index 7c5cad8..14839fa 100644 --- a/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java +++ b/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class SnmpComponentAutoConfiguration { + @Lazy @Bean(name = "snmp-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SnmpComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java b/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java index 62d30c5..341a6ba 100644 --- a/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java +++ b/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class SolrComponentAutoConfiguration { + @Lazy @Bean(name = {"solr-component", "solrCloud-component", "solrs-component"}) @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SolrComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java b/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java index f0874bb..38a2264 100644 --- a/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java +++ b/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SparkComponentConfiguration.class) public class SparkComponentAutoConfiguration { + @Lazy @Bean(name = "spark-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SparkComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-splunk-starter/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-splunk-starter/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java b/components-starter/camel-splunk-starter/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java index a6d4974..f8a1ee2 100644 --- a/components-starter/camel-splunk-starter/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java +++ b/components-starter/camel-splunk-starter/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SplunkComponentConfiguration.class) public class SplunkComponentAutoConfiguration { + @Lazy @Bean(name = "splunk-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SplunkComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java b/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java index c271105..380c1fe 100644 --- a/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java +++ b/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SpringBatchComponentConfiguration.class) public class SpringBatchComponentAutoConfiguration { + @Lazy @Bean(name = "spring-batch-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SpringBatchComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-spring-integration-starter/src/main/java/org/apache/camel/component/spring/integration/springboot/SpringIntegrationComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-integration-starter/src/main/java/org/apache/camel/component/spring/integration/springboot/SpringIntegrationComponentAutoConfiguration.java b/components-starter/camel-spring-integration-starter/src/main/java/org/apache/camel/component/spring/integration/springboot/SpringIntegrationComponentAutoConfiguration.java index b9bd9e4..e0bf058 100644 --- a/components-starter/camel-spring-integration-starter/src/main/java/org/apache/camel/component/spring/integration/springboot/SpringIntegrationComponentAutoConfiguration.java +++ b/components-starter/camel-spring-integration-starter/src/main/java/org/apache/camel/component/spring/integration/springboot/SpringIntegrationComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class SpringIntegrationComponentAutoConfiguration { + @Lazy @Bean(name = "spring-integration-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SpringIntegrationComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java b/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java index aa5947c..fef476d 100644 --- a/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java +++ b/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class SpringLdapComponentAutoConfiguration { + @Lazy @Bean(name = "spring-ldap-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SpringLdapComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java b/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java index 7ed6d31..66bd1be 100644 --- a/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java +++ b/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class RedisComponentAutoConfiguration { + @Lazy @Bean(name = "spring-redis-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(RedisComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java b/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java index 3ba4859a..817e9f7 100644 --- a/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java +++ b/components-starter/camel-spring-starter/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(EventComponentConfiguration.class) public class EventComponentAutoConfiguration { + @Lazy @Bean(name = "spring-event-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(EventComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-spring-ws-starter/src/main/java/org/apache/camel/component/spring/ws/springboot/SpringWebserviceComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-spring-ws-starter/src/main/java/org/apache/camel/component/spring/ws/springboot/SpringWebserviceComponentAutoConfiguration.java b/components-starter/camel-spring-ws-starter/src/main/java/org/apache/camel/component/spring/ws/springboot/SpringWebserviceComponentAutoConfiguration.java index 20a00c5..ee5349b 100644 --- a/components-starter/camel-spring-ws-starter/src/main/java/org/apache/camel/component/spring/ws/springboot/SpringWebserviceComponentAutoConfiguration.java +++ b/components-starter/camel-spring-ws-starter/src/main/java/org/apache/camel/component/spring/ws/springboot/SpringWebserviceComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class SpringWebserviceComponentAutoConfiguration { + @Lazy @Bean(name = "spring-ws-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SpringWebserviceComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java index ecfbf6d..facfb76 100644 --- a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java +++ b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SqlComponentConfiguration.class) public class SqlComponentAutoConfiguration { + @Lazy @Bean(name = "sql-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SqlComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java index dfc919a..68190dc 100644 --- a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java +++ b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SqlStoredComponentConfiguration.class) public class SqlStoredComponentAutoConfiguration { + @Lazy @Bean(name = "sql-stored-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SqlStoredComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java b/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java index 2f92b42..e9f3ced 100644 --- a/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java +++ b/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SshComponentConfiguration.class) public class SshComponentAutoConfiguration { + @Lazy @Bean(name = "ssh-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SshComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentAutoConfiguration.java b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentAutoConfiguration.java index 11bed18..bee7380 100644 --- a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentAutoConfiguration.java +++ b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class StAXComponentAutoConfiguration { + @Lazy @Bean(name = "stax-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(StAXComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java b/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java index f5c630a..c46611e 100644 --- a/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java +++ b/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(StompComponentConfiguration.class) public class StompComponentAutoConfiguration { + @Lazy @Bean(name = "stomp-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(StompComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-stream-starter/src/main/java/org/apache/camel/component/stream/springboot/StreamComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-stream-starter/src/main/java/org/apache/camel/component/stream/springboot/StreamComponentAutoConfiguration.java b/components-starter/camel-stream-starter/src/main/java/org/apache/camel/component/stream/springboot/StreamComponentAutoConfiguration.java index e8a2a42..8f72be2 100644 --- a/components-starter/camel-stream-starter/src/main/java/org/apache/camel/component/stream/springboot/StreamComponentAutoConfiguration.java +++ b/components-starter/camel-stream-starter/src/main/java/org/apache/camel/component/stream/springboot/StreamComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class StreamComponentAutoConfiguration { + @Lazy @Bean(name = "stream-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(StreamComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java b/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java index e4ecfbe..098d350 100644 --- a/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java +++ b/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class StringTemplateComponentAutoConfiguration { + @Lazy @Bean(name = "string-template-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(StringTemplateComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentAutoConfiguration.java b/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentAutoConfiguration.java index cc1f352..ef588b197 100644 --- a/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentAutoConfiguration.java +++ b/components-starter/camel-telegram-starter/src/main/java/org/apache/camel/component/telegram/springboot/TelegramComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(TelegramComponentConfiguration.class) public class TelegramComponentAutoConfiguration { + @Lazy @Bean(name = "telegram-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(TelegramComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java b/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java index c90ca96..b31610b 100644 --- a/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java +++ b/components-starter/camel-twitter-starter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(TwitterComponentConfiguration.class) public class TwitterComponentAutoConfiguration { + @Lazy @Bean(name = "twitter-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(TwitterComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java index aa201bb..8676805 100644 --- a/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java +++ b/components-starter/camel-undertow-starter/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(UndertowComponentConfiguration.class) public class UndertowComponentAutoConfiguration { + @Lazy @Bean(name = "undertow-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(UndertowComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java b/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java index a8e9b45..77c26bb 100644 --- a/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java +++ b/components-starter/camel-velocity-starter/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(VelocityComponentConfiguration.class) public class VelocityComponentAutoConfiguration { + @Lazy @Bean(name = "velocity-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(VelocityComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java b/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java index ba1b812..5677d99 100644 --- a/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java +++ b/components-starter/camel-vertx-starter/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(VertxComponentConfiguration.class) public class VertxComponentAutoConfiguration { + @Lazy @Bean(name = "vertx-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(VertxComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentAutoConfiguration.java b/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentAutoConfiguration.java index 2124e5d..be36aaa 100644 --- a/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentAutoConfiguration.java +++ b/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class WeatherComponentAutoConfiguration { + @Lazy @Bean(name = "weather-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(WeatherComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java b/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java index c55d972..9e2ad4b 100644 --- a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java +++ b/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(WebsocketComponentConfiguration.class) public class WebsocketComponentAutoConfiguration { + @Lazy @Bean(name = "websocket-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(WebsocketComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-xmlrpc-starter/src/main/java/org/apache/camel/component/xmlrpc/springboot/XmlRpcComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-xmlrpc-starter/src/main/java/org/apache/camel/component/xmlrpc/springboot/XmlRpcComponentAutoConfiguration.java b/components-starter/camel-xmlrpc-starter/src/main/java/org/apache/camel/component/xmlrpc/springboot/XmlRpcComponentAutoConfiguration.java index 2e6a3d8..ab993bb 100644 --- a/components-starter/camel-xmlrpc-starter/src/main/java/org/apache/camel/component/xmlrpc/springboot/XmlRpcComponentAutoConfiguration.java +++ b/components-starter/camel-xmlrpc-starter/src/main/java/org/apache/camel/component/xmlrpc/springboot/XmlRpcComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class XmlRpcComponentAutoConfiguration { + @Lazy @Bean(name = "xmlrpc-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(XmlRpcComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java index 7cac910..dfcd3de 100644 --- a/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java +++ b/components-starter/camel-xmlsecurity-starter/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(XmlSignatureComponentConfiguration.class) public class XmlSignatureComponentAutoConfiguration { + @Lazy @Bean(name = "xmlsecurity-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(XmlSignatureComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java b/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java index 8f3d7b7..a48647e 100644 --- a/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java +++ b/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -41,6 +42,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") public class XmppComponentAutoConfiguration { + @Lazy @Bean(name = "xmpp-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(XmppComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-yammer-starter/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-yammer-starter/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java b/components-starter/camel-yammer-starter/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java index 07f9649..006d096 100644 --- a/components-starter/camel-yammer-starter/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java +++ b/components-starter/camel-yammer-starter/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(YammerComponentConfiguration.class) public class YammerComponentAutoConfiguration { + @Lazy @Bean(name = "yammer-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(YammerComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java b/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java index 3d4e7b0..1478c95 100644 --- a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java +++ b/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -46,6 +47,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(ZooKeeperComponentConfiguration.class) public class ZooKeeperComponentAutoConfiguration { + @Lazy @Bean(name = "zookeeper-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ZooKeeperComponent.class) http://git-wip-us.apache.org/repos/asf/camel/blob/03b6fe78/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java index dae8edd..c7aa740 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java @@ -83,6 +83,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; @@ -829,6 +830,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { // Determine all the aliases String[] springBeanAliases = componentAliases.stream().map(alias -> alias + "-component").toArray(size -> new String[size]); + method.addAnnotation(Lazy.class); method.addAnnotation(Bean.class).setStringArrayValue("name", springBeanAliases); method.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class"); method.addAnnotation(ConditionalOnMissingBean.class).setLiteralValue("value", model.getShortJavaType() + ".class");
