From a32d5f47713fda93d0e2f6efe817c7c19f4610a4 Mon Sep 17 00:00:00 2001 From: Tglman Date: Tue, 23 Jan 2024 17:42:55 +0100 Subject: [PATCH] fix: correct equals and hashcode of vertexproperty to use element logic --- .../tinkerpop/gremlin/orientdb/OrientProperty.java | 2 +- .../gremlin/orientdb/OrientVertexProperty.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientProperty.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientProperty.java index 3e523bcf..f2797699 100644 --- a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientProperty.java +++ b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientProperty.java @@ -95,7 +95,7 @@ public String toString() { } @Override - public final boolean equals(final Object object) { + public boolean equals(final Object object) { return ElementHelper.areEqual(this, object); } diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertexProperty.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertexProperty.java index 1d8b8ba5..f2eb05a4 100644 --- a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertexProperty.java +++ b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertexProperty.java @@ -5,10 +5,12 @@ import com.orientechnologies.orient.core.record.impl.ODocument; import java.util.*; import java.util.stream.Stream; +import org.apache.tinkerpop.gremlin.structure.Element; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; public class OrientVertexProperty extends OrientProperty implements VertexProperty { @@ -89,6 +91,16 @@ private String metadataKey() { return "_meta_" + key; } + @Override + public boolean equals(final Object object) { + return ElementHelper.areEqual(this, object); + } + + @Override + public int hashCode() { + return ElementHelper.hashCode((Element) this); + } + @Override public Vertex element() { return (Vertex) element;