Fix test cases

Author: cloud-java-bot

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

@@ -88,7 +88,7 @@ static SpannerCloudMonitoringExporter create(
     if (monitoringHost != null) {
       settingsBuilder.setEndpoint(monitoringHost);
     }
-    if (Strings.isNullOrEmpty(universeDomain)) {
+    if (!Strings.isNullOrEmpty(universeDomain)) {
       settingsBuilder.setUniverseDomain(universeDomain);
     }
 
@@ -117,6 +117,11 @@ public CompletableResultCode export(@Nonnull Collection<MetricData> collection)
     return exportSpannerClientMetrics(collection);
   }
 
+  @VisibleForTesting
+  MetricServiceClient getMetricServiceClient() {
+    return client;
+  }
+
   /** Export client built in metrics */
   private CompletableResultCode exportSpannerClientMetrics(Collection<MetricData> collection) {
     // Filter spanner metrics. Only include metrics that contain a valid project.

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

@@ -887,7 +887,9 @@ default boolean isEnableEndToEndTracing() {
     }
 
     @Deprecated
-    @ObsoleteApi("This will be removed in upcoming version without breaking change release. You should use universalDomain to configure the built-in metrics endpoint for a partner universe.")
+    @ObsoleteApi(
+        "This will be removed in an upcoming version without a major version bump. You should use"
+            + " universalDomain to configure the built-in metrics endpoint for a partner universe.")
     default String getMonitoringHost() {
       return null;
     }
@@ -1683,7 +1685,9 @@ public Builder setBuiltInMetricsEnabled(boolean enableBuiltInMetrics) {
 
     /** Sets the monitoring host to be used for Built-in client side metrics */
     @Deprecated
-    @ObsoleteApi("This will be removed in upcoming version without breaking change release. You should use universalDomain to configure the built-in metrics endpoint for a partner universe.")
+    @ObsoleteApi(
+        "This will be removed in an upcoming version without a major version bump. You should use"
+            + " universalDomain to configure the built-in metrics endpoint for a partner universe.")
     public Builder setMonitoringHost(String monitoringHost) {
       this.monitoringHost = monitoringHost;
       return this;

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java

@@ -77,6 +77,7 @@
 import com.google.cloud.spanner.SpannerOptions;
 import com.google.cloud.spanner.connection.StatementExecutor.StatementExecutorType;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.base.Suppliers;
@@ -970,7 +971,7 @@ public TransportChannelProvider getChannelProvider() {
       return null;
     }
     try {
-      URL url = new URL(host);
+      URL url = new URL(MoreObjects.firstNonNull(host, DEFAULT_HOST));
       ExternalChannelProvider provider =
           ExternalChannelProvider.class.cast(Class.forName(channelProvider).newInstance());
       return provider.getChannelProvider(url.getHost(), url.getPort());

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerCloudMonitoringExporterTest.java

@@ -30,6 +30,7 @@
 import static com.google.cloud.spanner.BuiltInMetricsConstant.OPERATION_LATENCIES_NAME;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.PROJECT_ID_KEY;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -39,6 +40,7 @@
 import com.google.api.core.ApiFutures;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.monitoring.v3.MetricServiceClient;
+import com.google.cloud.monitoring.v3.MetricServiceSettings;
 import com.google.cloud.monitoring.v3.stub.MetricServiceStub;
 import com.google.common.collect.ImmutableList;
 import com.google.monitoring.v3.CreateTimeSeriesRequest;
@@ -459,6 +461,25 @@ public void getAggregationTemporality() throws IOException {
         .isEqualTo(AggregationTemporality.CUMULATIVE);
   }
 
+  @Test
+  public void testUniverseDomain() throws IOException {
+    SpannerCloudMonitoringExporter actualExporter =
+        SpannerCloudMonitoringExporter.create(projectId, null, null, "abc.goog");
+    MetricServiceSettings metricServiceSettings =
+        actualExporter.getMetricServiceClient().getSettings();
+
+    assertEquals("abc.goog", metricServiceSettings.getUniverseDomain());
+    assertEquals("monitoring.abc.goog:443", metricServiceSettings.getEndpoint());
+
+    actualExporter =
+        SpannerCloudMonitoringExporter.create(
+            projectId, null, "monitoringa.abc.goog:443", "abc.goog");
+    metricServiceSettings = actualExporter.getMetricServiceClient().getSettings();
+
+    assertEquals("abc.goog", metricServiceSettings.getUniverseDomain());
+    assertEquals("monitoringa.abc.goog:443", metricServiceSettings.getEndpoint());
+  }
+
   private static class FakeMetricServiceClient extends MetricServiceClient {
 
     protected FakeMetricServiceClient(MetricServiceStub stub) {

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java

@@ -761,11 +761,11 @@ public void testMonitoringHost() {
     String metricsEndpoint = "test-endpoint:443";
     assertNull(SpannerOptions.newBuilder().setProjectId("p").build().getMonitoringHost());
     assertThat(
-        SpannerOptions.newBuilder()
-            .setProjectId("p")
-            .setMonitoringHost(metricsEndpoint)
-            .build()
-            .getMonitoringHost())
+            SpannerOptions.newBuilder()
+                .setProjectId("p")
+                .setMonitoringHost(metricsEndpoint)
+                .build()
+                .getMonitoringHost())
         .isEqualTo(metricsEndpoint);
   }
 

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

@@ -60,7 +60,7 @@
 public class ConnectionOptionsTest {
   private static final String FILE_TEST_PATH =
       Objects.requireNonNull(ConnectionOptionsTest.class.getResource("test-key.json")).getFile();
-  private static final String DEFAULT_HOST = "https://spanner.googleapis.com";
+  private static final String DEFAULT_HOST = null;
   private static final String TEST_PROJECT = "test-project-123";
   private static final String TEST_INSTANCE = "test-instance-123";
   private static final String TEST_DATABASE = "test-database-123";
@@ -1341,7 +1341,8 @@ public void testUniverseDomain() {
     AtomicBoolean executedConfigurator = new AtomicBoolean(false);
     ConnectionOptions optionsWithNoUniverseDomainParam =
         ConnectionOptions.newBuilder()
-            .setUri("cloudspanner:/projects/default/instances/default/databases/singers-db")
+            .setUri(
+                "cloudspanner:/projects/default/instances/default/databases/singers-db?usePlainText=true")
             .setConfigurator(
                 optionsBuilder -> {
                   executedConfigurator.set(true);
@@ -1352,14 +1353,15 @@ public void testUniverseDomain() {
             .build();
     Spanner spanner = SpannerPool.INSTANCE.getSpanner(optionsWithNoUniverseDomainParam, connection);
     spanner.close();
+    SpannerPool.INSTANCE.removeConnection(optionsWithNoUniverseDomainParam, connection);
     assertTrue(executedConfigurator.get());
 
     // only configuring universal domain
     executedConfigurator.set(false);
     ConnectionOptions optionsWithUniverseDomainParam =
         ConnectionOptions.newBuilder()
             .setUri(
-                "cloudspanner:/projects/default/instances/default/databases/singers-db;universeDomain=abc.goog")
+                "cloudspanner:/projects/default/instances/default/databases/singers-db;universeDomain=abc.goog;usePlainText=true")
             .setConfigurator(
                 optionsBuilder -> {
                   executedConfigurator.set(true);
@@ -1370,24 +1372,26 @@ public void testUniverseDomain() {
             .build();
     spanner = SpannerPool.INSTANCE.getSpanner(optionsWithUniverseDomainParam, connection);
     spanner.close();
+    SpannerPool.INSTANCE.removeConnection(optionsWithUniverseDomainParam, connection);
     assertTrue(executedConfigurator.get());
 
     // configuring both universal domain and host
     executedConfigurator.set(false);
     ConnectionOptions optionsWithHostAndUniverseDomainParam =
         ConnectionOptions.newBuilder()
             .setUri(
-                "cloudspanner://spanner.abc.goog/projects/default/instances/default/databases/singers-db;universeDomain=abc.goog")
+                "cloudspanner://spanner.abc.goog/projects/default/instances/default/databases/singers-db;universeDomain=abc.goog;usePlainText=true")
             .setConfigurator(
                 optionsBuilder -> {
                   executedConfigurator.set(true);
                   SpannerOptions spannerOptions = optionsBuilder.build();
                   assertEquals("abc.goog", spannerOptions.getUniverseDomain());
-                  assertEquals("https://spanner.abc.goog", spannerOptions.getHost());
+                  assertEquals("http://spanner.abc.goog", spannerOptions.getHost());
                 })
             .build();
     spanner = SpannerPool.INSTANCE.getSpanner(optionsWithHostAndUniverseDomainParam, connection);
     spanner.close();
+    SpannerPool.INSTANCE.removeConnection(optionsWithHostAndUniverseDomainParam, connection);
     assertTrue(executedConfigurator.get());
 
     // configuring both universal domain and host(localhost)
@@ -1407,6 +1411,7 @@ public void testUniverseDomain() {
     spanner =
         SpannerPool.INSTANCE.getSpanner(optionsWithLocalHostAndUniverseDomainParam, connection);
     spanner.close();
+    SpannerPool.INSTANCE.removeConnection(optionsWithLocalHostAndUniverseDomainParam, connection);
     assertTrue(executedConfigurator.get());
 
     connection.close();