You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/04/27 23:01:37 UTC
incubator-usergrid git commit: optional fields

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-dev 07e2a4145 -> 69610b053


optional 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/69610b05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/69610b05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/69610b05

Branch: refs/heads/two-dot-o-dev
Commit: 69610b053e04a3fd3f960d555831f56e7d9a1453
Parents: 07e2a41
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Apr 27 15:01:32 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Apr 27 15:01:32 2015 -0600

----------------------------------------------------------------------
 .../graph/serialization/impl/shard/DirectedEdgeMeta.java       | 2 +-
 .../persistence/graph/impl/stage/EdgeDeleteRepairTest.java     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/69610b05/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java
index 6bf6178..1d81d20 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java
@@ -337,7 +337,7 @@ public abstract class DirectedEdgeMeta {
                 final String targetType = types[1];
 
                 final SearchByIdType search =
-                        new SimpleSearchByIdType( sourceId, edgeType, maxValue, order, targetType,  null );
+                        new SimpleSearchByIdType( sourceId, edgeType, maxValue, order, targetType,  Optional.<Edge>absent() );
 
                 return serialization.getEdgesFromSourceByTargetType( edgeColumnFamilies, scope, search, shards );
             }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/69610b05/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java
index 238daa0..dcd7b25 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java
@@ -22,6 +22,8 @@ package org.apache.usergrid.persistence.graph.impl.stage;
 
 import java.util.Iterator;
 
+import com.google.common.base.Optional;
+import org.apache.usergrid.persistence.graph.Edge;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -133,7 +135,7 @@ public class EdgeDeleteRepairTest {
 
 
         Iterator<MarkedEdge> itr = storageEdgeSerialization.getEdgeVersions( scope,
-                new SimpleSearchByEdge( sourceId, edgeType, targetId, System.currentTimeMillis(), SearchByEdgeType.Order.DESCENDING, null ) );
+                new SimpleSearchByEdge( sourceId, edgeType, targetId, System.currentTimeMillis(), SearchByEdgeType.Order.DESCENDING, Optional.<Edge>absent() ) );
 
         assertEquals( edge2, itr.next() );
         assertEquals( edge1, itr.next() );
@@ -144,7 +146,7 @@ public class EdgeDeleteRepairTest {
         assertEquals( edge1, deleted );
 
         itr = storageEdgeSerialization.getEdgeVersions( scope,
-                new SimpleSearchByEdge( sourceId, edgeType, targetId, System.currentTimeMillis(), SearchByEdgeType.Order.DESCENDING,  null ) );
+                new SimpleSearchByEdge( sourceId, edgeType, targetId, System.currentTimeMillis(), SearchByEdgeType.Order.DESCENDING,  Optional.<Edge>absent() ) );
 
         assertEquals( edge2, itr.next() );
         assertFalse( itr.hasNext() );