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/09/14 14:38:11 UTC

[3/3] git commit: Remove unserializable interface EntityRef from PathQuery.

Remove unserializable interface EntityRef from PathQuery.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/47cda09d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/47cda09d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/47cda09d

Branch: refs/heads/two-dot-o
Commit: 47cda09de5716a015b40c47ede0b04093fead6ea
Parents: 927fcde
Author: Dave Johnson <dm...@apigee.com>
Authored: Sun Sep 14 08:37:55 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sun Sep 14 08:37:55 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/usergrid/persistence/PathQuery.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/47cda09d/stack/core/src/main/java/org/apache/usergrid/persistence/PathQuery.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/PathQuery.java b/stack/core/src/main/java/org/apache/usergrid/persistence/PathQuery.java
index 6a49f39..6d252fd 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/PathQuery.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/PathQuery.java
@@ -17,7 +17,6 @@
 package org.apache.usergrid.persistence;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.apache.usergrid.persistence.index.query.Query;
 import java.util.Iterator;
 import java.util.UUID;
@@ -27,7 +26,6 @@ import org.apache.usergrid.persistence.index.query.Query.Level;
 
 public class PathQuery<E> {
 
-    private  EntityRef head;
     private PathQuery source;
     private Query query;
     private UUID uuid;
@@ -46,7 +44,6 @@ public class PathQuery<E> {
     public PathQuery( EntityRef head ) {
         this.uuid = head.getUuid();
         this.type = head.getType();
-        this.head = head;
         this.query = null;
     }
 
@@ -63,7 +60,6 @@ public class PathQuery<E> {
         }
         this.uuid = head.getUuid();
         this.type = head.getType();
-        this.head = head;
         this.query = query;
     }
 
@@ -104,7 +100,7 @@ public class PathQuery<E> {
 
 
     protected Results getHeadResults( EntityManager em ) throws Exception {
-        EntityRef ref = head != null ? head : new SimpleEntityRef(type,uuid);
+        EntityRef ref = new SimpleEntityRef(type,uuid);
         return ( query.getCollection() != null ) ? 
                em.searchCollection( ref, query.getCollection(), query ) :
                em.searchConnectedEntities( ref, query );
@@ -131,8 +127,6 @@ public class PathQuery<E> {
     }
 
 
-
-
     public String getType(){return type;}
 
     public UUID getUuid(){return uuid;}