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 19:21:35 UTC
[29/38] git commit: Removed extra commented out code. Forced
EntityObject to ignore all unknown properties to fix tests and to make sure
it only deals with fields. Entity now gets the version for fields.
Removed extra commented out code.
Forced EntityObject to ignore all unknown properties to fix tests and to make sure it only deals with fields.
Entity now gets the version for fields.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f2d3bbd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f2d3bbd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f2d3bbd0
Branch: refs/pull/77/merge
Commit: f2d3bbd0dc145ec049702060f7d3bc60c8282bf2
Parents: 9cc4704
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 10:11:18 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 10:11:18 2014 -0700
----------------------------------------------------------------------
.../serialization/impl/MvccEntitySerializationStrategyImpl.java | 3 ---
.../java/org/apache/usergrid/persistence/model/entity/Entity.java | 3 ---
.../usergrid/persistence/model/field/value/EntityObject.java | 2 ++
.../apache/usergrid/persistence/model/field/value/Location.java | 1 -
4 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f2d3bbd0/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 c348c16..42016b1 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
@@ -298,7 +298,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
//the marker for when we're passed a "null" value
private static final byte[] EMPTY = new byte[] { 0x0 };
- String helper;
//TODO:Make sure your exceptions provide descriptive error messages.
@Override
@@ -310,7 +309,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
CompositeBuilder builder = Composites.newCompositeBuilder();
builder.addBytes( VERSION );
- //mapper.enableDefaultTyping();
//mark this version as empty
if ( !wrapper.entity.isPresent() ) {
//we're empty
@@ -373,7 +371,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
byte[] array = jsonBytes.array();
int start = jsonBytes.arrayOffset();
int length = jsonBytes.remaining();
- //Object derp = mapper.readValue( array,start,length,Object.class);
storedEntity = mapper.readValue( array,start,length,Entity.class);
}
catch ( IOException e ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f2d3bbd0/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
index 8659a7c..0bbf48c 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/Entity.java
@@ -26,7 +26,6 @@ import org.apache.usergrid.persistence.model.field.value.EntityObject;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Preconditions;
-//import org.codehaus.jackson.annotate.JsonIgnore;
/**
@@ -81,12 +80,10 @@ public class Entity extends EntityObject {
return id;
}
-
public UUID getVersion() {
return version;
}
-
/**
* Equality is based both on id and version. If an entity
* has the same id but different versions, they are not equals
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f2d3bbd0/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
index 2a48d54..4cc560a 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java
@@ -29,11 +29,13 @@ import org.apache.usergrid.persistence.model.field.Field;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
/**
* Simple wrapper for holding nested objects
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class EntityObject implements Serializable {
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f2d3bbd0/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
index 82e7c3e..d18df09 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/Location.java
@@ -27,7 +27,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Geographic point. Should be used when we want to store geo information
*/
-//@JsonTypeInfo( use= JsonTypeInfo.Id.CLASS,include= JsonTypeInfo.As.WRAPPER_OBJECT,property="@class" )
public class Location implements Serializable {
private double latitude;