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/08/09 20:21:39 UTC
tinkerpop git commit: dah. missed a spot where we went from public to
private on JavaTranslator constructor.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 5e2aade83 -> 4d514e0f3
dah. missed a spot where we went from public to private on JavaTranslator constructor.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4d514e0f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4d514e0f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4d514e0f
Branch: refs/heads/TINKERPOP-1278
Commit: 4d514e0f366a67f633ef67c6ed8de3ed3f957329
Parents: 5e2aade
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Aug 9 14:21:29 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Aug 9 14:21:29 2016 -0600
----------------------------------------------------------------------
.../remote/traversal/strategy/decoration/RemoteStrategy.java | 2 +-
.../tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java | 4 ++--
.../gremlin/tinkergraph/structure/TinkerGraphPlayTest.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d514e0f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java
index 92f3f75..79e700b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java
@@ -70,7 +70,7 @@ public final class RemoteStrategy extends AbstractTraversalStrategy<TraversalStr
if (Boolean.valueOf(System.getProperty("is.testing", "false")) &&
(TraversalHelper.hasStepOfAssignableClassRecursively(ProfileSideEffectStep.class, traversal) ||
traversal.getBytecode().toString().contains("$"))) {
- throw new VerificationException("RemoteGraph does not support profiling nor lambdas", traversal);
+ throw new VerificationException("Test suite does not support profiling nor lambdas", traversal);
}
if (!(traversal.getGraph().orElse(EmptyGraph.instance()) instanceof RemoteGraph))
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d514e0f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
index ff766c9..43f3828 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
@@ -53,7 +53,7 @@ public final class BytecodeHelper {
if (object instanceof Lambda)
return Optional.of(((Lambda) object).getLambdaLanguage());
else if (object instanceof Bytecode) {
- Optional<String> temp = BytecodeHelper.getLambdaLanguage((Bytecode) object);
+ final Optional<String> temp = BytecodeHelper.getLambdaLanguage((Bytecode) object);
if (temp.isPresent())
return temp;
}
@@ -64,7 +64,7 @@ public final class BytecodeHelper {
if (object instanceof Lambda)
return Optional.of(((Lambda) object).getLambdaLanguage());
else if (object instanceof Bytecode) {
- Optional<String> temp = BytecodeHelper.getLambdaLanguage((Bytecode) object);
+ final Optional<String> temp = BytecodeHelper.getLambdaLanguage((Bytecode) object);
if (temp.isPresent())
return temp;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d514e0f/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index da3409b..9f2b12a 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
import org.apache.tinkerpop.gremlin.process.computer.Computer;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Operator;
@@ -28,7 +29,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -83,7 +83,7 @@ public class TinkerGraphPlayTest {
//
System.out.println("GRAPHSON BYTECODE: \n " + new String(outputStream.toByteArray()) + "\n");
//
- Traversal<?, ?> traversal2 = new JavaTranslator(graph.traversal(), __.class).translate(GraphSONReader.build().create().readObject(new ByteArrayInputStream(outputStream.toByteArray()), Bytecode.class));
+ Traversal<?, ?> traversal2 = JavaTranslator.of(graph.traversal()).translate(GraphSONReader.build().create().readObject(new ByteArrayInputStream(outputStream.toByteArray()), Bytecode.class));
Bytecode bytecode2 = traversal2.asAdmin().getBytecode();
System.out.println("BYTECODE 2: \n " + bytecode2 + "\n");
assert traversal1.equals(traversal2);