You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/29 22:16:21 UTC
incubator-usergrid git commit: fix type issues with old serialization
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev a0546ce88 -> 11cc3c197
fix type issues with old serialization
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/11cc3c19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/11cc3c19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/11cc3c19
Branch: refs/heads/two-dot-o-dev
Commit: 11cc3c197279201bcc5a7bcc90639d81a6317600
Parents: a0546ce
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Jun 29 14:16:16 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Jun 29 14:16:16 2015 -0600
----------------------------------------------------------------------
.../impl/MvccEntitySerializationStrategyV2Impl.java | 12 +++++++++---
.../usergrid/persistence/model/field/ListField.java | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/11cc3c19/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java
index f679185..e81baab 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java
@@ -23,6 +23,8 @@ package org.apache.usergrid.persistence.collection.serialization.impl;
import java.nio.ByteBuffer;
import java.util.UUID;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.module.SimpleModule;
import org.apache.usergrid.persistence.collection.MvccEntity;
import org.apache.usergrid.persistence.collection.exception.DataCorruptionException;
import org.apache.usergrid.persistence.collection.exception.EntityTooLargeException;
@@ -47,6 +49,9 @@ import com.google.inject.Singleton;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.serializers.AbstractSerializer;
import com.netflix.astyanax.serializers.UUIDSerializer;
+import org.apache.usergrid.persistence.model.field.ArrayField;
+import org.apache.usergrid.persistence.model.field.ListField;
+import org.codehaus.jackson.map.deser.CustomDeserializerFactory;
/**
@@ -118,10 +123,11 @@ public class MvccEntitySerializationStrategyV2Impl extends MvccEntitySerializati
private byte VERSION = 1;
- public EntitySerializer( final SerializationFig serializationFig ) {
+ public EntitySerializer( final SerializationFig serializationFig) {
this.serializationFig = serializationFig;
-
- // mapper.enable(SerializationFeature.INDENT_OUTPUT); don't indent output,
+// SimpleModule listModule = new SimpleModule("ListFieldModule", new Version(1, 0, 0, null,null,null))
+// .addAbstractTypeMapping(ListField.class, ArrayField.class);
+// MAPPER.registerModule(listModule);
// causes slowness
MAPPER.enableDefaultTypingAsProperty( ObjectMapper.DefaultTyping.JAVA_LANG_OBJECT, "@class" );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/11cc3c19/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java
index eb0f72f..5ec4237 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java
@@ -25,7 +25,7 @@ import java.util.List;
* An object field that represents a list of objects. This can also be used to represent arrays
* @param <T> Type of entity in list, must be primitive or Entity.
*/
-public abstract class ListField<T> extends AbstractField<List<T>> {
+public class ListField<T> extends AbstractField<List<T>> {
/**
* Constructor that initializes with an empty set for adding to later