camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-10042: camel-spring-boot - Add default values to auto configuration
Date Sat, 11 Jun 2016 08:04:32 GMT
Repository: camel
Updated Branches:
  refs/heads/master 92f1eda2c -> 3f408a8d8


CAMEL-10042: camel-spring-boot - Add default values to auto configuration


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3f408a8d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3f408a8d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3f408a8d

Branch: refs/heads/master
Commit: 3f408a8d84b6b2b29a4c1cd26e9d1e06c32047e5
Parents: 92f1eda
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Jun 11 10:04:27 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Jun 11 10:04:27 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/model/dataformat/JsonDataFormat.java     | 2 --
 .../component/gson/springboot/GsonDataFormatConfiguration.java     | 2 +-
 .../jackson/springboot/JacksonDataFormatConfiguration.java         | 2 +-
 .../dataformat/xstream/springboot/JsonDataFormatConfiguration.java | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3f408a8d/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..e64f9e7 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
@@ -134,8 +134,6 @@ public class JsonDataFormat extends DataFormatDefinition {
 
     /**
      * Which json library to use such.
-     * <p/>
-     * Is by default xstream
      */
     public void setLibrary(JsonLibrary library) {
         this.library = library;

http://git-wip-us.apache.org/repos/asf/camel/blob/3f408a8d/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 6954605..714dcc3 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. Is by default xstream
+     * Which json library to use such.
      */
     private JsonLibrary library = JsonLibrary.Gson;
     /**

http://git-wip-us.apache.org/repos/asf/camel/blob/3f408a8d/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 0aa5b48..2647c75 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. Is by default xstream
+     * Which json library to use such.
      */
     private JsonLibrary library = JsonLibrary.Jackson;
     /**

http://git-wip-us.apache.org/repos/asf/camel/blob/3f408a8d/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 143b35b..f9269a0 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. Is by default xstream
+     * Which json library to use such.
      */
     private JsonLibrary library = JsonLibrary.XStream;
     /**


Mime
View raw message