Repository: camel Updated Branches: refs/heads/master 161d912bf -> 2e27c3d06
Fix option not being loaded from spring-boot configuration Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e27c3d0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e27c3d0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e27c3d0 Branch: refs/heads/master Commit: 2e27c3d064d939e5b5070d3336fe4ee0f8b86f5c Parents: 161d912 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Mon Sep 11 16:42:00 2017 +0200 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Mon Sep 11 16:42:00 2017 +0200 ---------------------------------------------------------------------- .../camel/maven/connector/SpringBootAutoConfigurationMojo.java | 2 +- .../connector/springboot/PetStoreConnectorAutoConfiguration.java | 2 +- .../SalesforceUpsertContactConnectorAutoConfiguration.java | 2 +- .../springboot/TwitterMentionConnectorAutoConfiguration.java | 2 +- .../search/springboot/TwitterSearchConnectorAutoConfiguration.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2e27c3d0/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java ---------------------------------------------------------------------- diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java index 1a41424..c629271 100644 --- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java +++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java @@ -353,7 +353,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { configureMethod.addAnnotation(Lazy.class); configureMethod.addAnnotation(Bean.class).setStringValue("name", beanName); configureMethod.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class"); - configureMethod.addAnnotation(ConditionalOnMissingBean.class).setStringValue("name", beanName); + configureMethod.addAnnotation(ConditionalOnMissingBean.class); MethodSource<JavaClassSource> postProcessMethod = javaClass.addMethod() .setName("postConstruct" + shortJavaType) http://git-wip-us.apache.org/repos/asf/camel/blob/2e27c3d0/connectors/examples/petstore-connector/src/main/java/org/foo/connector/springboot/PetStoreConnectorAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/connectors/examples/petstore-connector/src/main/java/org/foo/connector/springboot/PetStoreConnectorAutoConfiguration.java b/connectors/examples/petstore-connector/src/main/java/org/foo/connector/springboot/PetStoreConnectorAutoConfiguration.java index 1874b75..bc39ddc 100644 --- a/connectors/examples/petstore-connector/src/main/java/org/foo/connector/springboot/PetStoreConnectorAutoConfiguration.java +++ b/connectors/examples/petstore-connector/src/main/java/org/foo/connector/springboot/PetStoreConnectorAutoConfiguration.java @@ -67,7 +67,7 @@ public class PetStoreConnectorAutoConfiguration { @Lazy @Bean(name = "petstore-component") @ConditionalOnClass(CamelContext.class) - @ConditionalOnMissingBean(name = "petstore-component") + @ConditionalOnMissingBean public PetStoreComponent configurePetStoreComponent() throws Exception { PetStoreComponent connector = new PetStoreComponent(); connector.setCamelContext(camelContext); http://git-wip-us.apache.org/repos/asf/camel/blob/2e27c3d0/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorAutoConfiguration.java b/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorAutoConfiguration.java index d153b07..e5427a5 100644 --- a/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorAutoConfiguration.java +++ b/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorAutoConfiguration.java @@ -67,7 +67,7 @@ public class SalesforceUpsertContactConnectorAutoConfiguration { @Lazy @Bean(name = "salesforce-upsert-contact-component") @ConditionalOnClass(CamelContext.class) - @ConditionalOnMissingBean(name = "salesforce-upsert-contact-component") + @ConditionalOnMissingBean public SalesforceUpsertContactComponent configureSalesforceUpsertContactComponent() throws Exception { SalesforceUpsertContactComponent connector = new SalesforceUpsertContactComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/2e27c3d0/connectors/examples/twitter-mention-connector/src/main/java/org/foo/mention/springboot/TwitterMentionConnectorAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/connectors/examples/twitter-mention-connector/src/main/java/org/foo/mention/springboot/TwitterMentionConnectorAutoConfiguration.java b/connectors/examples/twitter-mention-connector/src/main/java/org/foo/mention/springboot/TwitterMentionConnectorAutoConfiguration.java index d519650..383611f 100644 --- a/connectors/examples/twitter-mention-connector/src/main/java/org/foo/mention/springboot/TwitterMentionConnectorAutoConfiguration.java +++ b/connectors/examples/twitter-mention-connector/src/main/java/org/foo/mention/springboot/TwitterMentionConnectorAutoConfiguration.java @@ -67,7 +67,7 @@ public class TwitterMentionConnectorAutoConfiguration { @Lazy @Bean(name = "twitter-mention-component") @ConditionalOnClass(CamelContext.class) - @ConditionalOnMissingBean(name = "twitter-mention-component") + @ConditionalOnMissingBean public TwitterMentionComponent configureTwitterMentionComponent() throws Exception { TwitterMentionComponent connector = new TwitterMentionComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/2e27c3d0/connectors/examples/twitter-search-connector/src/main/java/org/foo/search/springboot/TwitterSearchConnectorAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/connectors/examples/twitter-search-connector/src/main/java/org/foo/search/springboot/TwitterSearchConnectorAutoConfiguration.java b/connectors/examples/twitter-search-connector/src/main/java/org/foo/search/springboot/TwitterSearchConnectorAutoConfiguration.java index 5d33a53..9a4fd10 100644 --- a/connectors/examples/twitter-search-connector/src/main/java/org/foo/search/springboot/TwitterSearchConnectorAutoConfiguration.java +++ b/connectors/examples/twitter-search-connector/src/main/java/org/foo/search/springboot/TwitterSearchConnectorAutoConfiguration.java @@ -67,7 +67,7 @@ public class TwitterSearchConnectorAutoConfiguration { @Lazy @Bean(name = "twitter-search-component") @ConditionalOnClass(CamelContext.class) - @ConditionalOnMissingBean(name = "twitter-search-component") + @ConditionalOnMissingBean public TwitterSearchComponent configureTwitterSearchComponent() throws Exception { TwitterSearchComponent connector = new TwitterSearchComponent();
