Repository: incubator-usergrid Updated Branches: refs/heads/two-dot-o-dev 3f64b29a4 -> 30e0e45af
Fixes USERGRID-644 Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/30e0e45a Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/30e0e45a Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/30e0e45a Branch: refs/heads/two-dot-o-dev Commit: 30e0e45af0626083e90c2dc8dd267c9a4d198bad Parents: 3f64b29 Author: Todd Nine <[email protected]> Authored: Sun May 10 19:09:32 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Sun May 10 19:09:32 2015 -0600 ---------------------------------------------------------------------- .../org/apache/usergrid/persistence/graph/MarkedEdge.java | 8 +++++++- .../usergrid/persistence/graph/impl/SimpleMarkedEdge.java | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30e0e45a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/MarkedEdge.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/MarkedEdge.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/MarkedEdge.java index 0ab027c..4b5eeaa 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/MarkedEdge.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/MarkedEdge.java @@ -20,6 +20,12 @@ package org.apache.usergrid.persistence.graph; +import org.apache.usergrid.persistence.graph.impl.SimpleEdge; +import org.apache.usergrid.persistence.graph.impl.SimpleMarkedEdge; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + + /** * An edge. With the additional info of if it is marked for deletion * @@ -30,6 +36,6 @@ public interface MarkedEdge extends Edge{ * True if this edge is deleted, false otherwise * @return True if this version is marked as deleted */ - public boolean isDeleted(); + boolean isDeleted(); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/30e0e45a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/SimpleMarkedEdge.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/SimpleMarkedEdge.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/SimpleMarkedEdge.java index 9fcb816..29d90eb 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/SimpleMarkedEdge.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/SimpleMarkedEdge.java @@ -24,6 +24,8 @@ import org.apache.usergrid.persistence.graph.Edge; import org.apache.usergrid.persistence.graph.MarkedEdge; import org.apache.usergrid.persistence.model.entity.Id; +import com.fasterxml.jackson.annotation.JsonIgnore; + /** * Simple bean to represent our edge @@ -47,6 +49,7 @@ public class SimpleMarkedEdge extends SimpleEdge implements MarkedEdge { @Override + @JsonIgnore public boolean isDeleted() { return deleted; }
