You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/06/16 18:11:47 UTC
[08/10] incubator-usergrid git commit: remove clear field for one case
remove clear field for one case
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d4688469
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d4688469
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d4688469
Branch: refs/heads/two-dot-o-dev
Commit: d46884696cd7a7b32588abc5cafa0bfd61081824
Parents: 9c89f2c
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Jun 16 06:56:06 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Jun 16 06:56:06 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/persistence/model/entity/EntityMap.java | 2 ++
.../persistence/model/entity/MapToEntityConverter.java | 8 +++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d4688469/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java
index f65ce0b..576987f 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityMap.java
@@ -23,12 +23,14 @@ public class EntityMap extends HashMap<String,Object> {
super();
}
+
public EntityMap(Id id,UUID version){
super();
setId(id);
setVersion( version );
}
+
@JsonIgnore
public Id getId(){
return containsKey(ID_KEY) ? new SimpleId((UUID)get(ID_KEY), (String)get(TYPE_KEY)):null;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d4688469/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
index a40023a..56e156f 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverter.java
@@ -20,7 +20,6 @@ public class MapToEntityConverter{
EntityMap entityMap = (EntityMap) map;
Id id = entityMap.getId();
UUID version = entityMap.getVersion();
- entityMap.clearFields();
entity = id!=null ? new Entity(id,version) : new Entity();
}else{
entity = new Entity();
@@ -33,6 +32,9 @@ public class MapToEntityConverter{
for ( String fieldName : map.keySet() ) {
+ if(isReservedField(fieldName)){
+ continue;
+ }
Object value = map.get(fieldName);
if ( value instanceof String ) {
@@ -85,6 +87,10 @@ public class MapToEntityConverter{
return entity;
}
+ private boolean isReservedField(String fieldName) {
+ return fieldName.equals(EntityMap.ID_KEY) || fieldName.equals(EntityMap.TYPE_KEY) || fieldName.equals(EntityMap.VERSION_KEY);
+ }
+
private ListField listToListField( String fieldName, List list ) {
if (list.isEmpty()) {