Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove dependency on commons-lang #494

Merged
merged 2 commits into from Oct 3, 2020
Merged

fix: remove dependency on commons-lang #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55ebfab
remove dependency on commons-lang
elharo Oct 2, 2020
a98d722
format
elharo Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions google-cloud-spanner/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
7 changes: 5 additions & 2 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/DdlBatch.java
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlBatchTest.java
View file
Open in desktop
Expand Up @@ -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
Expand Down