neptune add support for 3.7 (#29)

neptune-tinkerpop/.gitignore

@@ -1,2 +1,3 @@
 *.class
 target/
+*.kryo

neptune-tinkerpop/3.4.13/pom.xml → neptune-tinkerpop/3.7.2/pom.xml

@@ -17,18 +17,17 @@
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>gremlin-core</artifactId>
-            <version>3.4.13</version>
+            <version>3.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>tinkergraph-gremlin</artifactId>
-            <version>3.4.13</version>
+            <version>3.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>gremlin-test</artifactId>
-            <version>3.4.13</version>
+            <version>3.7.2</version>
         </dependency>
     </dependencies>
-
 </project>

neptune-tinkerpop/3.4.13/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java → neptune-tinkerpop/3.7.2/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java

@@ -21,6 +21,7 @@
 import org.apache.tinkerpop.gremlin.process.traversal.Compare;
 import org.apache.tinkerpop.gremlin.process.traversal.Contains;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.PBiPredicate;
 import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.T;
@@ -98,7 +99,7 @@ protected boolean testLabel(final Element element) {
 
         // add comparison predicates to support the multi-label syntax `label1::label2::label3`
 
-        class LabelEquals implements BiPredicate<String, String> {
+        class LabelEquals implements PBiPredicate<String, String> {
             public boolean test(String label, String otherLabel) {
                 if (label == null) return false;
                 for (String partialLabel: label.split(LABEL_DELIMITER)) {
@@ -110,7 +111,7 @@ public boolean test(String label, String otherLabel) {
             }
         }
 
-        class LabelWithin implements BiPredicate<String, List<String>> {
+        class LabelWithin implements PBiPredicate<String, List<String>> {
             public boolean test(String label, List<String> labels) {
                 if (label == null) return false;
                 for (String partialLabel: label.split(LABEL_DELIMITER)) {

neptune-tinkerpop/3.4.13/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java → neptune-tinkerpop/3.7.2/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java

@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.tinkergraph;
 
-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.TestHelper;

neptune-tinkerpop/build.sh

@@ -2,7 +2,7 @@
 
 runDir=$(pwd)
 
-versions=("3.4.13" "3.6.2")
+versions=("3.6.2" "3.7.2")
 for version in "${versions[@]}"; do
   (
     cd $version

tinkerpop-id-manager/3.6/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    java
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.apache.tinkerpop:tinkergraph-gremlin:3.6.2")
+}
+
+tasks.jar {
+    archiveFileName.set("${rootProject.name}.jar")
+    destinationDirectory.set(rootDir)
+}

tinkerpop-id-manager/3.7/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    java
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.apache.tinkerpop:tinkergraph-gremlin:3.7.2")
+}
+
+tasks.jar {
+    archiveFileName.set("${rootProject.name}-37.jar")
+    destinationDirectory.set(rootDir)
+}

tinkerpop-id-manager/3.7/src/main/java/cloud/localstack/UUIDAnyIdManager.java

@@ -0,0 +1,29 @@
+package cloud.localstack;
+
+
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
+
+import java.util.UUID;
+
+public class UUIDAnyIdManager implements AbstractTinkerGraph.IdManager<String> {
+    @Override
+    public String getNextId(final AbstractTinkerGraph graph) {
+        return UUID.randomUUID().toString();
+    }
+
+    @Override
+    public String convert(final Object id) {
+        if (null == id) {
+            return null;
+        }
+        if (!(id instanceof String)) {
+            throw new IllegalArgumentException(String.format("Expected an id that is String but received %s - [%s]", id.getClass(), id));
+        }
+        return (String) id;
+    }
+
+    @Override
+    public boolean allow(final Object id) {
+        return id instanceof String;
+    }
+}

tinkerpop-id-manager/build.gradle.kts

@@ -11,7 +11,6 @@ repositories {
 dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    implementation("org.apache.tinkerpop:tinkergraph-gremlin:3.4.10")
 }
 
 tasks.getByName<Test>("test") {

tinkerpop-id-manager/settings.gradle.kts

@@ -8,3 +8,5 @@
  */
 
 rootProject.name = "tinkerpop-id-manager"
+
+include("3.6", "3.7")