You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/06/21 08:18:44 UTC
[4/5] camel git commit: CAMEL-10062: For specialized Dataformats,
provide default value in catalog
CAMEL-10062: For specialized Dataformats, provide default value in catalog
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4b2e485d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4b2e485d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4b2e485d
Branch: refs/heads/master
Commit: 4b2e485d69f961da7b3da6689aeaf9d67ab03610
Parents: f353c8c
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 21 09:52:10 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 21 10:18:33 2016 +0200
----------------------------------------------------------------------
.../BindyCsvDataFormatConfiguration.java | 3 ++-
.../BindyFixedLengthDataFormatConfiguration.java | 3 ++-
...BindyKeyValuePairDataFormatConfiguration.java | 3 ++-
.../maven/packaging/PackageDataFormatMojo.java | 2 +-
.../SpringBootAutoConfigurationMojo.java | 19 ++-----------------
5 files changed, 9 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4b2e485d/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
index befeff9..67f781b 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.dataformat.bindy.csv.springboot;
+import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat;
import org.apache.camel.model.dataformat.BindyType;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -30,7 +31,7 @@ public class BindyCsvDataFormatConfiguration {
/**
* Whether to use csv fixed or key value pairs mode.
*/
- private BindyType type;
+ private BindyType type = BindyType.Csv;
/**
* Name of model class to use.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/4b2e485d/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
index a159408..90c89bf 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.dataformat.bindy.fixed.springboot;
+import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
import org.apache.camel.model.dataformat.BindyType;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -30,7 +31,7 @@ public class BindyFixedLengthDataFormatConfiguration {
/**
* Whether to use csv fixed or key value pairs mode.
*/
- private BindyType type;
+ private BindyType type = BindyType.Fixed;
/**
* Name of model class to use.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/4b2e485d/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
index ae5011d..63d823f 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.dataformat.bindy.kvp.springboot;
+import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat;
import org.apache.camel.model.dataformat.BindyType;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -30,7 +31,7 @@ public class BindyKeyValuePairDataFormatConfiguration {
/**
* Whether to use csv fixed or key value pairs mode.
*/
- private BindyType type;
+ private BindyType type = BindyType.KeyValue;
/**
* Name of model class to use.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/4b2e485d/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index c6dfcff..7df7a6b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -293,7 +293,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
}
private static String prepareJsonProperties(String name, String properties) {
- String json = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", \"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\"";
+ String json = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", \"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"XStream\"";
String jsonGson = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", \"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Gson\"";
String jsonJackson = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", \"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Jackson\"";
String jsonJohnzon = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", \"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Johnzon\"";
http://git-wip-us.apache.org/repos/asf/camel/blob/4b2e485d/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 42bce15..f758230 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
@@ -227,8 +227,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
prop.getField().setLiteralInitializer(option.getDefaultValue());
} else if (!Strings.isBlank(option.getEnumValues())) {
String enumShortName = type.substring(type.lastIndexOf(".") + 1);
- String value = getDefaultValue(model.getScheme(), option.getName(), option.getDefaultValue());
- prop.getField().setLiteralInitializer(enumShortName + "." + value);
+ prop.getField().setLiteralInitializer(enumShortName + "." + option.getDefaultValue());
javaClass.addImport(model.getJavaType());
}
}
@@ -311,8 +310,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
prop.getField().setLiteralInitializer(option.getDefaultValue());
} else if (!Strings.isBlank(option.getEnumValues())) {
String enumShortName = type.substring(type.lastIndexOf(".") + 1);
- String value = getDefaultValue(model.getName(), option.getName(), option.getDefaultValue());
- prop.getField().setLiteralInitializer(enumShortName + "." + value);
+ prop.getField().setLiteralInitializer(enumShortName + "." + option.getDefaultValue());
javaClass.addImport(model.getJavaType());
}
}
@@ -347,19 +345,6 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
}
- private String getDefaultValue(String modelName, String optionName, String defaultValue) {
- // special for some data formats
- if ("json-jackson".equals(modelName) && "library".equals(optionName)) {
- return "Jackson";
- } else if ("json-xstream".equals(modelName) && "library".equals(optionName)) {
- return "XStream";
- } else if ("json-gson".equals(modelName) && "library".equals(optionName)) {
- return "Gson";
- }
-
- return defaultValue;
- }
-
private void createComponentAutoConfigurationSource(String packageName, ComponentModel model) throws MojoFailureException {
final JavaClassSource javaClass = Roaster.create(JavaClassSource.class);