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 @@
com.google.code.findbugs
jsr305
- 3.0.2
com.google.code.gson
gson
- 2.8.6
com.google.auth
google-auth-library-credentials
-
- org.apache.commons
- commons-lang3
- 3.5
-
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 temp = new ArrayList<>();
+ Collections.addAll(temp, options);
+ temp.remove(i);
+ final QueryOption[] internalOptions = temp.toArray(new QueryOption[0]);
Callable callable =
new Callable() {
@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