You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by an...@apache.org on 2016/06/18 18:57:30 UTC
camel git commit: CS fixes
Repository: camel
Updated Branches:
refs/heads/master a7f07849d -> 26355f7ae
CS fixes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/26355f7a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/26355f7a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/26355f7a
Branch: refs/heads/master
Commit: 26355f7ae105a9e27179f9e2a6c01894a8ea373a
Parents: a7f0784
Author: Arno Noordover <an...@users.noreply.github.com>
Authored: Sat Jun 18 20:57:13 2016 +0200
Committer: Arno Noordover <an...@users.noreply.github.com>
Committed: Sat Jun 18 20:57:13 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/model/dataformat/JsonDataFormat.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/26355f7a/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 d28c423..6521c7c 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
@@ -315,10 +315,10 @@ public class JsonDataFormat extends DataFormatDefinition {
setProperty(routeContext.getCamelContext(), this, "dataFormatName", "json-xstream");
} else if (library == JsonLibrary.Jackson) {
setProperty(routeContext.getCamelContext(), this, "dataFormatName", "json-jackson");
- } else if (library == JsonLibrary.Gson){
+ } else if (library == JsonLibrary.Gson) {
setProperty(routeContext.getCamelContext(), this, "dataFormatName", "json-gson");
} else {
- setProperty(routeContext.getCamelContext(), this, "dataFormatName", "json-johnzon");
+ setProperty(routeContext.getCamelContext(), this, "dataFormatName", "json-johnzon");
}
if (unmarshalType == null && unmarshalTypeName != null) {