usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [21/52] [abbrv] git commit: Fix JSON mapper to use same setup as we do in Collections module serializer.
Date Wed, 03 Sep 2014 22:11:16 GMT
Fix JSON mapper to use same setup as we do in Collections module serializer.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c6de8494
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c6de8494
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c6de8494

Branch: refs/heads/two-dot-o-push-notifications
Commit: c6de8494daf3ea7207b5ef8d6572acaa68026bd3
Parents: 9ddb537
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Fri Aug 29 09:32:27 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Fri Aug 29 09:32:27 2014 -0400

----------------------------------------------------------------------
 .../core/src/main/java/org/apache/usergrid/utils/JsonUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c6de8494/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
index 4f71c83..f81d6bf 100644
--- a/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
@@ -63,8 +63,8 @@ public class JsonUtils {
 
 
     static {
-        //indentObjectMapper.getSerializationConfig().set( Feature.INDENT_OUTPUT, true );
-        indentObjectMapper.getSerializationConfig().with( SerializationFeature.INDENT_OUTPUT
);
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+        mapper.enableDefaultTypingAsProperty(ObjectMapper.DefaultTyping.JAVA_LANG_OBJECT,
"@class");
     }
 
 


Mime
View raw message