support for both prefix spanner/cloudspanner

Author: sagnghos

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

@@ -640,10 +640,10 @@ private Builder() {}
 
     /** Spanner {@link ConnectionOptions} URI format. */
     public static final String SPANNER_URI_FORMAT =
-        "(?:cloudspanner:)(?<HOSTGROUP>//[\\w.-]+(?:\\.[\\w\\.-]+)*[\\w\\-\\._~:/?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=.]+)?/projects/(?<PROJECTGROUP>(([a-z]|[-.:]|[0-9])+|(DEFAULT_PROJECT_ID)))(/instances/(?<INSTANCEGROUP>([a-z]|[-]|[0-9])+)(/databases/(?<DATABASEGROUP>([a-z]|[-]|[_]|[0-9])+))?)?(?:[?|;].*)?";
+        "(?:(?:spanner|cloudspanner):)(?<HOSTGROUP>//[\\w.-]+(?:\\.[\\w\\.-]+)*[\\w\\-\\._~:/?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=.]+)?/projects/(?<PROJECTGROUP>(([a-z]|[-.:]|[0-9])+|(DEFAULT_PROJECT_ID)))(/instances/(?<INSTANCEGROUP>([a-z]|[-]|[0-9])+)(/databases/(?<DATABASEGROUP>([a-z]|[-]|[_]|[0-9])+))?)?(?:[?|;].*)?";
 
     public static final String EXTERNAL_HOST_FORMAT =
-        "(?:spanner:)(?<HOSTGROUP>//[\\w.-]+(?::\\d+)?)(/instances/(?<INSTANCEGROUP>[a-z0-9-]+))?(/databases/(?<DATABASEGROUP>[a-z0-9_-]+))(?:[?;].*)?";
+        "(?:(?:spanner|cloudspanner):)(?<HOSTGROUP>//[\\w.-]+(?::\\d+)?)(/instances/(?<INSTANCEGROUP>[a-z0-9-]+))?(/databases/(?<DATABASEGROUP>[a-z0-9_-]+))(?:[?;].*)?";
     private static final String SPANNER_URI_REGEX = "(?is)^" + SPANNER_URI_FORMAT + "$";
 
     @VisibleForTesting

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

@@ -1216,18 +1216,19 @@ public void testEnableApiTracing() {
   @Test
   public void testExternalHostPatterns() {
     Matcher matcherWithoutInstance =
-        EXTERNAL_HOST_PATTERN.matcher("spanner://localhost:15000/databases/test-db");
+        EXTERNAL_HOST_PATTERN.matcher("cloudspanner://localhost:15000/databases/test-db");
     assertTrue(matcherWithoutInstance.matches());
     assertNull(matcherWithoutInstance.group("INSTANCEGROUP"));
     assertEquals("test-db", matcherWithoutInstance.group("DATABASEGROUP"));
     Matcher matcherWithProperty =
         EXTERNAL_HOST_PATTERN.matcher(
-            "spanner://localhost:15000/instances/default/databases/singers-db?usePlainText=true");
+            "cloudspanner://localhost:15000/instances/default/databases/singers-db?usePlainText=true");
     assertTrue(matcherWithProperty.matches());
     assertEquals("default", matcherWithProperty.group("INSTANCEGROUP"));
     assertEquals("singers-db", matcherWithProperty.group("DATABASEGROUP"));
     Matcher matcherWithoutPort =
-        EXTERNAL_HOST_PATTERN.matcher("spanner://localhost/instances/default/databases/test-db");
+        EXTERNAL_HOST_PATTERN.matcher(
+            "cloudspanner://localhost/instances/default/databases/test-db");
     assertTrue(matcherWithoutPort.matches());
     assertEquals("default", matcherWithoutPort.group("INSTANCEGROUP"));
     assertEquals("test-db", matcherWithoutPort.group("DATABASEGROUP"));
@@ -1241,10 +1242,15 @@ public void testExternalHostPatterns() {
             ImmutableMap.of()));
     Matcher matcherWithProject =
         EXTERNAL_HOST_PATTERN.matcher(
-            "spanner://localhost:15000/projects/default/instances/default/databases/singers-db");
+            "cloudspanner://localhost:15000/projects/default/instances/default/databases/singers-db");
     assertFalse(matcherWithProject.matches());
     Matcher matcherWithoutHost =
-        EXTERNAL_HOST_PATTERN.matcher("spanner:/instances/default/databases/singers-db");
+        EXTERNAL_HOST_PATTERN.matcher("cloudspanner:/instances/default/databases/singers-db");
     assertFalse(matcherWithoutHost.matches());
+    Matcher matcherWithPrefixSpanner =
+        EXTERNAL_HOST_PATTERN.matcher("spanner://localhost:15000/databases/test-db");
+    assertTrue(matcherWithPrefixSpanner.matches());
+    assertNull(matcherWithPrefixSpanner.group("INSTANCEGROUP"));
+    assertEquals("test-db", matcherWithPrefixSpanner.group("DATABASEGROUP"));
   }
 }