Visitar URL original
Removed recent merge waiting to resolve the issue from the Gremlin side · ArcadeData/arcadedb@4126064 · GitHub
Skip to content

Commit 4126064

Browse files
lvcalvca
committed
Removed recent merge waiting to resolve the issue from the Gremlin side
See #1239 (comment)
1 parent 0d4cd89 commit 4126064

7 files changed

Lines changed: 4 additions & 187 deletions

File tree

‎engine/src/main/java/com/arcadedb/GlobalConfiguration.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,6 @@ public Object call(final Object value) {
214214
"Gremlin engine to use. By default the `auto` setting uses the legacy `groovy` engine in case parameters are set, otherwise, the new native `java` is preferred. If you have compatibility issues with gremlin statements that use lambdas or in general, switch to the `groovy` one",
215215
String.class, "auto", Set.of("auto", "groovy", "java")),
216216

217-
GREMLIN_TRAVERSAL_BINDINGS("arcadedb.gremlin.traversalbindings", SCOPE.DATABASE,
218-
"Additional Gremlin traversal sources to bind into the `GremlinScriptEngine`, expected to be of the shape `Map<String, ArcadeTraversalBinder.TraversalSupplier>`.",
219-
Map.class, Map.of()),
220-
221217
/**
222218
* Not in use anymore after removing Gremlin Executor
223219
*/

‎gremlin/pom.xml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@
9999
<version>${gremlin.version}</version>
100100
<scope>test</scope>
101101
</dependency>
102-
<dependency>
103-
<groupId>org.apache.tinkerpop</groupId>
104-
<artifactId>gremlin-annotations</artifactId>
105-
<version>${gremlin.version}</version>
106-
<scope>test</scope>
107-
</dependency>
108102
<dependency>
109103
<groupId>org.junit.vintage</groupId>
110104
<artifactId>junit-vintage-engine</artifactId>
@@ -126,24 +120,6 @@
126120
<!-- </execution>-->
127121
<!-- </executions>-->
128122
<!-- </plugin>-->
129-
<plugin>
130-
<groupId>org.apache.maven.plugins</groupId>
131-
<artifactId>maven-compiler-plugin</artifactId>
132-
<version>${maven-compiler-plugin.version}</version>
133-
<configuration>
134-
<annotationProcessorPaths>
135-
<annotationProcessorPath>
136-
<groupId>org.apache.tinkerpop</groupId>
137-
<artifactId>gremlin-annotations</artifactId>
138-
<version>${gremlin.version}</version>
139-
</annotationProcessorPath>
140-
</annotationProcessorPaths>
141-
<annotationProcessors>
142-
<annotationProcessor>org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDslProcessor</annotationProcessor>
143-
</annotationProcessors>
144-
</configuration>
145-
</plugin>
146-
147123
<plugin>
148124
<groupId>org.apache.maven.plugins</groupId>
149125
<artifactId>maven-shade-plugin</artifactId>

‎gremlin/src/main/java/com/arcadedb/gremlin/ArcadeGraph.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -460,19 +460,13 @@ private void init() {
460460
importPlugin.classImports(Math.class, CustomFunctions.class, CustomPredicate.class);
461461
importPlugin.methodImports(List.of("java.lang.Math#*", "org.opencypher.gremlin.traversal.CustomFunctions#*"));
462462

463-
final ArcadeTraversalBinder traversalBinder = new ArcadeTraversalBinder(this);
464-
465463
// INITIALIZE JAVA ENGINE
466464
gremlinJavaEngine = new GremlinLangScriptEngine(importPlugin.create().getCustomizers().get());
467465
gremlinJavaEngine.getFactory().setCustomizerManager(new DefaultGremlinScriptEngineManager());
468-
gremlinJavaEngine.put("g", traversal());
469-
traversalBinder.bind(gremlinJavaEngine);
470466

471467
// INITIALIZE GROOVY ENGINE
472468
gremlinGroovyEngine = new GremlinGroovyScriptEngine(importPlugin.create().getCustomizers().get());
473469
gremlinGroovyEngine.getFactory().setCustomizerManager(new DefaultGremlinScriptEngineManager());
474-
gremlinGroovyEngine.put("g", traversal());
475-
traversalBinder.bind(gremlinGroovyEngine);
476470

477471
serviceRegistry = new ArcadeServiceRegistry(this);
478472
serviceRegistry.registerService(new VectorNeighborsFactory(this));

‎gremlin/src/main/java/com/arcadedb/gremlin/ArcadeGremlin.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@
3838
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
3939
import org.apache.tinkerpop.gremlin.process.traversal.step.Mutating;
4040

41+
import javax.script.ScriptException;
42+
import javax.script.SimpleBindings;
4143
import java.util.*;
4244
import java.util.concurrent.*;
4345
import java.util.logging.*;
44-
import javax.script.ScriptContext;
45-
import javax.script.ScriptException;
46-
import javax.script.SimpleBindings;
4746

4847
/**
4948
* Gremlin Expression builder.
@@ -208,8 +207,7 @@ private Iterator executeStatement(final String gremlinEngine) throws ScriptExcep
208207
final GremlinLangScriptEngine gremlinEngineImpl = graph.getGremlinJavaEngine();
209208

210209
final SimpleBindings bindings = new SimpleBindings();
211-
bindings.putAll(gremlinEngineImpl.getBindings(ScriptContext.ENGINE_SCOPE));
212-
210+
bindings.put("g", graph.traversal());
213211
if (parameters != null)
214212
bindings.putAll(parameters);
215213
result = gremlinEngineImpl.eval(query, bindings);
@@ -219,8 +217,7 @@ private Iterator executeStatement(final String gremlinEngine) throws ScriptExcep
219217
final GremlinGroovyScriptEngine gremlinEngineImpl = graph.getGremlinGroovyEngine();
220218

221219
final SimpleBindings bindings = new SimpleBindings();
222-
bindings.putAll(gremlinEngineImpl.getBindings(ScriptContext.ENGINE_SCOPE));
223-
220+
bindings.put("g", graph.traversal());
224221
if (parameters != null)
225222
bindings.putAll(parameters);
226223
result = gremlinEngineImpl.eval(query, bindings);

‎gremlin/src/main/java/com/arcadedb/gremlin/ArcadeTraversalBinder.java‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎gremlin/src/test/java/com/arcadedb/gremlin/GremlinTest.java‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*/
2121
package com.arcadedb.gremlin;
2222

23-
import com.arcadedb.GlobalConfiguration;
2423
import com.arcadedb.database.Database;
2524
import com.arcadedb.database.DatabaseFactory;
2625
import com.arcadedb.database.EmbeddedDocument;
@@ -468,49 +467,9 @@ public void testGroupBy() {
468467
}
469468
}
470469

471-
@Test
472-
public void testTraversalBinding() {
473-
GlobalConfiguration.GREMLIN_TRAVERSAL_BINDINGS.setValue(
474-
Map.of(
475-
"friends",
476-
ArcadeTraversalBinder.TraversalSupplier.of(SocialTraversalSource.class)));
477-
478-
final ArcadeGraph graph = ArcadeGraph.open("./target/testTraversalBindings");
479-
try {
480-
graph.getDatabase().getSchema().getOrCreateVertexType("Person");
481-
graph.getDatabase().getSchema().getOrCreateEdgeType("FriendOf");
482-
483-
final Vertex alice = graph.addVertex(T.label, "Person", "name", "Alice");
484-
final Vertex bob = graph.addVertex(T.label, "Person", "name", "Bob");
485-
alice.addEdge("FriendOf", bob);
486-
487-
ResultSet resultSet = graph.gremlin("friends.V().person('Alice').friendOf('Bob')").execute();
488-
Result result = resultSet.nextIfAvailable();
489-
Assertions.assertEquals(result.getProperty("name"), "Bob");
490-
} finally {
491-
graph.drop();
492-
}
493-
}
494-
495-
@Test
496-
public void testTraversalBindingInvalidEntries() {
497-
List<Map<?, ?>> invalidBindingMaps = List.of(
498-
// asserts illegal binding value
499-
Map.of("binding", "not a traversal supplier"),
500-
// asserts illegal binding key
501-
Map.of(42, ArcadeTraversalBinder.TraversalSupplier.of(SocialTraversalSource.class)));
502-
503-
invalidBindingMaps.forEach(map -> {
504-
GlobalConfiguration.GREMLIN_TRAVERSAL_BINDINGS.setValue(map);
505-
Assertions.assertThrows(ArcadeTraversalBinder.IllegalTraversalBindingsEntry.class,
506-
() -> ArcadeGraph.open("./target/testInvalidTraversalBindings"));
507-
});
508-
}
509-
510470
@BeforeEach
511471
@AfterEach
512472
public void clean() {
513473
FileUtils.deleteRecursively(new File("./target/testgremlin"));
514-
GlobalConfiguration.resetAll();
515474
}
516475
}

‎gremlin/src/test/java/com/arcadedb/gremlin/SocialTraversalDsl.java‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)