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:41 UTC
[1/5] camel git commit: CAMEL-10062: For specialized Dataformats,
provide default value in catalog
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x cdd0704db -> 0bfc8a263
refs/heads/master da0fc7bff -> cb954e777
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/0bfc8a26
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0bfc8a26
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0bfc8a26
Branch: refs/heads/camel-2.17.x
Commit: 0bfc8a263c6e2bf684bf98ff110a5c36c75b30c9
Parents: eb0c7d5
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 21 10:18:06 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 21 10:18:23 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/model/dataformat/JsonDataFormat.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0bfc8a26/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index d501288..0b78d3d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -133,9 +133,7 @@ public class JsonDataFormat extends DataFormatDefinition {
}
/**
- * Which json library to use such.
- * <p/>
- * Is by default xstream
+ * Which json library to use.
*/
public void setLibrary(JsonLibrary library) {
this.library = library;
[5/5] camel git commit: CAMEL-10062: For specialized Dataformats,
provide default value in catalog
Posted by da...@apache.org.
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/f353c8c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f353c8c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f353c8c5
Branch: refs/heads/master
Commit: f353c8c50b28716b951e369d8d633c7b03fde72e
Parents: da0fc7b
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 21 09:52:07 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 21 10:18:33 2016 +0200
----------------------------------------------------------------------
.../maven/packaging/PackageDataFormatMojo.java | 48 ++++++++++++++++++--
1 file changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f353c8c5/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 6ae8d39..c6dfcff 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
@@ -199,6 +199,11 @@ public class PackageDataFormatMojo extends AbstractMojo {
// build json schema for the data format
String properties = after(json, " \"properties\": {");
+
+ // special prepare for bindy/json properties
+ properties = prepareBindyProperties(name, properties);
+ properties = prepareJsonProperties(name, properties);
+
String schema = createParameterJsonSchema(dataFormatModel, properties);
log.debug("JSon schema\n" + schema);
@@ -270,6 +275,43 @@ public class PackageDataFormatMojo extends AbstractMojo {
}
}
+ private static String prepareBindyProperties(String name, String properties) {
+ String bindy = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\"";
+ String bindyCsv = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Csv\"";
+ String bindyFixed = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Fixed\"";
+ String bindyKvp = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"KeyValue\"";
+
+ if ("bindy-csv".equals(name)) {
+ properties = properties.replace(bindy, bindyCsv);
+ } else if ("bindy-fixed".equals(name)) {
+ properties = properties.replace(bindy, bindyFixed);
+ } else if ("bindy-kvp".equals(name)) {
+ properties = properties.replace(bindy, bindyKvp);
+ }
+
+ return properties;
+ }
+
+ private static String prepareJsonProperties(String name, String properties) {
+ String json = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", \"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\"";
+ 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\"";
+ String jsonXStream = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", \"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"XStream\"";
+
+ if ("json-gson".equals(name)) {
+ properties = properties.replace(json, jsonGson);
+ } else if ("json-jackson".equals(name)) {
+ properties = properties.replace(json, jsonJackson);
+ } else if ("json-johnzon".equals(name)) {
+ properties = properties.replace(json, jsonJohnzon);
+ } else if ("json-xstream".equals(name)) {
+ properties = properties.replace(json, jsonXStream);
+ }
+
+ return properties;
+ }
+
private static String readClassFromCamelResource(File file, StringBuilder buffer, BuildContext buildContext) throws MojoExecutionException {
// skip directories as there may be a sub .resolver directory
if (file.isDirectory()) {
@@ -303,7 +345,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
private static String asModelName(String name) {
// special for some data formats
- if ("json-gson".equals(name) || "json-jackson".equals(name) || "json-xstream".equals(name) || "json-johnzon".equals(name)) {
+ if ("json-gson".equals(name) || "json-jackson".equals(name) || "json-johnzon".equals(name) || "json-xstream".equals(name)) {
return "json";
} else if ("bindy-csv".equals(name) || "bindy-fixed".equals(name) || "bindy-kvp".equals(name)) {
return "bindy";
@@ -322,10 +364,10 @@ public class PackageDataFormatMojo extends AbstractMojo {
return "JSon GSon";
} else if ("json-jackson".equals(name)) {
return "JSon Jackson";
- } else if ("json-xstream".equals(name)) {
- return "JSon XStream";
} else if ("json-johnzon".equals(name)) {
return "JSon Johnzon";
+ } else if ("json-xstream".equals(name)) {
+ return "JSon XStream";
} else if ("bindy-csv".equals(name)) {
return "Bindy CSV";
} else if ("bindy-fixed".equals(name)) {
[3/5] camel git commit: CAMEL-10062: For specialized Dataformats,
provide default value in catalog
Posted by da...@apache.org.
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/cb954e77
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cb954e77
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cb954e77
Branch: refs/heads/master
Commit: cb954e77761e7e1d842ee6e749b42fad62889275
Parents: 4b2e485
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 21 10:13:49 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 21 10:18:33 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/model/dataformat/JsonDataFormat.java | 2 +-
.../component/gson/springboot/GsonDataFormatConfiguration.java | 2 +-
.../jackson/springboot/JacksonDataFormatConfiguration.java | 2 +-
.../johnzon/springboot/JohnzonDataFormatConfiguration.java | 4 ++--
.../xstream/springboot/JsonDataFormatConfiguration.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cb954e77/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index 6521c7c..2ca8dff 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -133,7 +133,7 @@ public class JsonDataFormat extends DataFormatDefinition {
}
/**
- * Which json library to use such.
+ * Which json library to use.
*/
public void setLibrary(JsonLibrary library) {
this.library = library;
http://git-wip-us.apache.org/repos/asf/camel/blob/cb954e77/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
index 714dcc3..477e679 100644
--- a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
+++ b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
@@ -38,7 +38,7 @@ public class GsonDataFormatConfiguration {
*/
private Boolean prettyPrint = false;
/**
- * Which json library to use such.
+ * Which json library to use.
*/
private JsonLibrary library = JsonLibrary.Gson;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/cb954e77/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
index 2647c75..ee32606 100644
--- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
+++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
@@ -38,7 +38,7 @@ public class JacksonDataFormatConfiguration {
*/
private Boolean prettyPrint = false;
/**
- * Which json library to use such.
+ * Which json library to use.
*/
private JsonLibrary library = JsonLibrary.Jackson;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/cb954e77/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
index 1e81633..eb01d01 100644
--- a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
+++ b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
@@ -38,9 +38,9 @@ public class JohnzonDataFormatConfiguration {
*/
private Boolean prettyPrint = false;
/**
- * Which json library to use such.
+ * Which json library to use.
*/
- private JsonLibrary library = JsonLibrary.XStream;
+ private JsonLibrary library = JsonLibrary.Johnzon;
/**
* Class name of the java type to use when unarmshalling
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/cb954e77/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
index f9269a0..f5fce13 100644
--- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
+++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
@@ -38,7 +38,7 @@ public class JsonDataFormatConfiguration {
*/
private Boolean prettyPrint = false;
/**
- * Which json library to use such.
+ * Which json library to use.
*/
private JsonLibrary library = JsonLibrary.XStream;
/**
[2/5] camel git commit: CAMEL-10062: For specialized Dataformats,
provide default value in catalog
Posted by da...@apache.org.
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/eb0c7d5f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eb0c7d5f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eb0c7d5f
Branch: refs/heads/camel-2.17.x
Commit: eb0c7d5fe715db6a89ef3dce54123592bb4fcb61
Parents: cdd0704
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 21 09:52:07 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 21 10:18:23 2016 +0200
----------------------------------------------------------------------
.../maven/packaging/PackageDataFormatMojo.java | 39 ++++++++++++++++++++
1 file changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/eb0c7d5f/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 9f88702..9405f73 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
@@ -200,6 +200,11 @@ public class PackageDataFormatMojo extends AbstractMojo {
// build json schema for the data format
String properties = after(json, " \"properties\": {");
+
+ // special prepare for bindy/json properties
+ properties = prepareBindyProperties(name, properties);
+ properties = prepareJsonProperties(name, properties);
+
String schema = createParameterJsonSchema(dataFormatModel, properties);
log.debug("JSon schema\n" + schema);
@@ -275,6 +280,40 @@ public class PackageDataFormatMojo extends AbstractMojo {
}
}
+ private static String prepareBindyProperties(String name, String properties) {
+ String bindy = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\"";
+ String bindyCsv = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Csv\"";
+ String bindyFixed = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Fixed\"";
+ String bindyKvp = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"KeyValue\"";
+
+ if ("bindy-csv".equals(name)) {
+ properties = properties.replace(bindy, bindyCsv);
+ } else if ("bindy-fixed".equals(name)) {
+ properties = properties.replace(bindy, bindyFixed);
+ } else if ("bindy-kvp".equals(name)) {
+ properties = properties.replace(bindy, bindyKvp);
+ }
+
+ return properties;
+ }
+
+ private static String prepareJsonProperties(String name, String properties) {
+ String json = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", \"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\"";
+ 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 jsonXStream = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", \"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"XStream\"";
+
+ if ("json-gson".equals(name)) {
+ properties = properties.replace(json, jsonGson);
+ } else if ("json-jackson".equals(name)) {
+ properties = properties.replace(json, jsonJackson);
+ } else if ("json-xstream".equals(name)) {
+ properties = properties.replace(json, jsonXStream);
+ }
+
+ return properties;
+ }
+
private static String readClassFromCamelResource(File file, StringBuilder buffer, BuildContext buildContext) throws MojoExecutionException {
// skip directories as there may be a sub .resolver directory
if (file.isDirectory()) {
[4/5] camel git commit: CAMEL-10062: For specialized Dataformats,
provide default value in catalog
Posted by da...@apache.org.
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);