From c99294beb43ce1bd67cc3d12e4104641efab6710 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Sat, 3 Oct 2020 05:57:08 -0400
Subject: [PATCH] fix: remove dependency on commons-lang (#494)

* remove dependency on commons-lang
---
 google-cloud-spanner/pom.xml                              | 7 -------
 .../com/google/cloud/spanner/connection/DdlBatch.java     | 7 +++++--
 .../com/google/cloud/spanner/connection/DdlBatchTest.java | 8 +++-----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index a0c57fde14..7acd400ec7 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -237,22 +237,15 @@
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-credentials</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.5</version>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/DdlBatch.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/DdlBatch.java
index b18f3fa891..a80e93dfc0 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/DdlBatch.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/DdlBatch.java
@@ -34,12 +34,12 @@
 import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
-import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * {@link UnitOfWork} that is used when a DDL batch is started. These batches only accept DDL
@@ -124,7 +124,10 @@ public ResultSet executeQuery(
           // Queries marked with internal metadata queries are allowed during a DDL batch.
           // These can only be generated by library internal methods and may be used to check
           // whether a database object such as table or an index exists.
-          final QueryOption[] internalOptions = ArrayUtils.remove(options, i);
+          List<QueryOption> temp = new ArrayList<>();
+          Collections.addAll(temp, options);
+          temp.remove(i);
+          final QueryOption[] internalOptions = temp.toArray(new QueryOption[0]);
           Callable<ResultSet> callable =
               new Callable<ResultSet>() {
                 @Override
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlBatchTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlBatchTest.java
index 4f02fb9a36..6194b7f73b 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlBatchTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlBatchTest.java
@@ -156,11 +156,9 @@ public void testExecuteMetadataQuery() {
     when(singleUse.executeQuery(statement)).thenReturn(resultSet);
     when(dbClient.singleUse()).thenReturn(singleUse);
     DdlBatch batch = createSubject(createDefaultMockDdlClient(), dbClient);
-    assertThat(
-        batch
-            .executeQuery(parsedStatement, AnalyzeMode.NONE, InternalMetadataQuery.INSTANCE)
-            .hashCode(),
-        is(equalTo(resultSet.hashCode())));
+    ResultSet result =
+        batch.executeQuery(parsedStatement, AnalyzeMode.NONE, InternalMetadataQuery.INSTANCE);
+    assertThat(result.hashCode(), is(equalTo(resultSet.hashCode())));
   }
 
   @Test