From d4531b134ba86f2a5603442e7e6de17d2296be32 Mon Sep 17 00:00:00 2001 From: Mathieu Cloutier <79954947+cloutierMat@users.noreply.github.com> Date: Mon, 27 May 2024 20:09:34 -0600 Subject: [PATCH] neptune add support for 3.7 (#29) --- neptune-tinkerpop/.gitignore | 1 + neptune-tinkerpop/{3.4.13 => 3.7.2}/pom.xml | 7 ++--- .../traversal/step/util/HasContainer.java | 5 +-- .../traversal/step/filter/HasLabelTest.java | 0 .../tinkergraph/TinkerGraphProvider.java | 2 +- neptune-tinkerpop/build.sh | 2 +- .../gremlin-core-3.4.13-patches.zip | Bin 7293 -> 0 bytes .../gremlin-core-3.6.2-patches.zip | Bin 7293 -> 7293 bytes .../gremlin-core-3.7.2-patches.zip | Bin 0 -> 7291 bytes tinkerpop-id-manager/3.6/build.gradle.kts | 16 ++++++++++ .../cloud/localstack/UUIDAnyIdManager.java | 0 tinkerpop-id-manager/3.7/build.gradle.kts | 16 ++++++++++ .../cloud/localstack/UUIDAnyIdManager.java | 29 ++++++++++++++++++ tinkerpop-id-manager/build.gradle.kts | 1 - tinkerpop-id-manager/settings.gradle.kts | 2 ++ .../tinkerpop-id-manager-37.jar | Bin 0 -> 1424 bytes tinkerpop-id-manager/tinkerpop-id-manager.jar | Bin 1416 -> 1416 bytes 17 files changed, 72 insertions(+), 9 deletions(-) rename neptune-tinkerpop/{3.4.13 => 3.7.2}/pom.xml (90%) rename neptune-tinkerpop/{3.4.13 => 3.7.2}/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java (97%) rename neptune-tinkerpop/{3.4.13 => 3.7.2}/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasLabelTest.java (100%) rename neptune-tinkerpop/{3.4.13 => 3.7.2}/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java (99%) delete mode 100644 neptune-tinkerpop/gremlin-core-3.4.13-patches.zip create mode 100644 neptune-tinkerpop/gremlin-core-3.7.2-patches.zip create mode 100644 tinkerpop-id-manager/3.6/build.gradle.kts rename tinkerpop-id-manager/{ => 3.6}/src/main/java/cloud/localstack/UUIDAnyIdManager.java (100%) create mode 100644 tinkerpop-id-manager/3.7/build.gradle.kts create mode 100644 tinkerpop-id-manager/3.7/src/main/java/cloud/localstack/UUIDAnyIdManager.java create mode 100644 tinkerpop-id-manager/tinkerpop-id-manager-37.jar diff --git a/neptune-tinkerpop/.gitignore b/neptune-tinkerpop/.gitignore index 8ee4623..8fbc6ee 100644 --- a/neptune-tinkerpop/.gitignore +++ b/neptune-tinkerpop/.gitignore @@ -1,2 +1,3 @@ *.class target/ +*.kryo \ No newline at end of file diff --git a/neptune-tinkerpop/3.4.13/pom.xml b/neptune-tinkerpop/3.7.2/pom.xml similarity index 90% rename from neptune-tinkerpop/3.4.13/pom.xml rename to neptune-tinkerpop/3.7.2/pom.xml index 4a26bce..1ac56c6 100644 --- a/neptune-tinkerpop/3.4.13/pom.xml +++ b/neptune-tinkerpop/3.7.2/pom.xml @@ -17,18 +17,17 @@ org.apache.tinkerpop gremlin-core - 3.4.13 + 3.7.2 org.apache.tinkerpop tinkergraph-gremlin - 3.4.13 + 3.7.2 org.apache.tinkerpop gremlin-test - 3.4.13 + 3.7.2 - diff --git a/neptune-tinkerpop/3.4.13/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java b/neptune-tinkerpop/3.7.2/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java similarity index 97% rename from neptune-tinkerpop/3.4.13/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java rename to neptune-tinkerpop/3.7.2/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java index e349b96..88f82d3 100644 --- a/neptune-tinkerpop/3.4.13/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java +++ b/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 { + class LabelEquals implements PBiPredicate { 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> { + class LabelWithin implements PBiPredicate> { public boolean test(String label, List labels) { if (label == null) return false; for (String partialLabel: label.split(LABEL_DELIMITER)) { diff --git a/neptune-tinkerpop/3.4.13/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasLabelTest.java b/neptune-tinkerpop/3.7.2/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasLabelTest.java similarity index 100% rename from neptune-tinkerpop/3.4.13/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasLabelTest.java rename to neptune-tinkerpop/3.7.2/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasLabelTest.java diff --git a/neptune-tinkerpop/3.4.13/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java b/neptune-tinkerpop/3.7.2/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java similarity index 99% rename from neptune-tinkerpop/3.4.13/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java rename to neptune-tinkerpop/3.7.2/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java index 0efd240..3254aa1 100644 --- a/neptune-tinkerpop/3.4.13/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java +++ b/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; diff --git a/neptune-tinkerpop/build.sh b/neptune-tinkerpop/build.sh index b57b576..f92c0fd 100755 --- a/neptune-tinkerpop/build.sh +++ b/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 diff --git a/neptune-tinkerpop/gremlin-core-3.4.13-patches.zip b/neptune-tinkerpop/gremlin-core-3.4.13-patches.zip deleted file mode 100644 index 352a240f45a8c22822ff1c7435c74bbfd5c65520..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7293 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 L3j;%jIEV)Tq{rCa delta 956 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 literal 0 HcmV?d00001 diff --git a/tinkerpop-id-manager/3.6/build.gradle.kts b/tinkerpop-id-manager/3.6/build.gradle.kts new file mode 100644 index 0000000..fcc664b --- /dev/null +++ b/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) +} \ No newline at end of file diff --git a/tinkerpop-id-manager/src/main/java/cloud/localstack/UUIDAnyIdManager.java b/tinkerpop-id-manager/3.6/src/main/java/cloud/localstack/UUIDAnyIdManager.java similarity index 100% rename from tinkerpop-id-manager/src/main/java/cloud/localstack/UUIDAnyIdManager.java rename to tinkerpop-id-manager/3.6/src/main/java/cloud/localstack/UUIDAnyIdManager.java diff --git a/tinkerpop-id-manager/3.7/build.gradle.kts b/tinkerpop-id-manager/3.7/build.gradle.kts new file mode 100644 index 0000000..c666984 --- /dev/null +++ b/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) +} \ No newline at end of file diff --git a/tinkerpop-id-manager/3.7/src/main/java/cloud/localstack/UUIDAnyIdManager.java b/tinkerpop-id-manager/3.7/src/main/java/cloud/localstack/UUIDAnyIdManager.java new file mode 100644 index 0000000..398ae24 --- /dev/null +++ b/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 { + @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; + } +} diff --git a/tinkerpop-id-manager/build.gradle.kts b/tinkerpop-id-manager/build.gradle.kts index 27eb1b2..b6517eb 100644 --- a/tinkerpop-id-manager/build.gradle.kts +++ b/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") { diff --git a/tinkerpop-id-manager/settings.gradle.kts b/tinkerpop-id-manager/settings.gradle.kts index 8b5d975..28fa757 100644 --- a/tinkerpop-id-manager/settings.gradle.kts +++ b/tinkerpop-id-manager/settings.gradle.kts @@ -8,3 +8,5 @@ */ rootProject.name = "tinkerpop-id-manager" + +include("3.6", "3.7") \ No newline at end of file diff --git a/tinkerpop-id-manager/tinkerpop-id-manager-37.jar b/tinkerpop-id-manager/tinkerpop-id-manager-37.jar new file mode 100644 index 0000000000000000000000000000000000000000..b66b4358ec8d720204e9befd96876808eea78d83 GIT binary patch literal 1424 zcmWIWW@h1HVBp|jxDc~Ff&mDaKm-tQ0~0p0C?y-!rFuymj?1@_OrPojY@WbCAIm;|EV4J!L{N4Bb{Xpkc{5 z`K2i+R-&sCgsaNQPfpA!E=f$z#?a8wvi^xWGXq0CI|G9{HVvVno-U4gm7XcSiFt|X zsYQCpIf=!^TSHD4T{aN0^?Gc<%jUK4DR17w31$tIQ`|E(TP``J9ZFU^;8Uq1;=Y6J z_&E(PP42oD{)D4UW(N*@xb-QJC%lhS^(>FhDYx)lcF*UnPWHTCU-N?}K`6Y)z;NDS z7OpCbq(>_{lOrwE`d<617kNBR;bZfAx*P7Uc@}=>#7OcD@_-iNw6%cEST;czkYH`lV4?APsa27L*93KobEp#3M)zn9{#vw1$*6$6q}RM z-hRO+r>%|(vN)=BcIWE6G7JG){OkN%NH$?uTn`p;?tJ>dg-BrU4c7v zmLyqBiC3-M{3~L|s&aA7{mW{jnbU4WTvUsF-h0HonceZrl*AR`FRSaPzY+Oozpw1n z_wXA1C$pSCpWC0h!7EYYNz8%SzK+imQ+3Pd-mZQ{zwX|KA^;zk)s7KA-#bVH@n5$g@+CZ34~jEs>vOD|?IZ{T$nnfdQ5XXUJH9Tk1Snq{=U{w`}t8A1uWi*MAVZc`9jF zKxO~G@)Nb1HLg+I-;OpNz9OFy%r@27vrPD;Z@{;5X20c(?A05lw|u{7(>uk|>+|0Y zlf#xxvX$J`9v*9bYwxNB7d11saPx^|x+{CmeB5$z#TgdUeG6~Tym~C{R%wTA&&9Z$ z*YY<~4mV1aatPGBf3=EbmAY%Ye$_a1) literal 0 HcmV?d00001 diff --git a/tinkerpop-id-manager/tinkerpop-id-manager.jar b/tinkerpop-id-manager/tinkerpop-id-manager.jar index 066e03efa93b7c03facc109b16781fbad6fb8088..3620cbb4c9811ab1d8c185e8c48826a18dee32f6 100644 GIT binary patch delta 807 zcmV+?1K9kC3y2F2P)h>@3IG5I2msJrw^)%5B?O~fw^)%kNd(Ybw^)&cA_UM}w^)&? zEeOzDw^%Dn1NxEQLlevJ(m>Slfe!=`MATG8T?DN{%ab($F@FL#axgKL!#E0hIBDXP ziPKp)CeG+zXLCs7Tn+}#=dcqKdbnWXqKV54nQ1@t)eJ*de(V85dOoTMhTSDU6n7id zWg!>&azL5hQsnaB0hhl1PLgT0;@265OKuP~Do&swb;aFh&i(tv8*|}{V&x7GxhLcl zL$@c?U9qN$6@P}sd?}Ki!)x4K5svc1XF}GZn&U}P4g4_4c#_vvoVt{$133%u^WhMR4BMBp}V3^%5JA>&);i`~|;dp+X)V<}W!d0EsQ+`GJv;oYp zv#d?I!)u9e1`mShIYVD3>W7<4wut|)k1g8nvhRglV}EJh+Cv7b7=}X52fSVvwC}Zz zwcBiGq$M`J(cu~DELV;i(iJy-ZDU{iDLbueEbK;)iAf7rFlAvHR~dTR$ry(Iriwuz zJRZzRuTd4DT3B;MP5DvCFtM;!qh*PT%|qL-*lL9<+ppVA5_`F!Y$;sfuM%RkZlAIr zjn*IkBY)TQ#lj4(S(wF~?(VvULpW@qANv^wH@!P1<{57PFJl>Y#oaZOAH-5*s^noM zsy07*^U0BD0m$~OivIYvFW>R-XX$pw2ZLenKZrO3rAJP2*xo?Hj1khZ!Sd;DqI|$HRw^%Dn1NxIO1y?&)d`JKQ delta 807 zcmeC+?%?JN@MdP=VqoClUt(hV85qtwEWuS}k@{#$r*Wi(+PPQp&x<@B*YL6F zJ=q{E{H7VXQ=-=XC~bSJYTh9ws(xX@u1D{TpFceOXzk1ot{aQyx8D&inzZn?aF*Yil}WAj ziFWZ_OP+s_Di3d2{O7~W30qe@s|X5Vw)Zib_hhT+@^vYPLwPml{IsYJPgi&M_W!9> z&Lmgm7wKvL#p6(iwnSde^tlI178iti95t8}ul_aR=gNZ6^siImFWTiY7{AfU4u1DJ z>e1|j%?efLE?n>Yb@ACG-ADglCwFh#{ia&+dPM!K?cXLG)M{HeVKd|U>#T39bCchi z-L||aH2cw}Lf z2*~lLExEp;E8uQiv8(UTz!L=@zeV*@73{e zSM9Ahsde`M-0Ro9>~77B*J^lcwDU=*rJF1pWkf8w>K*o_JHU)iIkIF_iLe5bV2@YKKD z1DU1|9vJjZ_z*a2`9!1kj5?mOOQ&2msX2fDuq@Y=`87wc*usk{Z)PqO$rUVi5XLSR0|?_Ci#0s0Pc~!?2LQ06d|m(m