chore: generate libraries at Wed Sep 24 11:06:43 UTC 2025

Author: cloud-java-bot

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java

@@ -834,9 +834,7 @@ protected SpannerOptions(Builder builder) {
 
   private String getResolvedUniverseDomain() {
     String universeDomain = getUniverseDomain();
-    return Strings.isNullOrEmpty(universeDomain)
-        ? GOOGLE_DEFAULT_UNIVERSE
-        : universeDomain;
+    return Strings.isNullOrEmpty(universeDomain) ? GOOGLE_DEFAULT_UNIVERSE : universeDomain;
   }
 
   /**

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionOptionsTest.java

@@ -1339,62 +1339,73 @@ public void testUniverseDomain() {
 
     // No universeDomain
     AtomicBoolean executedConfigurator = new AtomicBoolean(false);
-    ConnectionOptions optionsWithNoUniverseDomainParam = ConnectionOptions.newBuilder()
-      .setUri("cloudspanner:/projects/default/instances/default/databases/singers-db")
-        .setConfigurator(optionsBuilder -> {
-          executedConfigurator.set(true);
-          SpannerOptions spannerOptions = optionsBuilder.build();
-          assertEquals("googleapis.com", spannerOptions.getUniverseDomain());
-          assertEquals("https://spanner.googleapis.com", spannerOptions.getHost());
-        })
-        .build();
+    ConnectionOptions optionsWithNoUniverseDomainParam =
+        ConnectionOptions.newBuilder()
+            .setUri("cloudspanner:/projects/default/instances/default/databases/singers-db")
+            .setConfigurator(
+                optionsBuilder -> {
+                  executedConfigurator.set(true);
+                  SpannerOptions spannerOptions = optionsBuilder.build();
+                  assertEquals("googleapis.com", spannerOptions.getUniverseDomain());
+                  assertEquals("https://spanner.googleapis.com", spannerOptions.getHost());
+                })
+            .build();
     Spanner spanner = SpannerPool.INSTANCE.getSpanner(optionsWithNoUniverseDomainParam, connection);
     spanner.close();
     assertTrue(executedConfigurator.get());
 
     executedConfigurator.set(false);
-    ConnectionOptions optionsWithUniverseDomainParam = ConnectionOptions.newBuilder()
-        .setUri("cloudspanner:/projects/default/instances/default/databases/singers-db;universeDomain=abc.goog")
-        .setConfigurator(optionsBuilder -> {
-          executedConfigurator.set(true);
-          SpannerOptions spannerOptions = optionsBuilder.build();
-          assertEquals("abc.goog", spannerOptions.getUniverseDomain());
-          assertEquals("https://spanner.abc.goog", spannerOptions.getHost());
-        })
-        .build();
+    ConnectionOptions optionsWithUniverseDomainParam =
+        ConnectionOptions.newBuilder()
+            .setUri(
+                "cloudspanner:/projects/default/instances/default/databases/singers-db;universeDomain=abc.goog")
+            .setConfigurator(
+                optionsBuilder -> {
+                  executedConfigurator.set(true);
+                  SpannerOptions spannerOptions = optionsBuilder.build();
+                  assertEquals("abc.goog", spannerOptions.getUniverseDomain());
+                  assertEquals("https://spanner.abc.goog", spannerOptions.getHost());
+                })
+            .build();
     spanner = SpannerPool.INSTANCE.getSpanner(optionsWithUniverseDomainParam, connection);
     spanner.close();
     assertTrue(executedConfigurator.get());
 
     executedConfigurator.set(false);
-    ConnectionOptions optionsWithHostAndUniverseDomainParam = ConnectionOptions.newBuilder()
-        .setUri("cloudspanner://spanner.abc.goog/projects/default/instances/default/databases/singers-db;universeDomain=abc.goog")
-        .setConfigurator(optionsBuilder -> {
-          executedConfigurator.set(true);
-          SpannerOptions spannerOptions = optionsBuilder.build();
-          assertEquals("abc.goog", spannerOptions.getUniverseDomain());
-          assertEquals("https://spanner.abc.goog", spannerOptions.getHost());
-        })
-        .build();
+    ConnectionOptions optionsWithHostAndUniverseDomainParam =
+        ConnectionOptions.newBuilder()
+            .setUri(
+                "cloudspanner://spanner.abc.goog/projects/default/instances/default/databases/singers-db;universeDomain=abc.goog")
+            .setConfigurator(
+                optionsBuilder -> {
+                  executedConfigurator.set(true);
+                  SpannerOptions spannerOptions = optionsBuilder.build();
+                  assertEquals("abc.goog", spannerOptions.getUniverseDomain());
+                  assertEquals("https://spanner.abc.goog", spannerOptions.getHost());
+                })
+            .build();
     spanner = SpannerPool.INSTANCE.getSpanner(optionsWithHostAndUniverseDomainParam, connection);
     spanner.close();
     assertTrue(executedConfigurator.get());
 
     executedConfigurator.set(false);
-    ConnectionOptions optionsWithLocalHostAndUniverseDomainParam = ConnectionOptions.newBuilder()
-        .setUri("cloudspanner://localhost:15000/projects/default/instances/default/databases/singers-db;usePlainText=true;universeDomain=abc.goog")
-        .setConfigurator(optionsBuilder -> {
-          executedConfigurator.set(true);
-          SpannerOptions spannerOptions = optionsBuilder.build();
-          assertEquals("abc.goog", spannerOptions.getUniverseDomain());
-          assertEquals("http://localhost:15000", spannerOptions.getHost());
-        })
-        .build();
-    spanner = SpannerPool.INSTANCE.getSpanner(optionsWithLocalHostAndUniverseDomainParam, connection);
+    ConnectionOptions optionsWithLocalHostAndUniverseDomainParam =
+        ConnectionOptions.newBuilder()
+            .setUri(
+                "cloudspanner://localhost:15000/projects/default/instances/default/databases/singers-db;usePlainText=true;universeDomain=abc.goog")
+            .setConfigurator(
+                optionsBuilder -> {
+                  executedConfigurator.set(true);
+                  SpannerOptions spannerOptions = optionsBuilder.build();
+                  assertEquals("abc.goog", spannerOptions.getUniverseDomain());
+                  assertEquals("http://localhost:15000", spannerOptions.getHost());
+                })
+            .build();
+    spanner =
+        SpannerPool.INSTANCE.getSpanner(optionsWithLocalHostAndUniverseDomainParam, connection);
     spanner.close();
     assertTrue(executedConfigurator.get());
 
-
     connection.close();
   }
 }