You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/13 19:22:23 UTC

[02/43] incubator-tinkerpop git commit: Removed feature check for numeric ids because convertId was being called.

Removed feature check for numeric ids because convertId was being called.

convertId ensures that a graph will convert the identifier to something the Graph can support so a check on the type is not relevant.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/021fa748
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/021fa748
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/021fa748

Branch: refs/heads/master
Commit: 021fa748e76588c0be6e5e0182d01ebf11856086
Parents: 339f6ce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 8 08:46:07 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 8 08:46:07 2015 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/tinkerpop/gremlin/GraphProvider.java    | 4 +++-
 .../java/org/apache/tinkerpop/gremlin/structure/VertexTest.java  | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/021fa748/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
index d6e5bb3..da355b9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
@@ -154,7 +154,9 @@ public interface GraphProvider {
 
     /**
      * Converts an identifier from a test to an identifier accepted by the Graph instance.  Test that try to
-     * utilize an Element identifier will pass it to this method before usage.
+     * utilize an Element identifier will pass it to this method before usage.  This method should be sure to
+     * consistent in the return value such that calling it with "x" should always return the same transformed
+     * value.
      */
     default public Object convertId(final Object id) {
         return id;

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/021fa748/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
index cafcbbd..7821601 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
@@ -150,7 +150,6 @@ public class VertexTest {
         @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
         @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
         @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_USER_SUPPLIED_IDS)
-        @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_NUMERIC_IDS)
         public void shouldHaveExceptionConsistencyWhenAssigningSameIdOnEdge() {
             final Vertex v = graph.addVertex();
             final Object o = GraphManager.getGraphProvider().convertId("1");