feat: support option for setting client-id

Author: aakashanandg

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

@@ -125,10 +125,9 @@ public interface Spanner extends Service<SpannerOptions>, AutoCloseable {
    */
   DatabaseClient getDatabaseClient(DatabaseId db);
 
-
   /**
-   * Returns a {@code DatabaseClient} for the given database and given client id. It uses a pool of sessions to talk to
-   * the database.
+   * Returns a {@code DatabaseClient} for the given database and given client id. It uses a pool of
+   * sessions to talk to the database.
    * <!--SNIPPET get_db_client-->
    *
    * <pre>{@code

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

@@ -108,7 +108,6 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Stack;
@@ -254,8 +253,7 @@ static UnitOfWorkType of(TransactionMode transactionMode) {
     }
   }
 
-  private StatementTimeout statementTimeout =
-      new StatementTimeout();
+  private StatementTimeout statementTimeout = new StatementTimeout();
   private boolean closed = false;
 
   private final Spanner spanner;
@@ -330,14 +328,15 @@ static UnitOfWorkType of(TransactionMode transactionMode) {
     final DatabaseId databaseId = options.getDatabaseId();
     try {
       Optional<String> clientIdOpt = extractClientIdOptional(options);
-      if(clientIdOpt.isPresent()) {
+      if (clientIdOpt.isPresent()) {
         tempDbClient = spanner.getDatabaseClient(databaseId, clientIdOpt.get());
       }
-    } catch(Exception e) {
-      System.err.println("WARNING: Failed during DatabaseClient initialization (possibly getting specific ID), falling back to default. Error: "
-          + e.getMessage());
+    } catch (Exception e) {
+      System.err.println(
+          "WARNING: Failed during DatabaseClient initialization (possibly getting specific ID), falling back to default. Error: "
+              + e.getMessage());
     }
-    if(tempDbClient == null) {
+    if (tempDbClient == null) {
       tempDbClient = spanner.getDatabaseClient(databaseId);
     }
     this.dbClient = tempDbClient;
@@ -566,8 +565,7 @@ public boolean isClosed() {
     return closed;
   }
 
-  private <T> T getConnectionPropertyValue(
-      ConnectionProperty<T> property) {
+  private <T> T getConnectionPropertyValue(ConnectionProperty<T> property) {
     return this.connectionState.getValue(property).getValue();
   }
 
@@ -587,9 +585,8 @@ private <T> void setConnectionPropertyValue(
   /**
    * Sets a connection property value only for the duration of the current transaction. The effects
    * of this will be undone once the transaction ends, regardless whether the transaction is
-   * committed or rolled back. 'Local' properties are supported for both {@link
-   * Type#TRANSACTIONAL} and {@link
-   * Type#NON_TRANSACTIONAL} connection states.
+   * committed or rolled back. 'Local' properties are supported for both {@link Type#TRANSACTIONAL}
+   * and {@link Type#NON_TRANSACTIONAL} connection states.
    *
    * <p>NOTE: This feature is not yet exposed in the public API.
    */

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

@@ -21,6 +21,7 @@
 import static com.google.cloud.spanner.connection.ConnectionProperties.AUTO_PARTITION_MODE;
 import static com.google.cloud.spanner.connection.ConnectionProperties.CHANNEL_PROVIDER;
 import static com.google.cloud.spanner.connection.ConnectionProperties.CLIENT_CERTIFICATE;
+import static com.google.cloud.spanner.connection.ConnectionProperties.CLIENT_ID;
 import static com.google.cloud.spanner.connection.ConnectionProperties.CLIENT_KEY;
 import static com.google.cloud.spanner.connection.ConnectionProperties.CREDENTIALS_PROVIDER;
 import static com.google.cloud.spanner.connection.ConnectionProperties.CREDENTIALS_URL;
@@ -46,7 +47,6 @@
 import static com.google.cloud.spanner.connection.ConnectionProperties.RETURN_COMMIT_STATS;
 import static com.google.cloud.spanner.connection.ConnectionProperties.ROUTE_TO_LEADER;
 import static com.google.cloud.spanner.connection.ConnectionProperties.TRACING_PREFIX;
-import static com.google.cloud.spanner.connection.ConnectionProperties.CLIENT_ID;
 import static com.google.cloud.spanner.connection.ConnectionProperties.TRACK_CONNECTION_LEAKS;
 import static com.google.cloud.spanner.connection.ConnectionProperties.TRACK_SESSION_LEAKS;
 import static com.google.cloud.spanner.connection.ConnectionProperties.USER_AGENT;

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

@@ -370,18 +370,21 @@ public void testGetDatabaseClient_when_clientId_is_not_null() {
         .thenReturn(SessionPoolOptions.newBuilder().setMinSessions(0).build());
     Mockito.when(spannerOptions.getDatabaseRole()).thenReturn("role");
 
-    DatabaseClientImpl databaseClient = (DatabaseClientImpl) impl.getDatabaseClient(db, "clientId-1");
+    DatabaseClientImpl databaseClient =
+        (DatabaseClientImpl) impl.getDatabaseClient(db, "clientId-1");
     assertThat(databaseClient.clientId).isEqualTo("clientId-1");
 
     // Get same db client again.
-    DatabaseClientImpl databaseClient1 = (DatabaseClientImpl) impl.getDatabaseClient(db, "clientId-1");
+    DatabaseClientImpl databaseClient1 =
+        (DatabaseClientImpl) impl.getDatabaseClient(db, "clientId-1");
     assertThat(databaseClient1.clientId).isEqualTo(databaseClient.clientId);
 
     // Get a db client for a different database.
     String dbName2 =
         String.format("projects/p1/instances/i1/databases/%s", UUID.randomUUID().toString());
     DatabaseId db2 = DatabaseId.of(dbName2);
-    DatabaseClientImpl databaseClient2 = (DatabaseClientImpl) impl.getDatabaseClient(db2, "clientId-1");
+    DatabaseClientImpl databaseClient2 =
+        (DatabaseClientImpl) impl.getDatabaseClient(db2, "clientId-1");
     assertThat(databaseClient2.clientId).isEqualTo("clientId-1");
 
     // Getting a new database client for an invalidated database should use the same client id.