JAVA-2827: Remove dependency to Tinkerpop gremlin-driver

adutra · olim7t · commit a87a44111b5f · 2020-08-31T15:49:45.000-07:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -4,6 +4,7 @@
 
 ### 4.9.0 (in progress)
 
+- [improvement] JAVA-2827: Remove dependency to Tinkerpop gremlin-driver
 - [task] JAVA-2859: Upgrade Tinkerpop to 3.4.8
 - [bug] JAVA-2726: Fix Tinkerpop incompatibility with JPMS
 - [bug] JAVA-2842: Remove security vulnerabilities introduced by Tinkerpop
diff --git a/core-shaded/pom.xml b/core-shaded/pom.xml
@@ -92,10 +92,6 @@
       <groupId>org.apache.tinkerpop</groupId>
       <artifactId>gremlin-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.tinkerpop</groupId>
-      <artifactId>gremlin-driver</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.tinkerpop</groupId>
       <artifactId>tinkergraph-gremlin</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
@@ -99,10 +99,6 @@
       <groupId>org.apache.tinkerpop</groupId>
       <artifactId>tinkergraph-gremlin</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.tinkerpop</groupId>
-      <artifactId>gremlin-driver</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/binary/AbstractSimpleGraphBinaryCustomSerializer.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/binary/AbstractSimpleGraphBinaryCustomSerializer.java
@@ -17,7 +17,6 @@
 
 import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
 import java.io.IOException;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
 import org.apache.tinkerpop.gremlin.structure.io.Buffer;
 import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
@@ -78,8 +77,7 @@ public T read(Buffer buffer, GraphBinaryReader context) throws IOException {
     // read {custom_type_info_length} and verify it is 0.
     // See #write(T, ByteBuf, GraphBinaryWriter) for why it is set to 0
     if (context.readValue(buffer, Integer.class, false) != 0) {
-      throw new SerializationException(
-          "{custom_type_info} should not be provided for this custom type");
+      throw new IOException("{custom_type_info} should not be provided for this custom type");
     }
 
     return readValue(buffer, context, true);
@@ -105,11 +103,11 @@ public T readValue(Buffer buffer, GraphBinaryReader context, boolean nullable)
     final int valueLength = buffer.readInt();
 
     if (valueLength <= 0) {
-      throw new SerializationException(String.format("Unexpected value length: %d", valueLength));
+      throw new IOException(String.format("Unexpected value length: %d", valueLength));
     }
 
     if (valueLength > buffer.readableBytes()) {
-      throw new SerializationException(
+      throw new IOException(
           String.format(
               "Not enough readable bytes: %d bytes required for value (%d bytes available)",
               valueLength, buffer.readableBytes()));
@@ -134,7 +132,7 @@ public void writeValue(
       throws IOException {
     if (value == null) {
       if (!nullable) {
-        throw new SerializationException("Unexpected null value when nullable is false");
+        throw new IOException("Unexpected null value when nullable is false");
       }
 
       // writes {value_flag} to "1" which means "the value is null"
diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/binary/buffer/DseNettyBufferFactory.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/binary/buffer/DseNettyBufferFactory.java
@@ -15,22 +15,26 @@
  */
 package com.datastax.dse.driver.internal.core.graph.binary.buffer;
 
-import io.netty.buffer.*;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.buffer.UnpooledByteBufAllocator;
 import java.nio.ByteBuffer;
 import java.util.function.Supplier;
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory;
 import org.apache.tinkerpop.gremlin.structure.io.Buffer;
 import org.apache.tinkerpop.gremlin.structure.io.BufferFactory;
 
 /**
  * Internal BufferFactory impl for creation of Tinkerpop buffers. We implement an internal type here
  * to allow for this class to use shaded Netty types (without bringing all of Tinkerpop into the
- * shaded JAR). The impl is based on the initial impl of {@link NettyBufferFactory} but we don't
- * guarantee that this class will mirror changes to that class over time.
+ * shaded JAR). The impl is based on the initial impl of {@code
+ * org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory} but we don't guarantee that this
+ * class will mirror changes to that class over time.
  */
 public class DseNettyBufferFactory implements BufferFactory<ByteBuf> {
 
-  private static ByteBufAllocator DEFAULT_ALLOCATOR = new UnpooledByteBufAllocator(false);
+  private static final ByteBufAllocator DEFAULT_ALLOCATOR = new UnpooledByteBufAllocator(false);
 
   private final ByteBufAllocator allocator;
 
diff --git a/osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/BundleOptions.java b/osgi-tests/src/test/java/com/datastax/oss/driver/internal/osgi/support/BundleOptions.java
@@ -139,11 +139,6 @@ public static CompositeOption tinkerpopBundles() {
                     "org.apache.tinkerpop.gremlin.util.*")
                 .bundleSymbolicName("org.apache.tinkerpop.gremlin-core")
                 .overwriteManifest(WrappedUrlProvisionOption.OverwriteMode.FULL),
-            CoreOptions.wrappedBundle(
-                    mavenBundle("org.apache.tinkerpop", "gremlin-driver").versionAsInProject())
-                .exports("org.apache.tinkerpop.gremlin.driver.*")
-                .bundleSymbolicName("org.apache.tinkerpop.gremlin-driver")
-                .overwriteManifest(WrappedUrlProvisionOption.OverwriteMode.FULL),
             CoreOptions.wrappedBundle(
                     mavenBundle("org.apache.tinkerpop", "tinkergraph-gremlin").versionAsInProject())
                 .exports("org.apache.tinkerpop.gremlin.tinkergraph.*")
diff --git a/pom.xml b/pom.xml
@@ -161,17 +161,6 @@
         <artifactId>tinkergraph-gremlin</artifactId>
         <version>${tinkerpop.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.tinkerpop</groupId>
-        <artifactId>gremlin-driver</artifactId>
-        <version>${tinkerpop.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
       <dependency>
         <groupId>org.reactivestreams</groupId>
         <artifactId>reactive-streams</artifactId>
