You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/06/20 17:33:54 UTC

tinkerpop git commit: minor simplifications.

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1278 0cdb3cce0 -> 63dd0c7d7


minor simplifications.


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

Branch: refs/heads/TINKERPOP-1278
Commit: 63dd0c7d7bc77a22a95271e5bddeba8ea2df21b0
Parents: 0cdb3cc
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jun 20 11:33:50 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jun 20 11:33:50 2016 -0600

----------------------------------------------------------------------
 .../tinkerpop/gremlin/groovy/GroovyTranslatorTest.java  |  5 ++---
 .../tinkerpop/gremlin/groovy/GroovyTranslator.java      | 10 +++-------
 .../tinkerpop/gremlin/python/PythonTranslator.java      | 12 ++++--------
 .../tinkerpop/gremlin/python/PythonTranslatorTest.java  |  4 ++--
 4 files changed, 11 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63dd0c7d/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslatorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslatorTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslatorTest.java
index c477257..6d1dafc 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslatorTest.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslatorTest.java
@@ -29,7 +29,6 @@ import org.apache.tinkerpop.gremlin.util.function.Lambda;
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -47,8 +46,8 @@ public class GroovyTranslatorTest extends AbstractGremlinTest {
         GraphTraversal.Admin<Vertex, Integer> t = g.withSideEffect("lengthSum", 0).withSack(1)
                 .V()
                 .filter(Lambda.predicate("it.get().label().equals('person')"))
-                .flatMap(Lambda.<Traverser<Vertex>, Iterator<Vertex>>function("it.get().vertices(Direction.OUT)"))
-                .map(Lambda.<Traverser<Vertex>, Integer>function("it.get().value('name').length()"))
+                .flatMap(Lambda.function("it.get().vertices(Direction.OUT)"))
+                .map(Lambda.<Traverser<Object>, Integer>function("it.get().value('name').length()"))
                 .sideEffect(Lambda.consumer("{ x -> x.sideEffects(\"lengthSum\", x.<Integer>sideEffects('lengthSum') + x.get()) }"))
                 .order().by(Lambda.comparator("a,b -> a <=> b"))
                 .sack(Lambda.biFunction("{ a,b -> a + b }"))

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63dd0c7d/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslator.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslator.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslator.java
index 8584067..e4b8f9c 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslator.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyTranslator.java
@@ -150,13 +150,9 @@ public final class GroovyTranslator implements Translator {
         } else if (object instanceof Lambda) {
             final String lambdaString = ((Lambda) object).getLambdaScript();
             return lambdaString.startsWith("{") ? lambdaString : "{" + lambdaString + "}";
-        } else if (object instanceof Traversal) {
-            final TranslationStrategy strategy = (TranslationStrategy) ((Traversal.Admin) object).getStrategies().toList()
-                    .stream()
-                    .filter(s -> s instanceof TranslationStrategy)
-                    .findFirst().get();
-            return strategy.getTranslator().getTraversalScript();
-        } else
+        } else if (object instanceof Traversal)
+            return ((Traversal) object).asAdmin().getStrategies().getStrategy(TranslationStrategy.class).get().getTranslator().getTraversalScript();
+        else
             return null == object ? "null" : object.toString();
     }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63dd0c7d/gremlin-variant/src/main/java/org/apache/tinkerpop/gremlin/python/PythonTranslator.java
----------------------------------------------------------------------
diff --git a/gremlin-variant/src/main/java/org/apache/tinkerpop/gremlin/python/PythonTranslator.java b/gremlin-variant/src/main/java/org/apache/tinkerpop/gremlin/python/PythonTranslator.java
index 79eee72..a2db887 100644
--- a/gremlin-variant/src/main/java/org/apache/tinkerpop/gremlin/python/PythonTranslator.java
+++ b/gremlin-variant/src/main/java/org/apache/tinkerpop/gremlin/python/PythonTranslator.java
@@ -179,17 +179,13 @@ public class PythonTranslator implements Translator {
             return convertPToString((P) object, new StringBuilder()).toString();
         else if (object instanceof Element)
             return convertToString(((Element) object).id()); // hack
-        else if (object instanceof Traversal) {
-            final TranslationStrategy strategy = (TranslationStrategy) ((Traversal.Admin) object).getStrategies().toList()
-                    .stream()
-                    .filter(s -> s instanceof TranslationStrategy)
-                    .findFirst().get();
-            return strategy.getTranslator().getTraversalScript();
-        } else if (object instanceof Computer) {
+        else if (object instanceof Traversal)
+            return ((Traversal) object).asAdmin().getStrategies().getStrategy(TranslationStrategy.class).get().getTranslator().getTraversalScript();
+        else if (object instanceof Computer) {
             return "";
         } else if (object instanceof Lambda) {
             final String lambdaString = ((Lambda) object).getLambdaScript();
-            return lambdaString.startsWith("lambda") ? "\"" + lambdaString + "\"" : "lambda: \"" + lambdaString + "\"";
+            return lambdaString.startsWith("lambda") ? lambdaString : "lambda: \"" + lambdaString + "\"";
         } else
             return null == object ? "" : object.toString();
     }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63dd0c7d/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/python/PythonTranslatorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/python/PythonTranslatorTest.java b/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/python/PythonTranslatorTest.java
index 27a43bd..3ebda0c 100644
--- a/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/python/PythonTranslatorTest.java
+++ b/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/python/PythonTranslatorTest.java
@@ -49,12 +49,12 @@ public class PythonTranslatorTest {
         final GraphTraversalSource g = TinkerFactory.createModern().traversal().withTranslator(PythonBypassTranslator.of("g",true));
         GraphTraversal.Admin<Vertex, Integer> t = g.withSideEffect("lengthSum", 0).withSack(1)
                 .V()
-                .filter(Lambda.predicate("it.get().label().equals('person')"))
+                .filter(Lambda.predicate("lambda: \"it.get().label().equals('person')\""))
                 .flatMap(Lambda.<Traverser<Vertex>, Iterator<Vertex>>function("it.get().vertices(Direction.OUT)"))
                 .map(Lambda.<Traverser<Vertex>, Integer>function("it.get().value('name').length()"))
                 .sideEffect(Lambda.consumer("x -> x.sideEffects('lengthSum', x.<Integer>sideEffects('lengthSum') + x.get())"))
                 .order().by(Lambda.comparator("a,b -> a <=> b"))
-                .sack(Lambda.biFunction("a,b -> a + b"))
+                .sack(Lambda.biFunction("lambda : \"a,b -> a + b\""))
                 .asAdmin();
         final List<Integer> sacks = new ArrayList<>();
         final List<Integer> lengths = new ArrayList<>();