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 2015/03/10 18:24:21 UTC
incubator-tinkerpop git commit: Sugar messed up.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/newapi a589160a2 -> 221fe0559
Sugar messed up.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/221fe055
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/221fe055
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/221fe055
Branch: refs/heads/newapi
Commit: 221fe0559aa388e50990f18117b09d3e7c119a8f
Parents: a589160
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Mar 10 11:24:18 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Mar 10 11:24:18 2015 -0600
----------------------------------------------------------------------
.../gremlin/groovy/loaders/GremlinLoader.groovy | 38 --------------------
.../gremlin/groovy/loaders/SugarLoader.groovy | 23 ++++++------
.../apache/tinkerpop/gremlin/GraphProvider.java | 1 +
.../TinkerGraphGroovyProcessComputerTest.java | 4 ---
4 files changed, 14 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/221fe055/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy
index c485481..758768e 100644
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy
+++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/GremlinLoader.groovy
@@ -17,52 +17,14 @@
* under the License.
*/
package org.apache.tinkerpop.gremlin.groovy.loaders
-
-import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine
-import org.apache.tinkerpop.gremlin.process.Step
-import org.apache.tinkerpop.gremlin.process.Traversal
-import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal
-import org.apache.tinkerpop.gremlin.structure.Edge
-import org.apache.tinkerpop.gremlin.structure.Element
-import org.apache.tinkerpop.gremlin.structure.Graph
-import org.apache.tinkerpop.gremlin.structure.Vertex
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
class GremlinLoader {
- private static final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine()
- private static final Set<String> steps = new HashSet<String>()
- static {
- [GraphTraversal, Graph, Vertex, Edge, Element].forEach {
- it.getMethods().findAll {
- Traversal.class.isAssignableFrom(it.getReturnType());
- }.each {
- addStep(it.getName())
- }
- }
- }
-
public static void load() {
ObjectLoader.load()
StepLoader.load()
}
-
- public static Step compile(final String script) {
- return (Step) engine.eval(script, engine.createBindings())
- }
-
- public static void addStep(final String stepName) {
- steps.add(stepName)
- }
-
- public static boolean isStep(final String stepName) {
- return steps.contains(stepName)
- }
-
- public static Set<String> getStepNames() {
- return new HashSet(steps)
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/221fe055/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy
index b2cf571..198dc99 100644
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy
+++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.groovy.loaders
import org.apache.tinkerpop.gremlin.process.Traversal
import org.apache.tinkerpop.gremlin.process.Traverser
import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal
+import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversalContext
import org.apache.tinkerpop.gremlin.process.graph.traversal.__
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper
import org.apache.tinkerpop.gremlin.structure.*
@@ -55,6 +56,7 @@ class SugarLoader {
else
return ((GraphTraversal) delegate).values(name);
}
+
// __.age and __.out
__.metaClass.static.propertyMissing = { final String name ->
return null != __.metaClass.getMetaMethod(name) ? __."$name"() : __.values(name);
@@ -72,14 +74,14 @@ class SugarLoader {
}*/
// select x,y from ...
- Object.metaClass.methodMissing = { final String name, final def args ->
+ /*Object.metaClass.methodMissing = { final String name, final def args ->
if (name.toLowerCase().equals(SELECT)) return __.select(*args)
throw new MissingMethodException(name, delegate.getClass(), args);
- }
+ }*/
Traverser.metaClass.mixin(TraverserCategory.class);
+ GraphTraversalContext.metaClass.mixin(GraphTraversalContextCategory.class);
GraphTraversal.metaClass.mixin(GraphTraversalCategory.class);
- Graph.metaClass.mixin(GraphCategory.class);
Vertex.metaClass.mixin(VertexCategory.class);
Edge.metaClass.mixin(ElementCategory.class);
VertexProperty.metaClass.mixin(ElementCategory.class);
@@ -142,22 +144,23 @@ class SugarLoader {
}
}
- public static class GraphCategory {
+ public static class GraphTraversalContextCategory {
+
private static final String V = "V";
private static final String E = "E";
- public static final get(final Graph graph, final String key) {
+ public static final get(final GraphTraversalContext graphTraversalContext, final String key) {
if (key.equals(V))
- return graph.V();
+ return graphTraversalContext.V();
else if (key.equals(E))
- return graph.E();
+ return graphTraversalContext.E();
else
- return graph."$key";
+ throw new UnsupportedOperationException("The provided key does not reference a known method: " + key);
}
- public String toString() {
+ /*public String toString() {
return StringFactory.graphString(this.metaClass.owner, "");
- }
+ }*/
}
public static class GraphTraversalCategory {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/221fe055/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 a839359..465ebc1 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
@@ -69,6 +69,7 @@ public interface GraphProvider {
public static final Set<Class> CORE_IMPLEMENTATIONS = new HashSet<Class>() {{
add(__.class);
add(DefaultGraphTraversal.class);
+ add(GraphTraversalContext.class);
add(B_O_PA_S_SE_SL_Traverser.class);
add(B_O_P_PA_S_SE_SL_Traverser.class);
add(B_O_Traverser.class);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/221fe055/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java
index a3eef7d..8477ec9 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/TinkerGraphGroovyProcessComputerTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.tinkergraph.process.groovy;
-import org.apache.tinkerpop.gremlin.groovy.loaders.SugarLoader;
import org.apache.tinkerpop.gremlin.process.GroovyProcessComputerSuite;
import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
import org.apache.tinkerpop.gremlin.tinkergraph.process.TinkerGraphComputerProvider;
@@ -31,7 +30,4 @@ import org.junit.runner.RunWith;
@RunWith(GroovyProcessComputerSuite.class)
@ProcessStandardSuite.GraphProviderClass(provider = TinkerGraphComputerProvider.class, graph = TinkerGraph.class)
public class TinkerGraphGroovyProcessComputerTest {
- static {
- SugarLoader.load();
- }
}