Skip to content

Commit 10468d9

Browse files
authored
updated tinkerpop version to 3.8.0 (#24)
1 parent 36c9b91 commit 10468d9

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.apache.tinkerpop</groupId>
99
<artifactId>tinkerpop</artifactId>
10-
<version>3.7.5</version>
10+
<version>3.8.0</version>
1111
</parent>
1212

1313
<groupId>com.arangodb</groupId>
@@ -369,7 +369,7 @@
369369
</requireJavaVersion>
370370
<enforceBytecodeVersion>
371371
<scopes>compile</scopes>
372-
<maxJdkVersion>1.8</maxJdkVersion>
372+
<maxJdkVersion>11</maxJdkVersion>
373373
</enforceBytecodeVersion>
374374
<requirePluginVersions/>
375375
<requireExplicitDependencyScope/>

src/main/java/com/arangodb/tinkerpop/gremlin/process/filter/ArangoFilter.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.arangodb.tinkerpop.gremlin.process.filter;
1818

19+
import org.apache.tinkerpop.gremlin.process.traversal.NotP;
1920
import org.apache.tinkerpop.gremlin.process.traversal.P;
2021
import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
2122
import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
@@ -61,6 +62,11 @@ static ArangoFilter of(String key, P<?> p) {
6162
return new TextRegexFilter(key, (String) p.getValue());
6263
case "notRegex":
6364
return NotFilter.of(new TextRegexFilter(key, (String) p.getValue()));
65+
case "not":
66+
if (p instanceof NotP) {
67+
return NotFilter.of(of(key, ((NotP<?>) p).negate()));
68+
}
69+
throw new UnsupportedOperationException("Unsupported predicate: " + p);
6470
case "or":
6571
if (p instanceof OrP) {
6672
return OrFilter.of(((OrP<?>) p).getPredicates().stream()

src/main/java/com/arangodb/tinkerpop/gremlin/process/traversal/step/ArangoStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import java.util.stream.Collectors;
3939
import java.util.stream.Stream;
4040

41-
public final class ArangoStep<S, E extends Element> extends GraphStep<S, E> implements HasContainerHolder {
41+
public final class ArangoStep<S, E extends Element> extends GraphStep<S, E> implements HasContainerHolder<S, E> {
4242

4343
private final List<HasContainer> hasContainers = new ArrayList<>();
4444

src/main/java/com/arangodb/tinkerpop/gremlin/process/traversal/strategy/optimization/ArangoStepStrategy.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
2929
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
3030

31+
import java.util.List;
32+
3133
public final class ArangoStepStrategy extends AbstractTraversalStrategy<TraversalStrategy.ProviderOptimizationStrategy> implements TraversalStrategy.ProviderOptimizationStrategy {
3234

3335
private static final ArangoStepStrategy INSTANCE = new ArangoStepStrategy();
@@ -53,7 +55,8 @@ public void apply(final Traversal.Admin<?, ?> traversal) {
5355
Step<?, ?> currentStep = arangoStep.getNextStep();
5456
while (currentStep instanceof HasStep || currentStep instanceof NoOpBarrierStep) {
5557
if (currentStep instanceof HasStep) {
56-
for (final HasContainer hasContainer : ((HasContainerHolder) currentStep).getHasContainers()) {
58+
List<HasContainer> hasContainers = ((HasContainerHolder) currentStep).getHasContainers();
59+
for (final HasContainer hasContainer : hasContainers) {
5760
if (!GraphStep.processHasContainerIds(arangoStep, hasContainer))
5861
arangoStep.addHasContainer(hasContainer);
5962
}

test-console/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ docker cp "$LOCATION"/arangodb.yaml tinkerpop-data:/arangodb
2020

2121
docker run \
2222
--volumes-from tinkerpop-data \
23-
docker.io/tinkerpop/gremlin-console:3.7.5 \
23+
docker.io/tinkerpop/gremlin-console:3.8.0 \
2424
-e /arangodb/test.groovy

test-plugin/java-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>org.apache.tinkerpop</groupId>
2020
<artifactId>gremlin-driver</artifactId>
21-
<version>3.7.5</version>
21+
<version>3.8.0</version>
2222
</dependency>
2323
<dependency>
2424
<groupId>org.assertj</groupId>

test-plugin/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ docker run -d \
2626
--name gremlin-server \
2727
--expose 8182 \
2828
-p 172.28.0.1:8182:8182 \
29-
docker.io/tinkerpop/gremlin-server:3.7.5
29+
docker.io/tinkerpop/gremlin-server:3.8.0
3030

3131
until curl http://172.28.0.1:8182 > /dev/null 2>&1 ; do
3232
printf ':'
@@ -40,7 +40,7 @@ docker run \
4040
--volumes-from tinkerpop-data \
4141
--name gremlin-console \
4242
--add-host=gremlin-server:172.28.0.1 \
43-
docker.io/tinkerpop/gremlin-console:3.7.5 \
43+
docker.io/tinkerpop/gremlin-console:3.8.0 \
4444
-e /arangodb/test.groovy
4545

4646
## test from java

0 commit comments

Comments
 (0)