Skip to content

Upgraded to Gremlin 3.5.1 #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lvca merged 1 commit into from
Nov 4, 2021
Merged

Upgraded to Gremlin 3.5.1 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gremlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<packaging>jar</packaging>

<properties>
<gremlin.version>3.4.12</gremlin.version>
<gremlin.version>3.5.1</gremlin.version>
<junit5.version>5.8.1</junit5.version>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import com.arcadedb.schema.EdgeType;
import com.arcadedb.schema.VertexType;
import com.arcadedb.utility.FileUtils;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.tinkerpop.gremlin.arcadedb.structure.io.ArcadeIoRegistry;
import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
import org.apache.tinkerpop.gremlin.jsr223.ConcurrentBindings;
Expand Down
18 changes: 18 additions & 0 deletions ...in/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraphFeatures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ public VariableFeatures variables() {
}

public class ArcadeElementFeatures implements ElementFeatures {
@Override
public boolean supportsNullPropertyValues() {
return false;
}

@Override
public boolean supportsNumericIds() {
return false;
Expand Down Expand Up @@ -111,6 +116,10 @@ public boolean supportsStringIds() {
}

public class ArcadeVertexFeatures extends ArcadeElementFeatures implements VertexFeatures {
@Override
public boolean supportsNullPropertyValues() {
return false;
}

@Override
public VertexPropertyFeatures properties() {
Expand All @@ -134,13 +143,22 @@ public boolean supportsMultiProperties() {
}

public class ArcadeEdgeFeatures extends ArcadeElementFeatures implements EdgeFeatures {
@Override
public boolean supportsNullPropertyValues() {
return false;
}

@Override
public EdgePropertyFeatures properties() {
return edgePropertyFeatures;
}
}

public class ArcadeVertexPropertyFeatures extends ArcadeDataTypeFeatures implements VertexPropertyFeatures {
@Override
public boolean supportsNullPropertyValues() {
return false;
}

@Override
public boolean supportsAnyIds() {
Expand Down
3 changes: 0 additions & 3 deletions ...rc/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeTraversalStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ public class ArcadeTraversalStrategy extends AbstractTraversalStrategy<Traversal

@Override
public void apply(final Traversal.Admin<?, ?> traversal) {
if (!(traversal.getGraph().orElseThrow(IllegalStateException::new) instanceof ArcadeGraph))
return;

final List<Step> steps = traversal.getSteps();
for (int i = 1; i < steps.size(); i++) {
final Step step = steps.get(i);
Expand Down
2 changes: 1 addition & 1 deletion gremlin/src/test/java/org/apache/tinkerpop/gremlin/arcadedb/ArcadeGraphProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package org.apache.tinkerpop.gremlin.arcadedb;

import com.arcadedb.database.RID;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration2.Configuration;
import org.apache.tinkerpop.gremlin.AbstractGraphProvider;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.arcadedb.structure.ArcadeEdge;
Expand Down
4 changes: 2 additions & 2 deletions gremlin/src/test/java/org/apache/tinkerpop/gremlin/arcadedb/process/DebugProcessSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

import org.apache.tinkerpop.gremlin.AbstractGremlinSuite;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupTest;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.PropertyTest;
import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
Expand All @@ -38,7 +38,7 @@ public class DebugProcessSuite extends AbstractGremlinSuite {
* This list of tests in the suite that will be executed as part of this suite.
*/
private static final Class<?>[] allTests = new Class<?>[]{
DedupTest.Traversals.class,
PropertyTest.class,
};

/**
Expand Down