You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/03/28 15:07:31 UTC
[5/5] camel git commit: Translate List to
Map in spring-boot configuration classes
Translate List<PropertyDefinition> to Map<String, String> in spring-boot configuration classes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/365ac51a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/365ac51a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/365ac51a
Branch: refs/heads/master
Commit: 365ac51a0289c6c9758a83b2074c88b3574d5fb9
Parents: 9bab0d0
Author: lburgazzoli <lb...@gmail.com>
Authored: Tue Mar 28 17:06:11 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Tue Mar 28 17:06:48 2017 +0200
----------------------------------------------------------------------
...onsulServiceCallServiceDiscoveryConfigurationCommon.java | 9 ++++-----
.../DnsServiceCallServiceDiscoveryConfigurationCommon.java | 9 ++++-----
.../EtcdServiceCallServiceDiscoveryConfigurationCommon.java | 9 ++++-----
...netesServiceCallServiceDiscoveryConfigurationCommon.java | 9 ++++-----
.../maven/packaging/SpringBootAutoConfigurationMojo.java | 8 ++++++--
5 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/365ac51a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationCommon.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationCommon.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationCommon.java
index 23df276..cc8ae52 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationCommon.java
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationCommon.java
@@ -16,8 +16,7 @@
*/
package org.apache.camel.model.cloud.springboot;
-import java.util.List;
-import org.apache.camel.model.PropertyDefinition;
+import java.util.Map;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
@@ -66,7 +65,7 @@ public class ConsulServiceCallServiceDiscoveryConfigurationCommon {
* the client properties are define in
* com.netflix.client.config.CommonClientConfigKey.
*/
- private List<PropertyDefinition> properties;
+ private Map<String, String> properties;
public String getUrl() {
return url;
@@ -140,11 +139,11 @@ public class ConsulServiceCallServiceDiscoveryConfigurationCommon {
this.blockSeconds = blockSeconds;
}
- public List<PropertyDefinition> getProperties() {
+ public Map<String, String> getProperties() {
return properties;
}
- public void setProperties(List<PropertyDefinition> properties) {
+ public void setProperties(Map<String, String> properties) {
this.properties = properties;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/365ac51a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationCommon.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationCommon.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationCommon.java
index 8515557..42fe393 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationCommon.java
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationCommon.java
@@ -16,8 +16,7 @@
*/
package org.apache.camel.model.cloud.springboot;
-import java.util.List;
-import org.apache.camel.model.PropertyDefinition;
+import java.util.Map;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
@@ -38,7 +37,7 @@ public class DnsServiceCallServiceDiscoveryConfigurationCommon {
* the client properties are define in
* com.netflix.client.config.CommonClientConfigKey.
*/
- private List<PropertyDefinition> properties;
+ private Map<String, String> properties;
public String getProto() {
return proto;
@@ -56,11 +55,11 @@ public class DnsServiceCallServiceDiscoveryConfigurationCommon {
this.domain = domain;
}
- public List<PropertyDefinition> getProperties() {
+ public Map<String, String> getProperties() {
return properties;
}
- public void setProperties(List<PropertyDefinition> properties) {
+ public void setProperties(Map<String, String> properties) {
this.properties = properties;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/365ac51a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/EtcdServiceCallServiceDiscoveryConfigurationCommon.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/EtcdServiceCallServiceDiscoveryConfigurationCommon.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/EtcdServiceCallServiceDiscoveryConfigurationCommon.java
index e79f102..0109284 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/EtcdServiceCallServiceDiscoveryConfigurationCommon.java
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/EtcdServiceCallServiceDiscoveryConfigurationCommon.java
@@ -16,8 +16,7 @@
*/
package org.apache.camel.model.cloud.springboot;
-import java.util.List;
-import org.apache.camel.model.PropertyDefinition;
+import java.util.Map;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
@@ -54,7 +53,7 @@ public class EtcdServiceCallServiceDiscoveryConfigurationCommon {
* the client properties are define in
* com.netflix.client.config.CommonClientConfigKey.
*/
- private List<PropertyDefinition> properties;
+ private Map<String, String> properties;
public String getUris() {
return uris;
@@ -104,11 +103,11 @@ public class EtcdServiceCallServiceDiscoveryConfigurationCommon {
this.type = type;
}
- public List<PropertyDefinition> getProperties() {
+ public Map<String, String> getProperties() {
return properties;
}
- public void setProperties(List<PropertyDefinition> properties) {
+ public void setProperties(Map<String, String> properties) {
this.properties = properties;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/365ac51a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationCommon.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationCommon.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationCommon.java
index 9763c5b..5ffac09 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationCommon.java
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationCommon.java
@@ -16,8 +16,7 @@
*/
package org.apache.camel.model.cloud.springboot;
-import java.util.List;
-import org.apache.camel.model.PropertyDefinition;
+import java.util.Map;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
@@ -108,7 +107,7 @@ public class KubernetesServiceCallServiceDiscoveryConfigurationCommon {
* the client properties are define in
* com.netflix.client.config.CommonClientConfigKey.
*/
- private List<PropertyDefinition> properties;
+ private Map<String, String> properties;
public String getLookup() {
return lookup;
@@ -246,11 +245,11 @@ public class KubernetesServiceCallServiceDiscoveryConfigurationCommon {
this.trustCerts = trustCerts;
}
- public List<PropertyDefinition> getProperties() {
+ public Map<String, String> getProperties() {
return properties;
}
- public void setProperties(List<PropertyDefinition> properties) {
+ public void setProperties(Map<String, String> properties) {
this.properties = properties;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/365ac51a/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 76c1057..4af0892 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
@@ -284,15 +284,19 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
continue;
}
+ if ("java.util.List<org.apache.camel.model.PropertyDefinition>".equalsIgnoreCase(type)) {
+ type = "java.util.Map<java.lang.String, java.lang.String>";
+ }
+
// generate inner class for non-primitive options
PropertySource<JavaClassSource> prop = commonClass.addProperty(type, option.getName());
if (!Strings.isBlank(option.getDescription())) {
prop.getField().getJavaDoc().setFullText(option.getDescription());
}
if (!Strings.isBlank(option.getDefaultValue())) {
- if ("java.lang.String".equals(option.getJavaType())) {
+ if ("java.lang.String".equals(type)) {
prop.getField().setStringInitializer(option.getDefaultValue());
- } else if ("long".equals(option.getJavaType()) || "java.lang.Long".equals(option.getJavaType())) {
+ } else if ("long".equals(type) || "java.lang.Long".equals(type)) {
// the value should be a Long number
String value = option.getDefaultValue() + "L";
prop.getField().setLiteralInitializer(value);