Use Jackson JsonNode as the unified representation of json data

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1181240 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 5 deletions

diff --git a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
index 38b826b202..2b77054934 100644
--- a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
+++ b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
@@ -58,14 +58,13 @@ public class Object2JSON implements PullTransformer<Object, Object> {
             }
             ObjectMapper mapper = JacksonHelper.createObjectMapper(targetType);
             String value = mapper.writeValueAsString(source);
-            if (targetType == String.class || targetType == Object.class || targetType.isPrimitive()) {
+            if (JsonNode.class.isAssignableFrom(targetType)) {
+                return JacksonHelper.createJsonParser(value).readValueAsTree();
+            } else if (targetType == String.class || targetType == Object.class || targetType.isPrimitive()) {
                 return value;
             } else if (targetType == BigDecimal.class) {
                 return value.toString();
-            } else if (JsonNode.class.isAssignableFrom(targetType)) {
-                return JacksonHelper.createJsonParser(value).readValueAsTree();
-            }
-            if (JsonParser.class.isAssignableFrom(targetType)) {
+            } else if (JsonParser.class.isAssignableFrom(targetType)) {
                 return JacksonHelper.createJsonParser(value);
             } else {
                 return JSONHelper.toJSON(value, targetType);