You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/20 20:20:55 UTC
[02/10] git commit: Removed old unused jackson imports. Removed
indentObjectMapper from json utilities.
Removed old unused jackson imports.
Removed indentObjectMapper from json utilities.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a16e6e46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a16e6e46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a16e6e46
Branch: refs/pull/77/merge
Commit: a16e6e46a5bbd39ad612b88179f7a99bca3e6765
Parents: fcb6c9a
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 11:28:53 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 11:28:53 2014 -0700
----------------------------------------------------------------------
.../impl/MvccEntitySerializationStrategyImpl.java | 6 ------
.../src/main/java/org/apache/usergrid/utils/JsonUtils.java | 7 -------
2 files changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a16e6e46/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 42016b1..4acc3ee 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -67,12 +67,6 @@ import com.netflix.astyanax.serializers.ByteBufferSerializer;
import com.netflix.astyanax.serializers.BytesArraySerializer;
import com.netflix.astyanax.serializers.UUIDSerializer;
-//import org.codehaus.jackson.JsonGenerationException;
-//import org.codehaus.jackson.map.JsonMappingException;
-//import org.codehaus.jackson.map.ObjectMapper;
-//import org.codehaus.jackson.smile.SmileFactory;
-
-
/**
* @author tnine
*/
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a16e6e46/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
index 91bf3bb..5b5e2a5 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/utils/JsonUtils.java
@@ -33,7 +33,6 @@ import org.apache.usergrid.persistence.exceptions.JsonWriteException;
import com.fasterxml.jackson.core.io.JsonStringEncoder;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
//import org.apache.usergrid.persistence.Entity;
@@ -57,12 +56,6 @@ public class JsonUtils {
private static ObjectMapper indentObjectMapper = new ObjectMapper();
-
- static {
- indentObjectMapper.getSerializationConfig().with( SerializationFeature.INDENT_OUTPUT );//set( SerializationConfig.Feature.INDENT_OUTPUT, true );
- }
-
-
/** Converts object to JSON string, throws runtime exception JsonWriteException on failure. */
public static String mapToJsonString( Object obj ) {
try {