Skip to content

Commit db7ccfd

Browse files
olim7tolim7t
committed
JAVA-1787: Use standalone shaded Guava artifact
1 parent c562085 commit db7ccfd

195 files changed

Lines changed: 348 additions & 340 deletions

File tree

Some content is hidden

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

‎changelog/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### 4.0.0-alpha4 (in progress)
66

7+
- [improvement] JAVA-1787: Use standalone shaded Guava artifact
78
- [improvement] JAVA-1769: Allocate exact buffer size for outgoing requests
89
- [documentation] JAVA-1780: Add manual section about case sensitivity
910
- [new feature] JAVA-1536: Add request throttling

‎core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<artifactId>netty-handler</artifactId>
4040
</dependency>
4141
<dependency>
42-
<groupId>com.google.guava</groupId>
43-
<artifactId>guava</artifactId>
42+
<groupId>com.datastax.oss</groupId>
43+
<artifactId>java-driver-shaded-guava</artifactId>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.typesafe</groupId>

‎core/src/main/java/com/datastax/oss/driver/api/core/AllNodesFailedException.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
package com.datastax.oss.driver.api.core;
1717

1818
import com.datastax.oss.driver.api.core.metadata.Node;
19-
import com.google.common.base.Joiner;
20-
import com.google.common.collect.ImmutableMap;
21-
import com.google.common.collect.Iterables;
19+
import com.datastax.oss.driver.shaded.guava.common.base.Joiner;
20+
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
21+
import com.datastax.oss.driver.shaded.guava.common.collect.Iterables;
2222
import java.util.List;
2323
import java.util.Map;
2424

‎core/src/main/java/com/datastax/oss/driver/api/core/CqlIdentifier.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.datastax.oss.driver.api.core;
1717

1818
import com.datastax.oss.driver.internal.core.util.Strings;
19-
import com.google.common.base.Preconditions;
19+
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
2020
import java.io.IOException;
2121
import java.io.ObjectInputStream;
2222
import java.io.Serializable;

‎core/src/main/java/com/datastax/oss/driver/api/core/DefaultConsistencyLevel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package com.datastax.oss.driver.api.core;
1717

18+
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
1819
import com.datastax.oss.protocol.internal.ProtocolConstants;
19-
import com.google.common.collect.ImmutableMap;
2020
import java.util.Map;
2121

2222
/** A default consistency level supported by the driver out of the box. */

‎core/src/main/java/com/datastax/oss/driver/api/core/UnsupportedProtocolVersionException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.datastax.oss.driver.api.core;
1717

18-
import com.google.common.collect.ImmutableList;
18+
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
1919
import java.net.SocketAddress;
2020
import java.util.Collections;
2121
import java.util.List;

‎core/src/main/java/com/datastax/oss/driver/api/core/auth/PlainTextAuthProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
1919
import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
2020
import com.datastax.oss.driver.api.core.context.DriverContext;
21-
import com.google.common.base.Charsets;
21+
import com.datastax.oss.driver.shaded.guava.common.base.Charsets;
2222
import java.net.SocketAddress;
2323
import java.nio.ByteBuffer;
2424

‎core/src/main/java/com/datastax/oss/driver/api/core/connection/ExponentialReconnectionPolicy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
1919
import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
2020
import com.datastax.oss.driver.api.core.context.DriverContext;
21-
import com.google.common.base.Preconditions;
21+
import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
2222
import java.time.Duration;
2323

2424
/**

‎core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatement.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.datastax.oss.driver.api.core.DefaultProtocolVersion;
2020
import com.datastax.oss.driver.api.core.session.Request;
2121
import com.datastax.oss.driver.internal.core.cql.DefaultBatchStatement;
22-
import com.google.common.collect.ImmutableList;
22+
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
2323
import java.util.ArrayList;
2424
import java.util.Arrays;
2525
import java.util.Collections;

‎core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatementBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import com.datastax.oss.driver.api.core.CqlIdentifier;
1919
import com.datastax.oss.driver.internal.core.cql.DefaultBatchStatement;
20-
import com.google.common.collect.ImmutableList;
21-
import com.google.common.collect.Iterables;
20+
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
21+
import com.datastax.oss.driver.shaded.guava.common.collect.Iterables;
2222
import java.util.Arrays;
2323

2424
public class BatchStatementBuilder extends StatementBuilder<BatchStatementBuilder, BatchStatement> {

0 commit comments

Comments
 (0)