Rethink Guava dependency in Java driver

bom/pom.xml

@@ -75,11 +75,6 @@
         <artifactId>native-protocol</artifactId>
         <version>1.5.1</version>
       </dependency>
-      <dependency>
-        <groupId>com.datastax.oss</groupId>
-        <artifactId>java-driver-shaded-guava</artifactId>
-        <version>25.1-jre-graal-sub-1</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>

core-shaded/pom.xml

@@ -56,10 +56,6 @@
       <groupId>com.datastax.oss</groupId>
       <artifactId>native-protocol</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.typesafe</groupId>
       <artifactId>config</artifactId>
@@ -163,6 +159,7 @@
                   - All the dependencies we want to shade & relocate.
                   -->
                   <include>org.apache.cassandra:java-driver-core</include>
+                  <include>com.google.guava:*</include>
                   <include>io.netty:*</include>
                   <include>com.fasterxml.jackson.core:*</include>
                 </includes>
@@ -180,6 +177,10 @@
                   <pattern>com.fasterxml.jackson</pattern>
                   <shadedPattern>com.datastax.oss.driver.shaded.fasterxml.jackson</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>com.google</pattern>
+                  <shadedPattern>com.datastax.oss.driver.shaded.guava</shadedPattern>
+                </relocation>
               </relocations>
               <filters>
                 <!-- Exclude everything under META-INF -->
@@ -203,6 +204,12 @@
                     <exclude>META-INF/**</exclude>
                   </excludes>
                 </filter>
+                <filter>
+                  <artifact>com.google.guava:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/**</exclude>
+                  </excludes>
+                </filter>
               </filters>
             </configuration>
           </execution>
@@ -296,9 +303,8 @@
                 <DynamicImport-Package>*</DynamicImport-Package>
                 <Import-Package>
                   <!--
-                  1) Don't import packages shaded in the driver bundle. Note that shaded-guava lives
-                  in its own bundle, so we must explicitly *not* mention it here.
-                  -->!com.datastax.oss.driver.shaded.netty.*, !com.datastax.oss.driver.shaded.fasterxml.jackson.*,
+                  1) Don't import packages shaded in the driver bundle.
+                  -->!com.datastax.oss.driver.shaded.netty.*, !com.datastax.oss.driver.shaded.fasterxml.jackson.*, !com.datastax.oss.driver.shaded.guava.*,
                   <!--
                   2) Don't include the packages below because they contain annotations only and are
                   not required at runtime.
@@ -317,14 +323,14 @@
                   <!--
                   5) Don't import packages imported by shaded classes, if they are not used by the
                   driver bundle.
-                  -->!com.google.protobuf.*, !com.jcraft.jzlib.*, !com.ning.compress.*, !lzma.sdk.*, !net.jpountz.xxhash.*, !org.bouncycastle.*, !org.conscrypt.*, !org.apache.commons.logging.*, !org.apache.log4j.*, !org.apache.logging.log4j.*, !org.eclipse.jetty.*, !org.jboss.marshalling.*, !sun.misc.*, !sun.security.*, !com.barchart.udt.*, !com.fasterxml.aalto.*, !com.sun.nio.sctp.*, !gnu.io.*, !org.xml.sax.*, !org.w3c.dom.*, !com.aayushatharva.brotli4j.*, !com.github.luben.zstd.*, *
+                  -->!com.google.protobuf.*, !com.jcraft.jzlib.*, !com.ning.compress.*, !lzma.sdk.*, !net.jpountz.xxhash.*, !org.bouncycastle.*, !org.conscrypt.*, !org.apache.commons.logging.*, !org.apache.log4j.*, !org.apache.logging.log4j.*, !org.eclipse.jetty.*, !org.jboss.marshalling.*, sun.misc.*;resolution:=optional, !sun.security.*, !com.barchart.udt.*, !com.fasterxml.aalto.*, !com.sun.nio.sctp.*, !gnu.io.*, !org.xml.sax.*, !org.w3c.dom.*, !com.aayushatharva.brotli4j.*, !com.github.luben.zstd.*, javax.annotation.*;resolution:=optional;version="[3.0,4)", javax.crypto.*;resolution:=optional, !com.datastax.oss.driver.shaded.guava.errorprone.*, !org.checkerframework.*, *
                 </Import-Package>
                 <!--
                 Export:
                 1) The driver's packages (API and internal);
-                2) All shaded packages, except Guava which resides in a separate bundle.
+                2) All shaded packages.
                 -->
-                <Export-Package>com.datastax.oss.driver.api.core.*, com.datastax.oss.driver.internal.core.*, com.datastax.dse.driver.api.core.*, com.datastax.dse.driver.internal.core.*, com.datastax.oss.driver.shaded.netty.*, com.datastax.oss.driver.shaded.fasterxml.jackson.*,</Export-Package>
+                <Export-Package>!com.datastax.oss.driver.shaded.guava.errorprone.*, com.datastax.oss.driver.api.core.*, com.datastax.oss.driver.internal.core.*, com.datastax.dse.driver.api.core.*, com.datastax.dse.driver.internal.core.*, com.datastax.oss.driver.shaded.netty.*, com.datastax.oss.driver.shaded.fasterxml.jackson.*, com.datastax.oss.driver.shaded.guava.*</Export-Package>
               </instructions>
               <rebuildBundle>true</rebuildBundle>
             </configuration>

core/pom.xml

@@ -49,8 +49,12 @@
       <artifactId>netty-handler</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
-      <artifactId>java-driver-shaded-guava</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.graalvm.nativeimage</groupId>
+      <artifactId>svm</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe</groupId>

core/revapi.json

@@ -7089,6 +7089,12 @@
         "new": "method com.datastax.oss.driver.api.core.cql.SimpleStatement com.datastax.oss.driver.api.core.cql.SimpleStatement::setNamedValues(java.util.Map<java.lang.String, java.lang.Object>)",
         "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue",
         "justification": "Annotate mutating methods with @CheckReturnValue"
+      },
+      {
+        "code": "java.method.returnTypeChanged",
+        "old": "method com.datastax.oss.driver.shaded.guava.common.reflect.TypeToken<T> com.datastax.oss.driver.api.core.type.reflect.GenericType<T>::__getToken()",
+        "new": "method com.google.common.reflect.TypeToken<T> com.datastax.oss.driver.api.core.type.reflect.GenericType<T>::__getToken()",
+        "justification": "CASSJAVA-52: Move Guava as standard driver dependency (shaded only in core-shaded JAR)"
       }
     ]
   }

core/src/main/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderBase.java

@@ -22,9 +22,9 @@
 import com.datastax.oss.driver.api.core.auth.Authenticator;
 import com.datastax.oss.driver.api.core.metadata.EndPoint;
 import com.datastax.oss.driver.api.core.session.Session;
-import com.datastax.oss.driver.shaded.guava.common.base.Charsets;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
 import com.datastax.oss.protocol.internal.util.Bytes;
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableMap;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.net.InetSocketAddress;

core/src/main/java/com/datastax/dse/driver/api/core/auth/ProxyAuthentication.java

@@ -19,8 +19,8 @@
 
 import com.datastax.dse.driver.api.core.graph.GraphStatement;
 import com.datastax.oss.driver.api.core.cql.Statement;
-import com.datastax.oss.driver.shaded.guava.common.base.Charsets;
 import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap;
+import com.google.common.base.Charsets;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.nio.ByteBuffer;
 import java.util.Map;

core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRange.java

@@ -17,8 +17,8 @@
  */
 package com.datastax.dse.driver.api.core.data.time;
 
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
-import com.datastax.oss.driver.shaded.guava.common.base.Strings;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.io.Serializable;

core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangeBound.java

@@ -18,7 +18,7 @@
 package com.datastax.dse.driver.api.core.data.time;
 
 import com.datastax.dse.driver.internal.core.search.DateRangeUtil;
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.text.ParseException;

core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangePrecision.java

@@ -18,8 +18,8 @@
 package com.datastax.dse.driver.api.core.data.time;
 
 import com.datastax.dse.driver.internal.core.search.DateRangeUtil;
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;

core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatement.java

@@ -19,7 +19,7 @@
 
 import com.datastax.dse.driver.internal.core.graph.DefaultBatchGraphStatement;
 import com.datastax.oss.driver.api.core.cql.Statement;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Collections;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;

core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatementBuilder.java

@@ -18,7 +18,7 @@
 package com.datastax.dse.driver.api.core.graph;
 
 import com.datastax.dse.driver.internal.core.graph.DefaultBatchGraphStatement;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import net.jcip.annotations.NotThreadSafe;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;

core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphResultSet.java

@@ -19,7 +19,7 @@
 
 import com.datastax.dse.driver.internal.core.graph.GraphExecutionInfoConverter;
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Collections;

core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatementBuilder.java

@@ -18,8 +18,8 @@
 package com.datastax.dse.driver.api.core.graph;
 
 import com.datastax.dse.driver.internal.core.graph.DefaultScriptGraphStatement;
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
-import com.datastax.oss.driver.shaded.guava.common.collect.Maps;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Map;

core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseNodeMetric.java

@@ -18,7 +18,7 @@
 package com.datastax.dse.driver.api.core.metrics;
 
 import com.datastax.oss.driver.api.core.metrics.NodeMetric;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Map;
 

core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseSessionMetric.java

@@ -18,7 +18,7 @@
 package com.datastax.dse.driver.api.core.metrics;
 
 import com.datastax.oss.driver.api.core.metrics.SessionMetric;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Map;
 

core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousRequestHandlerBase.java

@@ -66,7 +66,6 @@
 import com.datastax.oss.driver.internal.core.session.RepreparePayload;
 import com.datastax.oss.driver.internal.core.util.Loggers;
 import com.datastax.oss.driver.internal.core.util.collection.SimpleQueryPlan;
-import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting;
 import com.datastax.oss.protocol.internal.Frame;
 import com.datastax.oss.protocol.internal.Message;
 import com.datastax.oss.protocol.internal.ProtocolConstants;
@@ -77,6 +76,7 @@
 import com.datastax.oss.protocol.internal.response.result.Rows;
 import com.datastax.oss.protocol.internal.response.result.Void;
 import com.datastax.oss.protocol.internal.util.Bytes;
+import com.google.common.annotations.VisibleForTesting;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import io.netty.handler.codec.EncoderException;

core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetSubscription.java

@@ -24,7 +24,7 @@
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import com.datastax.oss.driver.api.core.cql.Row;
 import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures;
-import com.datastax.oss.driver.shaded.guava.common.collect.Iterators;
+import com.google.common.collect.Iterators;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Collections;

core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultGeometry.java

@@ -19,12 +19,12 @@
 
 import com.datastax.dse.driver.api.core.data.geometry.Geometry;
 import com.datastax.dse.driver.api.core.data.geometry.Point;
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
 import com.esri.core.geometry.GeometryException;
 import com.esri.core.geometry.SpatialReference;
 import com.esri.core.geometry.ogc.OGCGeometry;
 import com.esri.core.geometry.ogc.OGCLineString;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;

core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultLineString.java

@@ -19,9 +19,9 @@
 
 import com.datastax.dse.driver.api.core.data.geometry.LineString;
 import com.datastax.dse.driver.api.core.data.geometry.Point;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
 import com.esri.core.geometry.Polyline;
 import com.esri.core.geometry.ogc.OGCLineString;
+import com.google.common.collect.ImmutableList;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.List;
 import net.jcip.annotations.Immutable;

core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPolygon.java

@@ -19,11 +19,11 @@
 
 import com.datastax.dse.driver.api.core.data.geometry.Point;
 import com.datastax.dse.driver.api.core.data.geometry.Polygon;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
 import com.esri.core.geometry.Operator;
 import com.esri.core.geometry.OperatorFactoryLocal;
 import com.esri.core.geometry.OperatorSimplifyOGC;
 import com.esri.core.geometry.ogc.OGCPolygon;
+import com.google.common.collect.ImmutableList;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Collections;
 import java.util.List;

core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/Distance.java

@@ -24,10 +24,10 @@
 import com.datastax.dse.driver.api.core.data.geometry.Point;
 import com.datastax.dse.driver.api.core.data.geometry.Polygon;
 import com.datastax.dse.driver.api.core.graph.predicates.Geo;
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
 import com.esri.core.geometry.MultiPath;
 import com.esri.core.geometry.ogc.OGCGeometry;
 import com.esri.core.geometry.ogc.OGCPoint;
+import com.google.common.base.Preconditions;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.nio.ByteBuffer;
 import java.util.Objects;

core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousGraphRequestHandler.java

@@ -32,9 +32,9 @@
 import com.datastax.oss.driver.internal.core.context.InternalDriverContext;
 import com.datastax.oss.driver.internal.core.cql.Conversions;
 import com.datastax.oss.driver.internal.core.session.DefaultSession;
-import com.datastax.oss.driver.shaded.guava.common.base.MoreObjects;
 import com.datastax.oss.protocol.internal.Message;
 import com.datastax.oss.protocol.internal.response.result.Rows;
+import com.google.common.base.MoreObjects;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.nio.ByteBuffer;

core/src/main/java/com/datastax/dse/driver/internal/core/graph/CqlCollectionPredicate.java

@@ -17,7 +17,7 @@
  */
 package com.datastax.dse.driver.internal.core.graph;
 
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Objects;

core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultBatchGraphStatement.java

@@ -21,7 +21,7 @@
 import com.datastax.oss.driver.api.core.ConsistencyLevel;
 import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
 import com.datastax.oss.driver.api.core.metadata.Node;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.nio.ByteBuffer;
 import java.time.Duration;

core/src/main/java/com/datastax/dse/driver/internal/core/graph/DsePredicate.java

@@ -17,7 +17,7 @@
  */
 package com.datastax.dse.driver.internal.core.graph;
 
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import java.util.function.BiPredicate;
 
 /**

core/src/main/java/com/datastax/dse/driver/internal/core/graph/EditDistance.java

@@ -17,8 +17,8 @@
  */
 package com.datastax.dse.driver.internal.core.graph;
 
-import com.datastax.oss.driver.shaded.guava.common.base.Objects;
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
 import java.io.Serializable;
 import net.jcip.annotations.Immutable;
 

core/src/main/java/com/datastax/dse/driver/internal/core/graph/GeoPredicate.java

@@ -23,7 +23,7 @@
 import com.datastax.dse.driver.api.core.data.geometry.Polygon;
 import com.datastax.dse.driver.api.core.graph.predicates.Geo;
 import com.datastax.dse.driver.internal.core.data.geometry.Distance;
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 
 /**
  * List of predicates for geolocation usage with DseGraph and Search indexes. Should not be accessed

core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphConversions.java

@@ -39,14 +39,14 @@
 import com.datastax.oss.driver.api.core.type.codec.TypeCodecs;
 import com.datastax.oss.driver.internal.core.context.InternalDriverContext;
 import com.datastax.oss.driver.internal.core.cql.Conversions;
-import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting;
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
-import com.datastax.oss.driver.shaded.guava.common.collect.Iterators;
 import com.datastax.oss.protocol.internal.Message;
 import com.datastax.oss.protocol.internal.ProtocolConstants;
 import com.datastax.oss.protocol.internal.request.Query;
 import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterators;
 import io.netty.buffer.ByteBuf;
 import java.io.IOException;
 import java.io.UncheckedIOException;

core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphResultIterator.java

@@ -19,7 +19,7 @@
 
 import com.datastax.dse.driver.api.core.graph.GraphNode;
 import com.datastax.oss.driver.internal.core.util.CountingIterator;
-import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import java.util.Queue;
 import net.jcip.annotations.NotThreadSafe;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;

core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSON1SerdeTP.java

@@ -21,9 +21,9 @@
 import com.datastax.dse.driver.api.core.data.geometry.LineString;
 import com.datastax.dse.driver.api.core.data.geometry.Point;
 import com.datastax.dse.driver.api.core.data.geometry.Polygon;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
-import com.datastax.oss.driver.shaded.guava.common.net.InetAddresses;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.net.InetAddresses;
 import java.io.IOException;
 import java.net.Inet4Address;
 import java.net.Inet6Address;