Repository: camel Updated Branches: refs/heads/master c89fa946e -> 161d912bf
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/161d912b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/161d912b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/161d912b Branch: refs/heads/master Commit: 161d912bfbd1177b86ceff0111c35d311a59fafe Parents: c89fa94 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Mon Sep 11 16:10:24 2017 +0200 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Mon Sep 11 16:10:35 2017 +0200 ---------------------------------------------------------------------- .../camel/maven/connector/SpringBootAutoConfigurationMojo.java | 3 +++ .../foo-connector/src/main/resources/camel-connector.json | 2 +- .../springboot/PetStoreConnectorAutoConfiguration.java | 5 +++++ .../petstore-connector/src/main/resources/camel-connector.json | 2 +- .../SalesforceUpsertContactConnectorAutoConfiguration.java | 5 +++++ .../src/main/resources/camel-connector.json | 2 +- .../springboot/TwitterMentionConnectorAutoConfiguration.java | 5 +++++ .../springboot/TwitterSearchConnectorAutoConfiguration.java | 5 +++++ 8 files changed, 26 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/161d912b/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 00404d3..1a41424 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 @@ -312,6 +312,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { javaClass.addImport("org.apache.camel.spi.HasId"); javaClass.addImport("org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator"); javaClass.addImport("org.apache.camel.util.ObjectHelper"); + javaClass.addImport("org.apache.camel.util.IntrospectionSupport"); javaClass.addField() .setPrivate() @@ -407,6 +408,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { sb.append("\n"); if (hasOptions) { sb.append("Map<String, Object> parameters = new HashMap<>();\n"); + sb.append("IntrospectionSupport.getProperties(configuration, parameters, null, false);\n"); sb.append("CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false);\n"); sb.append("connector.setOptions(parameters);\n"); } @@ -446,6 +448,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { sb.append("connector.setCamelContext(camelContext);\n"); sb.append("\n"); sb.append("try {\n"); + sb.append("IntrospectionSupport.getProperties(entry.getValue(), parameters, null, false);\n"); sb.append("CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false);\n"); sb.append("connector.setOptions(parameters);\n"); sb.append("if (ObjectHelper.isNotEmpty(customizers)) {\n"); http://git-wip-us.apache.org/repos/asf/camel/blob/161d912b/connectors/examples/foo-connector/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/connectors/examples/foo-connector/src/main/resources/camel-connector.json b/connectors/examples/foo-connector/src/main/resources/camel-connector.json index 672717f..ccc5c94 100644 --- a/connectors/examples/foo-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/foo-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "timer", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0-20170906.004047-219", + "baseVersion" : "2.20.0-20170910.162727-225", "baseJavaType" : "org.apache.camel.component.timer.TimerComponent", "name" : "Foo", "scheme" : "foo", http://git-wip-us.apache.org/repos/asf/camel/blob/161d912b/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 d0a5121..1874b75 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 @@ -26,6 +26,7 @@ import org.apache.camel.component.connector.ConnectorCustomizer; import org.apache.camel.spi.HasId; import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; +import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.foo.connector.PetStoreComponent; import org.slf4j.Logger; @@ -71,6 +72,8 @@ public class PetStoreConnectorAutoConfiguration { PetStoreComponent connector = new PetStoreComponent(); connector.setCamelContext(camelContext); Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, parameters, null, + false); CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false); connector.setOptions(parameters); @@ -105,6 +108,8 @@ public class PetStoreConnectorAutoConfiguration { PetStoreComponent connector = new PetStoreComponent(); connector.setCamelContext(camelContext); try { + IntrospectionSupport.getProperties(entry.getValue(), + parameters, null, false); CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false); connector.setOptions(parameters); http://git-wip-us.apache.org/repos/asf/camel/blob/161d912b/connectors/examples/petstore-connector/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/connectors/examples/petstore-connector/src/main/resources/camel-connector.json b/connectors/examples/petstore-connector/src/main/resources/camel-connector.json index f701a65..f6c3298 100644 --- a/connectors/examples/petstore-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/petstore-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "rest-swagger", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-rest-swagger", - "baseVersion" : "2.20.0-SNAPSHOT", + "baseVersion" : "2.20.0-20170911.120853-191", "baseJavaType" : "org.apache.camel.component.rest.swagger.RestSwaggerComponent", "name" : "PetStore", "scheme" : "petstore", http://git-wip-us.apache.org/repos/asf/camel/blob/161d912b/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 dcc1411..d153b07 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 @@ -26,6 +26,7 @@ import org.apache.camel.component.connector.ConnectorCustomizer; import org.apache.camel.spi.HasId; import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; +import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.foo.salesforce.contact.SalesforceUpsertContactComponent; import org.slf4j.Logger; @@ -72,6 +73,8 @@ public class SalesforceUpsertContactConnectorAutoConfiguration { SalesforceUpsertContactComponent connector = new SalesforceUpsertContactComponent(); connector.setCamelContext(camelContext); Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, parameters, null, + false); CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false); connector.setOptions(parameters); @@ -107,6 +110,8 @@ public class SalesforceUpsertContactConnectorAutoConfiguration { SalesforceUpsertContactComponent connector = new SalesforceUpsertContactComponent(); connector.setCamelContext(camelContext); try { + IntrospectionSupport.getProperties(entry.getValue(), + parameters, null, false); CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false); connector.setOptions(parameters); http://git-wip-us.apache.org/repos/asf/camel/blob/161d912b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json index bad488c..3ca957e 100644 --- a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0-SNAPSHOT", + "baseVersion" : "2.20.0-20170910.172654-189", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceUpsertContact", "scheme" : "salesforce-upsert-contact", http://git-wip-us.apache.org/repos/asf/camel/blob/161d912b/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 1421242..d519650 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 @@ -26,6 +26,7 @@ import org.apache.camel.component.connector.ConnectorCustomizer; import org.apache.camel.spi.HasId; import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; +import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.foo.mention.TwitterMentionComponent; import org.slf4j.Logger; @@ -72,6 +73,8 @@ public class TwitterMentionConnectorAutoConfiguration { TwitterMentionComponent connector = new TwitterMentionComponent(); connector.setCamelContext(camelContext); Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, parameters, null, + false); CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false); connector.setOptions(parameters); @@ -106,6 +109,8 @@ public class TwitterMentionConnectorAutoConfiguration { TwitterMentionComponent connector = new TwitterMentionComponent(); connector.setCamelContext(camelContext); try { + IntrospectionSupport.getProperties(entry.getValue(), + parameters, null, false); CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false); connector.setOptions(parameters); http://git-wip-us.apache.org/repos/asf/camel/blob/161d912b/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 b2acf9b..5d33a53 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 @@ -26,6 +26,7 @@ import org.apache.camel.component.connector.ConnectorCustomizer; import org.apache.camel.spi.HasId; import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; +import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.foo.search.TwitterSearchComponent; import org.slf4j.Logger; @@ -72,6 +73,8 @@ public class TwitterSearchConnectorAutoConfiguration { TwitterSearchComponent connector = new TwitterSearchComponent(); connector.setCamelContext(camelContext); Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, parameters, null, + false); CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false); connector.setOptions(parameters); @@ -106,6 +109,8 @@ public class TwitterSearchConnectorAutoConfiguration { TwitterSearchComponent connector = new TwitterSearchComponent(); connector.setCamelContext(camelContext); try { + IntrospectionSupport.getProperties(entry.getValue(), + parameters, null, false); CamelPropertiesHelper.setCamelProperties(camelContext, connector, parameters, false); connector.setOptions(parameters);
