From 027f92cf32fee8217d2075db61fe0be58d43a40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Wed, 3 Jul 2024 20:34:19 +0200
Subject: [PATCH] fix: SessionPoolOptions.Builder#toBuilder() skipped
 useMultiplexedSessions (#3197)

Calling toBuilder() on a SessionPoolOptions.Builder with useMultiplexedSessions=true returned a Builder instance with useMultiplexedSessions=false.
---
 .../cloud/spanner/SessionPoolOptions.java     |  2 +
 .../cloud/spanner/SessionPoolOptionsTest.java | 91 +++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
index 2a065c8b2ce..ba2eedbccb8 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
@@ -569,6 +569,8 @@ private Builder(SessionPoolOptions options) {
       this.acquireSessionTimeout = options.acquireSessionTimeout;
       this.randomizePositionQPSThreshold = options.randomizePositionQPSThreshold;
       this.inactiveTransactionRemovalOptions = options.inactiveTransactionRemovalOptions;
+      this.useMultiplexedSession = options.useMultiplexedSession;
+      this.multiplexedSessionMaintenanceDuration = options.multiplexedSessionMaintenanceDuration;
       this.poolMaintainerClock = options.poolMaintainerClock;
     }
 
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java
index b678d6e46bc..82cc5f8ea31 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java
@@ -318,4 +318,95 @@ public void testMultiplexedSessionMaintenanceDuration() {
             .build()
             .getMultiplexedSessionMaintenanceDuration());
   }
+
+  @Test
+  public void testToBuilder() {
+    assertToBuilderRoundtrip(SessionPoolOptions.newBuilder().build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setUseMultiplexedSession(ThreadLocalRandom.current().nextBoolean())
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setMinSessions(ThreadLocalRandom.current().nextInt(400))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setMaxSessions(ThreadLocalRandom.current().nextInt(1000))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setIncStep(ThreadLocalRandom.current().nextInt(1000))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setMaxIdleSessions(ThreadLocalRandom.current().nextInt(1000))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setWriteSessionsFraction(ThreadLocalRandom.current().nextFloat())
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setInactiveTransactionRemovalOptions(
+                InactiveTransactionRemovalOptions.newBuilder()
+                    .setUsedSessionsRatioThreshold(ThreadLocalRandom.current().nextDouble())
+                    .build())
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setLoopFrequency(ThreadLocalRandom.current().nextInt(1000))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setMultiplexedSessionMaintenanceLoopFrequency(
+                java.time.Duration.ofMillis(ThreadLocalRandom.current().nextInt(1000)))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setKeepAliveIntervalMinutes(ThreadLocalRandom.current().nextInt(60))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setRemoveInactiveSessionAfter(
+                Duration.ofMillis(ThreadLocalRandom.current().nextLong(10000)))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder().setCloseIfInactiveTransactions().build());
+    assertToBuilderRoundtrip(SessionPoolOptions.newBuilder().setFailOnSessionLeak().build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setTrackStackTraceOfSessionCheckout(ThreadLocalRandom.current().nextBoolean())
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setInitialWaitForSessionTimeoutMillis(ThreadLocalRandom.current().nextLong(1000))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setAutoDetectDialect(ThreadLocalRandom.current().nextBoolean())
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setWaitForMinSessions(Duration.ofMillis(ThreadLocalRandom.current().nextLong(10000)))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setAcquireSessionTimeout(
+                Duration.ofMillis(ThreadLocalRandom.current().nextLong(10000)))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setRandomizePositionQPSThreshold(ThreadLocalRandom.current().nextLong(10000))
+            .build());
+    assertToBuilderRoundtrip(
+        SessionPoolOptions.newBuilder()
+            .setMultiplexedSessionMaintenanceDuration(
+                Duration.ofMillis(ThreadLocalRandom.current().nextLong(10000)))
+            .build());
+  }
+
+  static void assertToBuilderRoundtrip(SessionPoolOptions options) {
+    assertEquals(options, options.toBuilder().build());
+  }
 }