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/09/11 03:28:15 UTC
[44/50] usergrid git commit: add map for bad types
add map for bad types
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/929528a6
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/929528a6
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/929528a6
Branch: refs/heads/USERGRID-909
Commit: 929528a62e8db04e74687db30b7e4887b1038476
Parents: 0b78668
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Sep 10 09:38:27 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Sep 10 09:38:27 2015 -0600
----------------------------------------------------------------------
.../persistence/model/entity/EntityToMapConverter.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/929528a6/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityToMapConverter.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityToMapConverter.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityToMapConverter.java
index fc3f0ab..b9f637a 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityToMapConverter.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/EntityToMapConverter.java
@@ -38,6 +38,7 @@ public class EntityToMapConverter {
public static final String LON = "longitude";
private final JsonFactory jsonFactory = new JsonFactory();
private final ObjectMapper objectMapper = new ObjectMapper(jsonFactory).registerModule(new GuavaModule());
+ private static final Map<String,Boolean> corruptedTypes = getCorruptedTypes();
/**
* Convert Entity to Map, adding version_ug_field and a {name}_ug_analyzed field for each StringField.
@@ -50,8 +51,6 @@ public class EntityToMapConverter {
* @param entityObject
* @return
*/
-
-
public EntityMap toMap( EntityObject entityObject ) {
EntityMap map = new EntityMap();
return toMap(entityObject, map);
@@ -79,7 +78,7 @@ public class EntityToMapConverter {
else if ( field instanceof ByteArrayField ) {
ByteArrayField bf = ( ByteArrayField ) field;
- if( bf.getClassinfo().getName().contains("org.apache.usergrid.persistence.PathQuery") ){
+ if( corruptedTypes.containsKey(bf.getClassinfo().getName()) ){
//do not deserialize this contains Query and Query has changed
continue;
}
@@ -143,7 +142,7 @@ public class EntityToMapConverter {
private Object processCollectionElement( final Object element ) {
if ( element instanceof EntityObject ) {
- return toMap( ( EntityObject ) element );
+ return toMap((EntityObject) element);
}
//recurse into another list structure (2d + arrays)
@@ -158,4 +157,10 @@ public class EntityToMapConverter {
return element;
}
+
+ public static Map<String,Boolean> getCorruptedTypes() {
+ Map<String,Boolean> typeMap = new HashMap<>() ;
+ typeMap.put("org.apache.usergrid.persistence.PathQuery",true);
+ return typeMap;
+ }
}