Skip to content

Commit 93b4c1d

Browse files
lukasz-antoniaklukasz-antoniak
committed
Declare Guava as direct core module dependency
1 parent 3ef49df commit 93b4c1d

File tree

493 files changed

+854
-1140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

493 files changed

+854
-1140
lines changed

Diff for: ‎bom/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@
5555
<artifactId>java-driver-query-builder</artifactId>
5656
<version>4.18.2-SNAPSHOT</version>
5757
</dependency>
58-
<dependency>
59-
<groupId>org.apache.cassandra</groupId>
60-
<artifactId>java-driver-guava-shaded</artifactId>
61-
<version>4.18.2-SNAPSHOT</version>
62-
</dependency>
6358
<dependency>
6459
<groupId>org.apache.cassandra</groupId>
6560
<artifactId>java-driver-test-infra</artifactId>

Diff for: ‎core-shaded/pom.xml

+16-10
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
<groupId>com.datastax.oss</groupId>
5757
<artifactId>native-protocol</artifactId>
5858
</dependency>
59-
<dependency>
60-
<groupId>org.apache.cassandra</groupId>
61-
<artifactId>java-driver-guava-shaded</artifactId>
62-
</dependency>
6359
<dependency>
6460
<groupId>com.typesafe</groupId>
6561
<artifactId>config</artifactId>
@@ -163,6 +159,7 @@
163159
- All the dependencies we want to shade & relocate.
164160
-->
165161
<include>org.apache.cassandra:java-driver-core</include>
162+
<include>com.google.guava:*</include>
166163
<include>io.netty:*</include>
167164
<include>com.fasterxml.jackson.core:*</include>
168165
</includes>
@@ -180,6 +177,10 @@
180177
<pattern>com.fasterxml.jackson</pattern>
181178
<shadedPattern>com.datastax.oss.driver.shaded.fasterxml.jackson</shadedPattern>
182179
</relocation>
180+
<relocation>
181+
<pattern>com.google</pattern>
182+
<shadedPattern>com.datastax.oss.driver.shaded.guava</shadedPattern>
183+
</relocation>
183184
</relocations>
184185
<filters>
185186
<!-- Exclude everything under META-INF -->
@@ -203,6 +204,12 @@
203204
<exclude>META-INF/**</exclude>
204205
</excludes>
205206
</filter>
207+
<filter>
208+
<artifact>com.google.guava:*</artifact>
209+
<excludes>
210+
<exclude>META-INF/**</exclude>
211+
</excludes>
212+
</filter>
206213
</filters>
207214
</configuration>
208215
</execution>
@@ -296,9 +303,8 @@
296303
<DynamicImport-Package>*</DynamicImport-Package>
297304
<Import-Package>
298305
<!--
299-
1) Don't import packages shaded in the driver bundle. Note that shaded-guava lives
300-
in its own bundle, so we must explicitly *not* mention it here.
301-
-->!com.datastax.oss.driver.shaded.netty.*, !com.datastax.oss.driver.shaded.fasterxml.jackson.*,
306+
1) Don't import packages shaded in the driver bundle.
307+
-->!com.datastax.oss.driver.shaded.netty.*, !com.datastax.oss.driver.shaded.fasterxml.jackson.*, !com.datastax.oss.driver.shaded.guava.*,
302308
<!--
303309
2) Don't include the packages below because they contain annotations only and are
304310
not required at runtime.
@@ -317,14 +323,14 @@
317323
<!--
318324
5) Don't import packages imported by shaded classes, if they are not used by the
319325
driver bundle.
320-
-->!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.*, *
326+
-->!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.*, *
321327
</Import-Package>
322328
<!--
323329
Export:
324330
1) The driver's packages (API and internal);
325-
2) All shaded packages, except Guava which resides in a separate bundle.
331+
2) All shaded packages.
326332
-->
327-
<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>
333+
<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>
328334
</instructions>
329335
<rebuildBundle>true</rebuildBundle>
330336
</configuration>

Diff for: ‎core/pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,12 @@
4949
<artifactId>netty-handler</artifactId>
5050
</dependency>
5151
<dependency>
52-
<groupId>org.apache.cassandra</groupId>
53-
<artifactId>java-driver-guava-shaded</artifactId>
52+
<groupId>com.google.guava</groupId>
53+
<artifactId>guava</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.graalvm.nativeimage</groupId>
57+
<artifactId>svm</artifactId>
5458
</dependency>
5559
<dependency>
5660
<groupId>com.typesafe</groupId>

Diff for: ‎core/revapi.json

+6
Original file line numberDiff line numberDiff line change
@@ -7089,6 +7089,12 @@
70897089
"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>)",
70907090
"annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue",
70917091
"justification": "Annotate mutating methods with @CheckReturnValue"
7092+
},
7093+
{
7094+
"code": "java.method.returnTypeChanged",
7095+
"old": "method com.datastax.oss.driver.shaded.guava.common.reflect.TypeToken<T> com.datastax.oss.driver.api.core.type.reflect.GenericType<T>::__getToken()",
7096+
"new": "method com.google.common.reflect.TypeToken<T> com.datastax.oss.driver.api.core.type.reflect.GenericType<T>::__getToken()",
7097+
"justification": "CASSJAVA-52: Move Guava as standard driver dependency (shaded only in core-shaded JAR)"
70927098
}
70937099
]
70947100
}

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderBase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import com.datastax.oss.driver.api.core.auth.Authenticator;
2323
import com.datastax.oss.driver.api.core.metadata.EndPoint;
2424
import com.datastax.oss.driver.api.core.session.Session;
25-
import com.datastax.oss.driver.shaded.guava.common.base.Charsets;
26-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
2725
import com.datastax.oss.protocol.internal.util.Bytes;
26+
import com.google.common.base.Charsets;
27+
import com.google.common.collect.ImmutableMap;
2828
import edu.umd.cs.findbugs.annotations.NonNull;
2929
import edu.umd.cs.findbugs.annotations.Nullable;
3030
import java.net.InetSocketAddress;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/auth/ProxyAuthentication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import com.datastax.dse.driver.api.core.graph.GraphStatement;
2121
import com.datastax.oss.driver.api.core.cql.Statement;
22-
import com.datastax.oss.driver.shaded.guava.common.base.Charsets;
2322
import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap;
23+
import com.google.common.base.Charsets;
2424
import edu.umd.cs.findbugs.annotations.NonNull;
2525
import java.nio.ByteBuffer;
2626
import java.util.Map;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRange.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
package com.datastax.dse.driver.api.core.data.time;
1919

20-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
21-
import com.datastax.oss.driver.shaded.guava.common.base.Strings;
20+
import com.google.common.base.Preconditions;
21+
import com.google.common.base.Strings;
2222
import edu.umd.cs.findbugs.annotations.NonNull;
2323
import edu.umd.cs.findbugs.annotations.Nullable;
2424
import java.io.Serializable;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangeBound.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.datastax.dse.driver.api.core.data.time;
1919

2020
import com.datastax.dse.driver.internal.core.search.DateRangeUtil;
21-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
21+
import com.google.common.base.Preconditions;
2222
import edu.umd.cs.findbugs.annotations.NonNull;
2323
import edu.umd.cs.findbugs.annotations.Nullable;
2424
import java.text.ParseException;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangePrecision.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
package com.datastax.dse.driver.api.core.data.time;
1919

2020
import com.datastax.dse.driver.internal.core.search.DateRangeUtil;
21-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
22-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
21+
import com.google.common.base.Preconditions;
22+
import com.google.common.collect.ImmutableMap;
2323
import edu.umd.cs.findbugs.annotations.NonNull;
2424
import java.time.ZoneOffset;
2525
import java.time.ZonedDateTime;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatement.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

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

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatementBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.datastax.dse.driver.api.core.graph;
1919

2020
import com.datastax.dse.driver.internal.core.graph.DefaultBatchGraphStatement;
21-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
21+
import com.google.common.collect.ImmutableList;
2222
import edu.umd.cs.findbugs.annotations.NonNull;
2323
import net.jcip.annotations.NotThreadSafe;
2424
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphResultSet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import com.datastax.dse.driver.internal.core.graph.GraphExecutionInfoConverter;
2121
import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
22-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
22+
import com.google.common.collect.ImmutableList;
2323
import edu.umd.cs.findbugs.annotations.NonNull;
2424
import edu.umd.cs.findbugs.annotations.Nullable;
2525
import java.util.Collections;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatementBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
package com.datastax.dse.driver.api.core.graph;
1919

2020
import com.datastax.dse.driver.internal.core.graph.DefaultScriptGraphStatement;
21-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
22-
import com.datastax.oss.driver.shaded.guava.common.collect.Maps;
21+
import com.google.common.base.Preconditions;
22+
import com.google.common.collect.Maps;
2323
import edu.umd.cs.findbugs.annotations.NonNull;
2424
import edu.umd.cs.findbugs.annotations.Nullable;
2525
import java.util.Map;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseNodeMetric.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.datastax.dse.driver.api.core.metrics;
1919

2020
import com.datastax.oss.driver.api.core.metrics.NodeMetric;
21-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
21+
import com.google.common.collect.ImmutableMap;
2222
import edu.umd.cs.findbugs.annotations.NonNull;
2323
import java.util.Map;
2424

Diff for: ‎core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseSessionMetric.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.datastax.dse.driver.api.core.metrics;
1919

2020
import com.datastax.oss.driver.api.core.metrics.SessionMetric;
21-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
21+
import com.google.common.collect.ImmutableMap;
2222
import edu.umd.cs.findbugs.annotations.NonNull;
2323
import java.util.Map;
2424

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousRequestHandlerBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
import com.datastax.oss.driver.internal.core.session.RepreparePayload;
6767
import com.datastax.oss.driver.internal.core.util.Loggers;
6868
import com.datastax.oss.driver.internal.core.util.collection.SimpleQueryPlan;
69-
import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting;
7069
import com.datastax.oss.protocol.internal.Frame;
7170
import com.datastax.oss.protocol.internal.Message;
7271
import com.datastax.oss.protocol.internal.ProtocolConstants;
@@ -77,6 +76,7 @@
7776
import com.datastax.oss.protocol.internal.response.result.Rows;
7877
import com.datastax.oss.protocol.internal.response.result.Void;
7978
import com.datastax.oss.protocol.internal.util.Bytes;
79+
import com.google.common.annotations.VisibleForTesting;
8080
import edu.umd.cs.findbugs.annotations.NonNull;
8181
import edu.umd.cs.findbugs.annotations.Nullable;
8282
import io.netty.handler.codec.EncoderException;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetSubscription.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
2525
import com.datastax.oss.driver.api.core.cql.Row;
2626
import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures;
27-
import com.datastax.oss.driver.shaded.guava.common.collect.Iterators;
27+
import com.google.common.collect.Iterators;
2828
import edu.umd.cs.findbugs.annotations.NonNull;
2929
import edu.umd.cs.findbugs.annotations.Nullable;
3030
import java.util.Collections;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultGeometry.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
import com.datastax.dse.driver.api.core.data.geometry.Geometry;
2121
import com.datastax.dse.driver.api.core.data.geometry.Point;
22-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
23-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
2422
import com.esri.core.geometry.GeometryException;
2523
import com.esri.core.geometry.SpatialReference;
2624
import com.esri.core.geometry.ogc.OGCGeometry;
2725
import com.esri.core.geometry.ogc.OGCLineString;
26+
import com.google.common.base.Preconditions;
27+
import com.google.common.collect.ImmutableList;
2828
import edu.umd.cs.findbugs.annotations.NonNull;
2929
import java.io.InvalidObjectException;
3030
import java.io.ObjectInputStream;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultLineString.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
import com.datastax.dse.driver.api.core.data.geometry.LineString;
2121
import com.datastax.dse.driver.api.core.data.geometry.Point;
22-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
2322
import com.esri.core.geometry.Polyline;
2423
import com.esri.core.geometry.ogc.OGCLineString;
24+
import com.google.common.collect.ImmutableList;
2525
import edu.umd.cs.findbugs.annotations.NonNull;
2626
import java.util.List;
2727
import net.jcip.annotations.Immutable;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPolygon.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
import com.datastax.dse.driver.api.core.data.geometry.Point;
2121
import com.datastax.dse.driver.api.core.data.geometry.Polygon;
22-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
2322
import com.esri.core.geometry.Operator;
2423
import com.esri.core.geometry.OperatorFactoryLocal;
2524
import com.esri.core.geometry.OperatorSimplifyOGC;
2625
import com.esri.core.geometry.ogc.OGCPolygon;
26+
import com.google.common.collect.ImmutableList;
2727
import edu.umd.cs.findbugs.annotations.NonNull;
2828
import java.util.Collections;
2929
import java.util.List;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/Distance.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import com.datastax.dse.driver.api.core.data.geometry.Point;
2525
import com.datastax.dse.driver.api.core.data.geometry.Polygon;
2626
import com.datastax.dse.driver.api.core.graph.predicates.Geo;
27-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
2827
import com.esri.core.geometry.MultiPath;
2928
import com.esri.core.geometry.ogc.OGCGeometry;
3029
import com.esri.core.geometry.ogc.OGCPoint;
30+
import com.google.common.base.Preconditions;
3131
import edu.umd.cs.findbugs.annotations.NonNull;
3232
import java.nio.ByteBuffer;
3333
import java.util.Objects;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousGraphRequestHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import com.datastax.oss.driver.internal.core.context.InternalDriverContext;
3333
import com.datastax.oss.driver.internal.core.cql.Conversions;
3434
import com.datastax.oss.driver.internal.core.session.DefaultSession;
35-
import com.datastax.oss.driver.shaded.guava.common.base.MoreObjects;
3635
import com.datastax.oss.protocol.internal.Message;
3736
import com.datastax.oss.protocol.internal.response.result.Rows;
37+
import com.google.common.base.MoreObjects;
3838
import edu.umd.cs.findbugs.annotations.NonNull;
3939
import java.io.IOException;
4040
import java.nio.ByteBuffer;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/graph/CqlCollectionPredicate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package com.datastax.dse.driver.internal.core.graph;
1919

20-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
20+
import com.google.common.base.Preconditions;
2121
import java.util.Collection;
2222
import java.util.Map;
2323
import java.util.Objects;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultBatchGraphStatement.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.datastax.oss.driver.api.core.ConsistencyLevel;
2222
import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
2323
import com.datastax.oss.driver.api.core.metadata.Node;
24-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
24+
import com.google.common.collect.ImmutableList;
2525
import edu.umd.cs.findbugs.annotations.NonNull;
2626
import java.nio.ByteBuffer;
2727
import java.time.Duration;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/graph/DsePredicate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package com.datastax.dse.driver.internal.core.graph;
1919

20-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
20+
import com.google.common.base.Preconditions;
2121
import java.util.function.BiPredicate;
2222

2323
/**

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/graph/EditDistance.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
package com.datastax.dse.driver.internal.core.graph;
1919

20-
import com.datastax.oss.driver.shaded.guava.common.base.Objects;
21-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
20+
import com.google.common.base.Objects;
21+
import com.google.common.base.Preconditions;
2222
import java.io.Serializable;
2323
import net.jcip.annotations.Immutable;
2424

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/graph/GeoPredicate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.datastax.dse.driver.api.core.data.geometry.Polygon;
2424
import com.datastax.dse.driver.api.core.graph.predicates.Geo;
2525
import com.datastax.dse.driver.internal.core.data.geometry.Distance;
26-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
26+
import com.google.common.base.Preconditions;
2727

2828
/**
2929
* List of predicates for geolocation usage with DseGraph and Search indexes. Should not be accessed

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphConversions.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
import com.datastax.oss.driver.api.core.type.codec.TypeCodecs;
4040
import com.datastax.oss.driver.internal.core.context.InternalDriverContext;
4141
import com.datastax.oss.driver.internal.core.cql.Conversions;
42-
import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting;
43-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
44-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
45-
import com.datastax.oss.driver.shaded.guava.common.collect.Iterators;
4642
import com.datastax.oss.protocol.internal.Message;
4743
import com.datastax.oss.protocol.internal.ProtocolConstants;
4844
import com.datastax.oss.protocol.internal.request.Query;
4945
import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap;
46+
import com.google.common.annotations.VisibleForTesting;
47+
import com.google.common.base.Preconditions;
48+
import com.google.common.collect.ImmutableList;
49+
import com.google.common.collect.Iterators;
5050
import io.netty.buffer.ByteBuf;
5151
import java.io.IOException;
5252
import java.io.UncheckedIOException;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphResultIterator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import com.datastax.dse.driver.api.core.graph.GraphNode;
2121
import com.datastax.oss.driver.internal.core.util.CountingIterator;
22-
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
22+
import com.google.common.base.Preconditions;
2323
import java.util.Queue;
2424
import net.jcip.annotations.NotThreadSafe;
2525
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;

Diff for: ‎core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSON1SerdeTP.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import com.datastax.dse.driver.api.core.data.geometry.LineString;
2222
import com.datastax.dse.driver.api.core.data.geometry.Point;
2323
import com.datastax.dse.driver.api.core.data.geometry.Polygon;
24-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
25-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
26-
import com.datastax.oss.driver.shaded.guava.common.net.InetAddresses;
24+
import com.google.common.collect.ImmutableList;
25+
import com.google.common.collect.ImmutableMap;
26+
import com.google.common.net.InetAddresses;
2727
import java.io.IOException;
2828
import java.net.Inet4Address;
2929
import java.net.Inet6Address;

0 commit comments

Comments
 (0)