From a230cc0b2ed23b3f49be4b9571880af8e0ea6cbf Mon Sep 17 00:00:00 2001
From: Dmitry Kropachev <dmitry.kropachev@gmail.com>
Date: Sat, 4 Oct 2025 14:27:52 -0400
Subject: [PATCH 1/2] Update guava to 33.5.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 898dcc9d8c7..bd86702a242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
         <!-- Version of Guava used in shaded module and for integration tests. -->
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>33.3.1-jre</version>
+        <version>33.5.0-jre</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe</groupId>

From 54c3f6c5f37afe8027c87cd62c236f221ef87262 Mon Sep 17 00:00:00 2001
From: Dmitry Kropachev <dmitry.kropachev@gmail.com>
Date: Sat, 4 Oct 2025 14:28:33 -0400
Subject: [PATCH 2/2] Fix regression after guava update

```
com.datastax.oss.driver.internal.core.metadata.token.NetworkTopologyReplicationStrategyTest.should_abort_early_and_log_when_bad_replication_factor_cannot_be_met -- Time elapsed: 0.007 s <<< ERROR!
org.mockito.exceptions.base.MockitoException:

Cannot mock/spy class com.datastax.oss.driver.shaded.guava.common.collect.RegularImmutableList
Mockito cannot mock/spy because :
 - final class
	at com.datastax.oss.driver.internal.core.metadata.token.NetworkTopologyReplicationStrategyTest.countTraversedTokens(NetworkTopologyReplicationStrategyTest.java:658)
	at com.datastax.oss.driver.internal.core.metadata.token.NetworkTopologyReplicationStrategyTest.should_abort_early_and_log_when_bad_replication_factor_cannot_be_met(NetworkTopologyReplicationStrategyTest.java:631)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
```
---
 .../metadata/token/NetworkTopologyReplicationStrategyTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/token/NetworkTopologyReplicationStrategyTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/token/NetworkTopologyReplicationStrategyTest.java
index 42dc5e69199..3ef68c50d5a 100644
--- a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/token/NetworkTopologyReplicationStrategyTest.java
+++ b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/token/NetworkTopologyReplicationStrategyTest.java
@@ -33,6 +33,7 @@
 import com.datastax.oss.driver.api.core.metadata.token.Token;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -655,7 +656,7 @@ private int countTraversedTokens(
       Map<Token, Node> tokenToPrimary,
       ImmutableMap<String, String> replicationConfig) {
     AtomicInteger count = new AtomicInteger();
-    List<Token> ringSpy = spy(ring);
+    List<Token> ringSpy = spy(new ArrayList<>(ring));
     when(ringSpy.get(anyInt()))
         .thenAnswer(
             invocation -> {