diff --git a/pom.xml b/pom.xml index 51fff91..c778fe0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ com.arangodb - arangodb-java-driver + arangodb-java-driver-shaded ${arangodb-java-driver.version} diff --git a/src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseDocument.java b/src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseDocument.java index 5a0a8f6..6f5d391 100644 --- a/src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseDocument.java +++ b/src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseDocument.java @@ -8,12 +8,12 @@ package com.arangodb.tinkerpop.gremlin.client; -import com.arangodb.serde.jackson.Id; -import com.arangodb.serde.jackson.Key; -import com.arangodb.serde.jackson.Rev; +import com.arangodb.serde.InternalId; +import com.arangodb.serde.InternalKey; +import com.arangodb.serde.InternalRev; import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.arangodb.shaded.fasterxml.jackson.annotation.JsonIgnore; +import com.arangodb.shaded.fasterxml.jackson.annotation.JsonProperty; /** * The ArangoDB BaseBaseDocument provides the internal fields required for the driver to correctly @@ -26,17 +26,17 @@ public abstract class ArangoDBBaseDocument { /** ArangoDB internal id. */ - @Id + @InternalId protected String _id; /** ArangoDB internal revision. */ - @Rev + @InternalRev protected String _rev; /** ArangoDB internal name - mapped to TinkerPop's ID. */ - @Key + @InternalKey protected String _key; /** The label of the document */ diff --git a/src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseEdge.java b/src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseEdge.java index c3cf9ed..99cddf2 100644 --- a/src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseEdge.java +++ b/src/main/java/com/arangodb/tinkerpop/gremlin/client/ArangoDBBaseEdge.java @@ -8,8 +8,8 @@ package com.arangodb.tinkerpop.gremlin.client; -import com.arangodb.serde.jackson.From; -import com.arangodb.serde.jackson.To; +import com.arangodb.serde.InternalFrom; +import com.arangodb.serde.InternalTo; import com.arangodb.tinkerpop.gremlin.structure.ArangoDBGraph; /** @@ -24,12 +24,12 @@ public abstract class ArangoDBBaseEdge extends ArangoDBBaseDocument { /** ArangoDB internal from. */ - @From + @InternalFrom private String _from; /** ArangoDB internal to. */ - @To + @InternalTo private String _to; /** diff --git a/src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBElementProperty.java b/src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBElementProperty.java index f9f36bb..4acea54 100644 --- a/src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBElementProperty.java +++ b/src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBElementProperty.java @@ -10,8 +10,8 @@ import java.util.NoSuchElementException; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.arangodb.shaded.fasterxml.jackson.annotation.JsonIgnore; +import com.arangodb.shaded.fasterxml.jackson.annotation.JsonProperty; import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.util.ElementHelper; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; diff --git a/src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBGraphVariables.java b/src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBGraphVariables.java index d9558e4..09bd9b7 100644 --- a/src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBGraphVariables.java +++ b/src/main/java/com/arangodb/tinkerpop/gremlin/structure/ArangoDBGraphVariables.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.Set; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.arangodb.shaded.fasterxml.jackson.annotation.JsonProperty; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.util.GraphVariableHelper; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; diff --git a/src/main/java/com/arangodb/tinkerpop/gremlin/utils/ArangoDBUtil.java b/src/main/java/com/arangodb/tinkerpop/gremlin/utils/ArangoDBUtil.java index d0711c9..9f54150 100644 --- a/src/main/java/com/arangodb/tinkerpop/gremlin/utils/ArangoDBUtil.java +++ b/src/main/java/com/arangodb/tinkerpop/gremlin/utils/ArangoDBUtil.java @@ -14,6 +14,7 @@ import com.arangodb.entity.EdgeDefinition; import com.arangodb.entity.GraphEntity; import com.arangodb.model.GraphCreateOptions; +import com.arangodb.shaded.fasterxml.jackson.databind.ObjectMapper; import com.arangodb.tinkerpop.gremlin.client.ArangoDBBaseDocument; import com.arangodb.tinkerpop.gremlin.client.ArangoDBGraphClient; import com.arangodb.tinkerpop.gremlin.client.ArangoDBGraphException; @@ -33,7 +34,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.tinkerpop.gremlin.structure.Direction; import org.slf4j.Logger;