From adc3cc1648b326802c9219efd0a056a76d198852 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 06:40:26 +0000 Subject: [PATCH 01/37] chore: release 6.12.3-SNAPSHOT (#1403) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-spanner-bom/pom.xml | 18 +++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 9c7c80d675e..478e13abc38 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.12.2 + 6.12.3-SNAPSHOT pom com.google.cloud @@ -54,43 +54,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.cloud google-cloud-spanner - 6.12.2 + 6.12.3-SNAPSHOT com.google.cloud google-cloud-spanner test-jar - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.2 + 6.12.3-SNAPSHOT diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index b057e7bc717..f7f8ec5f93b 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.12.2 + 6.12.3-SNAPSHOT jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.12.2 + 6.12.3-SNAPSHOT google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index e9d15cf45f7..ffc6091d4a8 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.2 + 6.12.3-SNAPSHOT grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.2 + 6.12.3-SNAPSHOT diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 123a3e55993..8c30e17296a 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.2 + 6.12.3-SNAPSHOT grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.2 + 6.12.3-SNAPSHOT diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index b84cb1fe1cf..02df85b622c 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.2 + 6.12.3-SNAPSHOT grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.2 + 6.12.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 60771971086..d224bbc2db2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.12.2 + 6.12.3-SNAPSHOT Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -62,37 +62,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.2 + 6.12.3-SNAPSHOT com.google.cloud google-cloud-spanner - 6.12.2 + 6.12.3-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index 473ac667376..397671095d6 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.2 + 6.12.3-SNAPSHOT proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.2 + 6.12.3-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index af158ed266f..29ab98210e4 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.2 + 6.12.3-SNAPSHOT proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.2 + 6.12.3-SNAPSHOT diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index a1e34ca382f..ad95b700bff 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.2 + 6.12.3-SNAPSHOT proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.2 + 6.12.3-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6fe06a44f8c..fc202ebea34 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 6.12.2 + 6.12.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index 3dd8259d6bb..4a0240bd193 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.12.2:6.12.2 -proto-google-cloud-spanner-v1:6.12.2:6.12.2 -proto-google-cloud-spanner-admin-database-v1:6.12.2:6.12.2 -grpc-google-cloud-spanner-v1:6.12.2:6.12.2 -grpc-google-cloud-spanner-admin-instance-v1:6.12.2:6.12.2 -grpc-google-cloud-spanner-admin-database-v1:6.12.2:6.12.2 -google-cloud-spanner:6.12.2:6.12.2 \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:6.12.2:6.12.3-SNAPSHOT +proto-google-cloud-spanner-v1:6.12.2:6.12.3-SNAPSHOT +proto-google-cloud-spanner-admin-database-v1:6.12.2:6.12.3-SNAPSHOT +grpc-google-cloud-spanner-v1:6.12.2:6.12.3-SNAPSHOT +grpc-google-cloud-spanner-admin-instance-v1:6.12.2:6.12.3-SNAPSHOT +grpc-google-cloud-spanner-admin-database-v1:6.12.2:6.12.3-SNAPSHOT +google-cloud-spanner:6.12.2:6.12.3-SNAPSHOT \ No newline at end of file From 2e22bb470a43fb5e90a452fa5571051587b3fb43 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 1 Sep 2021 00:20:26 -0700 Subject: [PATCH 02/37] chore: regenerate README (#1404) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-09-01 06:42:36,090 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-spanner/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-09-01 06:42:37,240 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/cc0be706-99c8-42f3-9e60-297c9fbaaf3d/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index f65c96d9b97..e8feaf28474 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "0d8aa7d2c576740ab608cba641bbe90a997c1010" + "sha": "adc3cc1648b326802c9219efd0a056a76d198852" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e770c12f2a9a5f84566fe04b16a4ceec1c8c109b" + "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" } } ] diff --git a/README.md b/README.md index 894e767dddc..e7021f02fb0 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-spanner' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-spanner:6.12.1' +implementation 'com.google.cloud:google-cloud-spanner:6.12.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.12.1" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.12.2" ``` ## Authentication From c9f504829f53bfcff6f78bbbbc447cc8f10f5940 Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Thu, 2 Sep 2021 09:15:25 +1000 Subject: [PATCH 03/37] fix: drop databases after sample tests (#1401) There was a bug on dropping databases / deleting backups after the sample tests where we were trying to delete in the regional instance first and if an exception was thrown, we would try to delete on the second instance. This did not work, because the delete / drop operations do not fail if the database / backup are not found in the instance, the call simply returns. In this PR we have applied both deletes one after the other to fix the issue, instead of relying on the exceptions. --- .../com/example/spanner/SampleTestBase.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/samples/snippets/src/test/java/com/example/spanner/SampleTestBase.java b/samples/snippets/src/test/java/com/example/spanner/SampleTestBase.java index d492a88e10e..81286eb366d 100644 --- a/samples/snippets/src/test/java/com/example/spanner/SampleTestBase.java +++ b/samples/snippets/src/test/java/com/example/spanner/SampleTestBase.java @@ -61,30 +61,26 @@ public static void beforeClass() { @AfterClass public static void afterClass() { for (String databaseId : idGenerator.getDatabaseIds()) { + System.out.println("Trying to drop " + databaseId); try { + // If the database is not found, it is ignored (no exception is thrown) databaseAdminClient.dropDatabase(instanceId, databaseId); - } catch (Exception e1) { - try { - databaseAdminClient.dropDatabase(multiRegionalInstanceId, databaseId); - } catch (Exception e2) { - System.out.println( - "Failed to drop database " + databaseId + " due to " + e2.getMessage() - + ", skipping..." - ); - } + databaseAdminClient.dropDatabase(multiRegionalInstanceId, databaseId); + } catch (Exception e) { + System.out.println( + "Failed to drop database " + databaseId + " due to " + e.getMessage() + ", skipping..." + ); } } for (String backupId : idGenerator.getBackupIds()) { try { + // If the backup is not found, it is ignored (no exception is thrown) databaseAdminClient.deleteBackup(instanceId, backupId); - } catch (Exception e1) { - try { - databaseAdminClient.deleteBackup(multiRegionalInstanceId, backupId); - } catch (Exception e2) { - System.out.println( - "Failed to delete backup " + backupId + " due to " + e2.getMessage() + ", skipping..." - ); - } + databaseAdminClient.deleteBackup(multiRegionalInstanceId, backupId); + } catch (Exception e) { + System.out.println( + "Failed to delete backup " + backupId + " due to " + e.getMessage() + ", skipping..." + ); } } spanner.close(); From 6b37ea23bcdb4ed13d2bbe893f2b139f3d6cd2f5 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 6 Sep 2021 04:52:20 +0200 Subject: [PATCH 04/37] chore(deps): update dependency com.google.cloud:google-cloud-spanner to v6.12.2 (#1405) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index e827248d0cf..d3cdddd7c42 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -32,7 +32,7 @@ com.google.cloud google-cloud-spanner - 6.12.1 + 6.12.2 From ca6808cc76a01167d3167faef657fb783ff459f5 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sun, 5 Sep 2021 19:52:32 -0700 Subject: [PATCH 05/37] chore(java): install maven 3.8.1 at runtime (#1407) * chore(java): install maven 3.8.1 at runtime * chore: pin github action runner at ubuntu-16.04 * chore: install maven 3.8.1 at runtime * chore: fix typo Source-Author: Neenu Shaji Source-Date: Thu Sep 2 15:46:06 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: ad7fd76e17bf9494a3e47ff9cf445f61564432e0 Source-Link: https://github.com/googleapis/synthtool/commit/ad7fd76e17bf9494a3e47ff9cf445f61564432e0 * chore: setup maven 3.8.1 for ci tasks For the samples ci steps and tests against emulator ci steps Co-authored-by: Thiago Nunes --- .github/workflows/ci.yaml | 14 +++++++++++++- .../integration-tests-against-emulator.yaml | 3 +++ .github/workflows/samples.yaml | 6 ++++++ synth.metadata | 4 ++-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d510359d97d..e23d923e1e7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -37,6 +40,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -46,6 +52,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -57,10 +66,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file diff --git a/.github/workflows/integration-tests-against-emulator.yaml b/.github/workflows/integration-tests-against-emulator.yaml index adb38152d12..7dd5d159224 100644 --- a/.github/workflows/integration-tests-against-emulator.yaml +++ b/.github/workflows/integration-tests-against-emulator.yaml @@ -17,6 +17,9 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index 4af5faaec87..474dd5f7b25 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -6,6 +6,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -19,6 +22,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} diff --git a/synth.metadata b/synth.metadata index 838f3afd372..a9f5fc2af2c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "d28d8a1d710b1cd47ef3b2ca1fa87750a007b5cf" + "sha": "c9f504829f53bfcff6f78bbbbc447cc8f10f5940" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" + "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" } } ], From 865bac1a976d16e20e0be0eed11594c7c2a7d721 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sun, 5 Sep 2021 20:34:25 -0700 Subject: [PATCH 06/37] chore: regenerate README (#1408) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-09-06 02:54:36,912 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-spanner/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-09-06 02:54:38,215 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/7bac4f1b-48d2-490a-ba08-9e22df656cb6/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index e8feaf28474..fb71fb7117a 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "adc3cc1648b326802c9219efd0a056a76d198852" + "sha": "ca6808cc76a01167d3167faef657fb783ff459f5" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" + "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" } } ] diff --git a/README.md b/README.md index e7021f02fb0..afc7da32bf2 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-spanner - 6.12.1 + 6.12.2 ``` From 87b77a3be3fc9cb206e147dcce818b594b2c6b4b Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Tue, 7 Sep 2021 09:50:48 +1000 Subject: [PATCH 07/37] chore: configure backups test to run in nightly build (#1409) * test: remove unused junit categories * test: add slow test category Add a new JUnit category: SlowTest. It will be used to execute tests that are part of the nightly build. Also refactors the categories hierarchy to be easier to setup. * test: add maven profile to run slow tests Configures a profile to execute only the slow tests. It will be invoked in the nightly build. * chore: configure nightly build for slow tests Sets up the kokoro configuration for running slow tests nightly * chore: ignore templated build.sh * chore: fix linting violations * test: reverts tracertest category removal * chore: address PR comments --- .kokoro/build.sh | 12 +++++ .kokoro/nightly/slow-tests.cfg | 38 +++++++++++++ google-cloud-spanner/pom.xml | 54 ++++++++++++++++--- .../spanner/ITSessionPoolIntegrationTest.java | 3 +- .../com/google/cloud/spanner/SpanTest.java | 3 +- .../{ => categories}/IntegrationTest.java | 2 +- .../ParallelIntegrationTest.java | 4 +- .../SerialIntegrationTest.java} | 13 ++--- .../cloud/spanner/categories/SlowTest.java | 20 +++++++ .../spanner/{ => categories}/TracerTest.java | 11 ++-- .../it/ITAsyncTransactionRetryTest.java | 2 +- .../connection/it/ITBulkConnectionTest.java | 4 +- .../connection/it/ITCommitResponseTest.java | 2 +- .../spanner/connection/it/ITDdlTest.java | 2 +- .../connection/it/ITReadOnlySpannerTest.java | 2 +- .../it/ITReadWriteAutocommitSpannerTest.java | 2 +- .../connection/it/ITSqlMusicScriptTest.java | 2 +- .../connection/it/ITSqlScriptTest.java | 2 +- .../connection/it/ITTransactionModeTest.java | 2 +- .../connection/it/ITTransactionRetryTest.java | 2 +- .../cloud/spanner/it/ITAsyncAPITest.java | 4 +- .../cloud/spanner/it/ITAsyncExamplesTest.java | 4 +- .../cloud/spanner/it/ITBatchDmlTest.java | 2 +- .../cloud/spanner/it/ITBatchReadTest.java | 2 +- .../cloud/spanner/it/ITClosedSessionTest.java | 2 +- .../spanner/it/ITCommitTimestampTest.java | 2 +- .../google/cloud/spanner/it/ITDMLTest.java | 2 +- .../cloud/spanner/it/ITDatabaseAdminTest.java | 2 +- .../cloud/spanner/it/ITDatabaseTest.java | 2 +- .../spanner/it/ITDirectPathFallback.java | 2 +- .../cloud/spanner/it/ITInstanceAdminTest.java | 4 +- .../cloud/spanner/it/ITJsonWriteReadTest.java | 2 +- .../cloud/spanner/it/ITLargeReadTest.java | 2 +- .../spanner/it/ITPitrCreateDatabaseTest.java | 2 +- .../spanner/it/ITPitrUpdateDatabaseTest.java | 2 +- .../cloud/spanner/it/ITQueryOptionsTest.java | 2 +- .../google/cloud/spanner/it/ITQueryTest.java | 2 +- .../cloud/spanner/it/ITReadOnlyTxnTest.java | 2 +- .../google/cloud/spanner/it/ITReadTest.java | 2 +- .../cloud/spanner/it/ITResultSetGetValue.java | 2 +- .../spanner/it/ITSpannerOptionsTest.java | 2 +- .../it/ITTransactionManagerAsyncTest.java | 2 +- .../spanner/it/ITTransactionManagerTest.java | 2 +- .../cloud/spanner/it/ITTransactionTest.java | 2 +- .../cloud/spanner/it/ITVPCNegativeTest.java | 4 +- .../cloud/spanner/it/ITWithGrpcGcpTest.java | 2 +- .../google/cloud/spanner/it/ITWriteTest.java | 2 +- .../spanner/it/{ => slow}/ITBackupTest.java | 6 +-- synth.py | 1 + 49 files changed, 180 insertions(+), 71 deletions(-) create mode 100644 .kokoro/nightly/slow-tests.cfg rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/{ => categories}/IntegrationTest.java (93%) rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/{ => categories}/ParallelIntegrationTest.java (85%) rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/{FlakyTest.java => categories/SerialIntegrationTest.java} (55%) create mode 100644 google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SlowTest.java rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/{ => categories}/TracerTest.java (72%) rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/{ => slow}/ITBackupTest.java (99%) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 7640116ebbb..c8c09af3fa5 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -69,6 +69,18 @@ integration) verify RETURN_CODE=$? ;; +slowtests) + mvn -B ${INTEGRATION_TEST_ARGS} \ + -ntp \ + -Pslow-tests \ + -DskipITs=false \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/nightly/slow-tests.cfg b/.kokoro/nightly/slow-tests.cfg new file mode 100644 index 00000000000..e9fb72c59d7 --- /dev/null +++ b/.kokoro/nightly/slow-tests.cfg @@ -0,0 +1,38 @@ +# Format: //devtools/kokoro/config/proto/build.proto +# Runs the slow tests only in the nightly build + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "slowtests" +} +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "ENABLE_FLAKYBOT" + value: "true" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index f7f8ec5f93b..a55e971b19c 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -47,9 +47,10 @@ + default-test - com.google.cloud.spanner.TracerTest,com.google.cloud.spanner.IntegrationTest + com.google.cloud.spanner.categories.TracerTest,com.google.cloud.spanner.categories.IntegrationTest @@ -58,7 +59,7 @@ test - com.google.cloud.spanner.TracerTest + com.google.cloud.spanner.categories.TracerTest @@ -76,21 +77,21 @@ 3000 + default - com.google.cloud.spanner.IntegrationTest - com.google.cloud.spanner.FlakyTest,com.google.cloud.spanner.TracerTest,com.google.cloud.spanner.ParallelIntegrationTest + com.google.cloud.spanner.categories.SerialIntegrationTest + parallel-integration-test integration-test - com.google.cloud.spanner.ParallelIntegrationTest - com.google.cloud.spanner.FlakyTest,com.google.cloud.spanner.TracerTest,com.google.cloud.spanner.IntegrationTest + com.google.cloud.spanner.categories.ParallelIntegrationTest 8 true @@ -365,6 +366,47 @@ + + slow-tests + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + com.google.cloud.spanner.categories.SlowTest + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + default + + com.google.cloud.spanner.categories.SlowTest + + + + + parallel-integration-test + + integration-test + + + true + + + + + + + spanner-directpath-it diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ITSessionPoolIntegrationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ITSessionPoolIntegrationTest.java index 0bf38ca0316..1526dbed0cf 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ITSessionPoolIntegrationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ITSessionPoolIntegrationTest.java @@ -20,6 +20,7 @@ import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory; import com.google.cloud.spanner.SessionPool.PooledSessionFuture; +import com.google.cloud.spanner.categories.SerialIntegrationTest; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -40,7 +41,7 @@ *

See also {@code it/WriteIntegrationTest}, which provides coverage of writing and reading back * all Cloud Spanner types. */ -@Category(IntegrationTest.class) +@Category(SerialIntegrationTest.class) @RunWith(JUnit4.class) public class ITSessionPoolIntegrationTest { @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java index 1ba1e9c25ca..a10d37c96ee 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java @@ -25,6 +25,7 @@ import com.google.cloud.NoCredentials; import com.google.cloud.spanner.MockSpannerServiceImpl.SimulatedExecutionTime; import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult; +import com.google.cloud.spanner.categories.TracerTest; import com.google.protobuf.ListValue; import com.google.spanner.v1.ResultSetMetadata; import com.google.spanner.v1.StructType; @@ -48,8 +49,8 @@ import org.junit.runners.JUnit4; import org.threeten.bp.Duration; -@RunWith(JUnit4.class) @Category(TracerTest.class) +@RunWith(JUnit4.class) public class SpanTest { private static final String TEST_PROJECT = "my-project"; private static final String TEST_INSTANCE = "my-instance"; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/IntegrationTest.java similarity index 93% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/IntegrationTest.java index f0e7480e4a4..0f7c47521e6 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/IntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.spanner; +package com.google.cloud.spanner.categories; /** Integration Test interface. */ public interface IntegrationTest {} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ParallelIntegrationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/ParallelIntegrationTest.java similarity index 85% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/ParallelIntegrationTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/ParallelIntegrationTest.java index 382f826c6ad..c45e0d6adad 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ParallelIntegrationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/ParallelIntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.spanner; +package com.google.cloud.spanner.categories; /** Parallel Integration Test interface. */ -public interface ParallelIntegrationTest {} +public interface ParallelIntegrationTest extends IntegrationTest {} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SerialIntegrationTest.java similarity index 55% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SerialIntegrationTest.java index db0e250376d..674ee3b79da 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SerialIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,7 @@ * limitations under the License. */ -package com.google.cloud.spanner; +package com.google.cloud.spanner.categories; -/** - * Annotation for JUnit {@link org.junit.experimental.categories.Category} that indicates a test is - * flaky. These will be excluded from integration tests. Use this annotation sparingly: typically it - * should only be used for a test where the flakiness is dependent on a fix in a module dependency - * (for example, grpc-java) and cannot be addressed locally. - */ -public interface FlakyTest {} +/** Serial Integration Test interface. */ +public interface SerialIntegrationTest {} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SlowTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SlowTest.java new file mode 100644 index 00000000000..dd7b47be3dc --- /dev/null +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SlowTest.java @@ -0,0 +1,20 @@ +/* + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.spanner.categories; + +/** Category of slow tests, to be run on the nightly build * */ +public interface SlowTest extends IntegrationTest {} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TracerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/TracerTest.java similarity index 72% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/TracerTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/TracerTest.java index cad3dd19fdf..978d0fe7dec 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TracerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/TracerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,12 @@ * limitations under the License. */ -package com.google.cloud.spanner; - -import org.junit.experimental.categories.Category; +package com.google.cloud.spanner.categories; /** - * Tests marked with this {@link Category} will be executed in a separate execution with the - * maven-surefire plugin. The tests will be excluded from execution with the maven-failsafe plugin. + * Tests marked with this {@link org.junit.experimental.categories.Category} will be executed in a + * separate execution with the maven-surefire plugin. The tests will be excluded from execution with + * the maven-failsafe plugin. * *

Separate execution prevents the injection of any custom tracing configuration from interfering * with other tests, as most tracing configuration is stored in static final variables. diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITAsyncTransactionRetryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITAsyncTransactionRetryTest.java index fa44ad6f5d9..45d49e516c5 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITAsyncTransactionRetryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITAsyncTransactionRetryTest.java @@ -33,11 +33,11 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerExceptionFactory; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.Connection; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.TransactionRetryListener; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java index 8c1f0b3c945..f71c7f99e21 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java @@ -20,9 +20,9 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import com.google.cloud.spanner.IntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.SerialIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import java.util.ArrayList; import java.util.List; @@ -39,7 +39,7 @@ * parallel with other tests, as it tries to close all active connections, and should not try to * close connections of other integration tests. */ -@Category(IntegrationTest.class) +@Category(SerialIntegrationTest.class) @RunWith(JUnit4.class) public class ITBulkConnectionTest extends ITAbstractSpannerTest { private static final int NUMBER_OF_TEST_CONNECTIONS = 250; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITCommitResponseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITCommitResponseTest.java index 91393eed301..b316f38409e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITCommitResponseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITCommitResponseTest.java @@ -25,9 +25,9 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import org.junit.Before; import org.junit.Test; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDdlTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDdlTest.java index 74c072cd760..3e1142ed699 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDdlTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDdlTest.java @@ -16,7 +16,7 @@ package com.google.cloud.spanner.connection.it; -import com.google.cloud.spanner.ParallelIntegrationTest; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import org.junit.Test; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java index fd5df07954e..775e00f9e30 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java @@ -28,11 +28,11 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ReadContext.QueryAnalyzeMode; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import java.math.BigInteger; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java index d394013fbea..b801d9a626b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java @@ -24,11 +24,11 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerBatchUpdateException; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import java.util.Arrays; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlMusicScriptTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlMusicScriptTest.java index e7afe957705..3d31ced3320 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlMusicScriptTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlMusicScriptTest.java @@ -24,9 +24,9 @@ import com.google.cloud.spanner.AbortedDueToConcurrentModificationException; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.AbstractSqlScriptVerifier.GenericConnection; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlScriptTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlScriptTest.java index 026495605ed..4a14ea2e00d 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlScriptTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlScriptTest.java @@ -19,8 +19,8 @@ import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator; import com.google.cloud.spanner.ErrorCode; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerException; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import com.google.cloud.spanner.connection.SqlScriptVerifier.SpannerGenericConnection; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionModeTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionModeTest.java index 33b059c8bf9..b92238b8e45 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionModeTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionModeTest.java @@ -25,10 +25,10 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import java.util.Arrays; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionRetryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionRetryTest.java index 1d7de23cb40..bb06fcbe029 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionRetryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionRetryTest.java @@ -27,10 +27,10 @@ import com.google.cloud.spanner.AbortedException; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.TransactionRetryListener; import java.sql.Connection; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java index ab24219d7ed..b3404eecebe 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java @@ -36,7 +36,6 @@ import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.DatabaseId; import com.google.cloud.spanner.ErrorCode; -import com.google.cloud.spanner.IntegrationTest; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.KeyRange; @@ -49,6 +48,7 @@ import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Type; import com.google.cloud.spanner.Type.StructField; +import com.google.cloud.spanner.categories.SerialIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.util.concurrent.SettableFuture; import java.util.ArrayList; @@ -68,7 +68,7 @@ import org.junit.runners.JUnit4; /** Integration tests for asynchronous APIs. */ -@Category(IntegrationTest.class) +@Category(SerialIntegrationTest.class) @RunWith(JUnit4.class) public class ITAsyncAPITest { @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java index c340ebd21ed..79308b81e87 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java @@ -29,7 +29,6 @@ import com.google.cloud.spanner.Database; import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.ErrorCode; -import com.google.cloud.spanner.IntegrationTest; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.KeySet; @@ -38,6 +37,7 @@ import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; +import com.google.cloud.spanner.categories.SerialIntegrationTest; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import java.util.ArrayList; @@ -59,7 +59,7 @@ import org.junit.runners.JUnit4; /** Integration tests for asynchronous APIs. */ -@Category(IntegrationTest.class) +@Category(SerialIntegrationTest.class) @RunWith(JUnit4.class) public class ITAsyncExamplesTest { @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java index 3cd9917e1a8..57e2a856a7e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java @@ -23,12 +23,12 @@ import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerBatchUpdateException; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.TransactionRunner; import com.google.cloud.spanner.TransactionRunner.TransactionCallable; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata; import java.util.ArrayList; import java.util.Collections; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java index 94c3723439a..c80b2f77ead 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java @@ -28,12 +28,12 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.Partition; import com.google.cloud.spanner.PartitionOptions; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.TimestampBound; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java index aeb0256285b..de4e6e903f3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java @@ -24,7 +24,6 @@ import com.google.cloud.spanner.Database; import com.google.cloud.spanner.IntegrationTestWithClosedSessionsEnv; import com.google.cloud.spanner.IntegrationTestWithClosedSessionsEnv.DatabaseClientWithClosedSessionImpl; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ReadOnlyTransaction; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SessionNotFoundException; @@ -33,6 +32,7 @@ import com.google.cloud.spanner.TransactionContext; import com.google.cloud.spanner.TransactionManager; import com.google.cloud.spanner.TransactionRunner; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.BeforeClass; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java index 5a3b5c14707..91f7e517cee 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java @@ -28,11 +28,11 @@ import com.google.cloud.spanner.Key; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Value; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ConnectionOptions; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.collect.ImmutableList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java index 2a94ed82abb..fa5a8c5fa55 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java @@ -28,7 +28,6 @@ import com.google.cloud.spanner.KeyRange; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerExceptionFactory; @@ -36,6 +35,7 @@ import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.TransactionRunner; import com.google.cloud.spanner.TransactionRunner.TransactionCallable; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import java.util.Collections; import org.junit.Before; import org.junit.BeforeClass; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java index 48837d21cec..a1af56de564 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java @@ -31,10 +31,10 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerOptions; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java index 006d3e2c8a8..8fd8cbc15e0 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java @@ -36,12 +36,12 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.TransactionContext; import com.google.cloud.spanner.TransactionRunner.TransactionCallable; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDirectPathFallback.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDirectPathFallback.java index ae2c99b3e1a..81eacc47390 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDirectPathFallback.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDirectPathFallback.java @@ -27,9 +27,9 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerOptions; import com.google.cloud.spanner.TimestampBound; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.base.Stopwatch; import io.grpc.ManagedChannelBuilder; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java index fcda2603cad..b002a0de640 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java @@ -25,9 +25,9 @@ import com.google.cloud.spanner.InstanceAdminClient; import com.google.cloud.spanner.InstanceConfig; import com.google.cloud.spanner.InstanceInfo; -import com.google.cloud.spanner.IntegrationTest; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.categories.SerialIntegrationTest; import com.google.common.collect.Iterators; import com.google.spanner.admin.instance.v1.UpdateInstanceMetadata; import java.util.ArrayList; @@ -42,7 +42,7 @@ import org.junit.runners.JUnit4; /** Integration tests for {@link com.google.cloud.spanner.InstanceAdminClient}. */ -@Category(IntegrationTest.class) +@Category(SerialIntegrationTest.class) @RunWith(JUnit4.class) public class ITInstanceAdminTest { @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java index 9f55ea60fd1..c13aa11f306 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java @@ -24,11 +24,11 @@ import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Value; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.EmulatorSpannerHelper; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.io.Resources; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java index 3fa99c225f3..d2325b8f0f4 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java @@ -25,9 +25,9 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java index f9fa081e413..88a7f7e172d 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java @@ -27,8 +27,8 @@ import com.google.cloud.spanner.DatabaseNotFoundException; import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerException; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import java.util.ArrayList; import java.util.Collections; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java index d1c09c247df..a03c9087ea9 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java @@ -29,10 +29,10 @@ import com.google.cloud.spanner.DatabaseId; import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata; import java.util.Collections; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java index 57aa77e6a7c..b9dc912bd66 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java @@ -25,11 +25,11 @@ import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.spanner.v1.ExecuteSqlRequest.QueryOptions; import org.junit.BeforeClass; import org.junit.ClassRule; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java index e0e887624bf..d993b466e24 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java @@ -33,7 +33,6 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ReadContext.QueryAnalyzeMode; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; @@ -43,6 +42,7 @@ import com.google.cloud.spanner.Type; import com.google.cloud.spanner.Type.StructField; import com.google.cloud.spanner.Value; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.EmulatorSpannerHelper; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java index c93e53f212b..11a146d7763 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java @@ -26,13 +26,13 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ReadContext; import com.google.cloud.spanner.ReadOnlyTransaction; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java index 5fd4b27fa4e..1221628451f 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java @@ -32,12 +32,12 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Type; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import io.grpc.Context; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITResultSetGetValue.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITResultSetGetValue.java index 0b2f19e99da..f4dac91ebe6 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITResultSetGetValue.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITResultSetGetValue.java @@ -29,13 +29,13 @@ import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.Type; import com.google.cloud.spanner.Type.StructField; import com.google.cloud.spanner.Value; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.primitives.Doubles; import java.math.BigDecimal; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITSpannerOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITSpannerOptionsTest.java index 399fd62a6d8..8f65e6352d0 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITSpannerOptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITSpannerOptionsTest.java @@ -21,11 +21,11 @@ import com.google.cloud.spanner.Database; import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.IntegrationTestEnv; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerOptions; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java index c1e8a903ea5..4b2e5273593 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java @@ -34,11 +34,11 @@ import com.google.cloud.spanner.Key; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TransactionManager.TransactionState; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.MoreExecutors; import java.util.Arrays; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java index bb70864d3c3..52d296b2eb5 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java @@ -31,12 +31,12 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TransactionContext; import com.google.cloud.spanner.TransactionManager; import com.google.cloud.spanner.TransactionManager.TransactionState; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.collect.ImmutableList; import java.util.Arrays; import java.util.Collections; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java index 2cfb9cbbc5b..16f8813772c 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java @@ -36,7 +36,6 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.PartitionOptions; import com.google.cloud.spanner.ReadContext; import com.google.cloud.spanner.ReadOnlyTransaction; @@ -47,6 +46,7 @@ import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.TransactionRunner; import com.google.cloud.spanner.TransactionRunner.TransactionCallable; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.EmulatorSpannerHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITVPCNegativeTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITVPCNegativeTest.java index 584ab0ff86f..66888939b22 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITVPCNegativeTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITVPCNegativeTest.java @@ -35,7 +35,6 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.InstanceAdminClient; import com.google.cloud.spanner.InstanceId; -import com.google.cloud.spanner.IntegrationTest; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Options; import com.google.cloud.spanner.ResultSet; @@ -43,6 +42,7 @@ import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerOptions; +import com.google.cloud.spanner.categories.SerialIntegrationTest; import com.google.common.base.Strings; import com.google.longrunning.OperationsClient; import com.google.longrunning.OperationsSettings; @@ -62,7 +62,7 @@ import org.junit.runners.JUnit4; /** Integration tests for VPC-SC */ -@Category(IntegrationTest.class) +@Category(SerialIntegrationTest.class) @RunWith(JUnit4.class) public class ITVPCNegativeTest { private static final Logger logger = Logger.getLogger(ITVPCNegativeTest.class.getName()); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java index 8fdf687e444..4e522f693d3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java @@ -23,11 +23,11 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.Mutation; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerOptions; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import java.util.ArrayList; import java.util.Arrays; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java index a76c40ea61b..14b8f02941d 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java @@ -38,12 +38,12 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Value; +import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.EmulatorSpannerHelper; import com.google.common.collect.ImmutableList; import io.grpc.Context; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBackupTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/slow/ITBackupTest.java similarity index 99% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBackupTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/slow/ITBackupTest.java index 6ccce161f08..a7b0b263466 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBackupTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/slow/ITBackupTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.spanner.it; +package com.google.cloud.spanner.it.slow; import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator; import static com.google.cloud.spanner.testing.TimestampHelper.afterDays; @@ -42,12 +42,12 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.Restore; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerExceptionFactory; import com.google.cloud.spanner.Statement; +import com.google.cloud.spanner.categories.SlowTest; import com.google.cloud.spanner.encryption.EncryptionConfigs; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.base.Preconditions; @@ -85,7 +85,7 @@ * Integration tests creating, reading, updating and deleting backups. This test class combines * several tests into one long test to reduce the total execution time. */ -@Category(ParallelIntegrationTest.class) +@Category(SlowTest.class) @RunWith(JUnit4.class) public class ITBackupTest { private static final Logger logger = Logger.getLogger(ITBackupTest.class.getName()); diff --git a/synth.py b/synth.py index 436da376787..4eebd59f180 100644 --- a/synth.py +++ b/synth.py @@ -93,4 +93,5 @@ '.github/release-please.yml', '.github/blunderbuss.yml', '.github/workflows/samples.yaml', + '.kokoro/build.sh', ]) From 0a311ad38558dbf91c863941165cce456cf3c14c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 7 Sep 2021 22:21:28 -0700 Subject: [PATCH 08/37] chore(java): update windows build (#1412) to install maven 3.8.1 at runtime too (related to #1202) Tested in [java-bigquerystorage](https://github.com/googleapis/java-bigquerystorage/pull/1291/commits/7834f4ff86858f6ed0b8068ea66dadf6365e399a) Source-Author: Stephanie Wang Source-Date: Tue Sep 7 13:04:27 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 17ee6e5c08f2eb47029beee4776ce990e56b3925 Source-Link: https://github.com/googleapis/synthtool/commit/17ee6e5c08f2eb47029beee4776ce990e56b3925 --- .github/workflows/ci.yaml | 5 ++++- synth.metadata | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e23d923e1e7..3becb5c022a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,9 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -75,4 +78,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/synth.metadata b/synth.metadata index a9f5fc2af2c..ddee3d6f71f 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "c9f504829f53bfcff6f78bbbbc447cc8f10f5940" + "sha": "87b77a3be3fc9cb206e147dcce818b594b2c6b4b" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" + "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925" } } ], @@ -66,7 +66,6 @@ ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", ".kokoro/build.bat", - ".kokoro/build.sh", ".kokoro/coerce_logs.sh", ".kokoro/common.cfg", ".kokoro/common.sh", From 2a87c9b20e47c9e352695fa57311a24584d836fa Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 8 Sep 2021 23:16:35 +0200 Subject: [PATCH 09/37] chore(deps): update dependency com.google.cloud:libraries-bom to v23 (#1411) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `22.0.0` -> `23.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/compatibility-slim/22.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/confidence-slim/22.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-spanner). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 586d1dcfd26..4c6677f8b28 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -33,7 +33,7 @@ com.google.cloud libraries-bom - 22.0.0 + 23.0.0 pom import From 16bb20ea65b3e91ce16a0b67b0aec3c9c912924a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 9 Sep 2021 02:47:15 +0200 Subject: [PATCH 10/37] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1 (#1410) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d224bbc2db2..0690b25508c 100644 --- a/pom.xml +++ b/pom.xml @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 html From fb154cdbf148a542624f2e8bd2a3cfe38831fa87 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 8 Sep 2021 19:01:00 -0700 Subject: [PATCH 11/37] chore: remove readme autosynth config (#1416) --- .github/readme/synth.metadata/synth.metadata | 18 ------- .github/readme/synth.py | 19 ------- .kokoro/continuous/readme.cfg | 55 -------------------- 3 files changed, 92 deletions(-) delete mode 100644 .github/readme/synth.metadata/synth.metadata delete mode 100644 .github/readme/synth.py delete mode 100644 .kokoro/continuous/readme.cfg diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata deleted file mode 100644 index fb71fb7117a..00000000000 --- a/.github/readme/synth.metadata/synth.metadata +++ /dev/null @@ -1,18 +0,0 @@ -{ - "sources": [ - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "ca6808cc76a01167d3167faef657fb783ff459f5" - } - }, - { - "git": { - "name": "synthtool", - "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" - } - } - ] -} \ No newline at end of file diff --git a/.github/readme/synth.py b/.github/readme/synth.py deleted file mode 100644 index 7b48cc28d36..00000000000 --- a/.github/readme/synth.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""This script is used to synthesize generated the README for this library.""" - -from synthtool.languages import java - -java.custom_templates(["java_library/README.md"]) diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index acd7dd9717e..00000000000 --- a/.kokoro/continuous/readme.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-spanner/.kokoro/readme.sh" -} - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.log" - } -} - -# The github token is stored here. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - # TODO(theacodes): remove this after secrets have globally propagated - backend_type: FASTCONFIGPUSH - } - } -} - -# Common env vars for all repositories and builds. -env_vars: { - key: "GITHUB_USER" - value: "yoshi-automation" -} -env_vars: { - key: "GITHUB_EMAIL" - value: "yoshi-automation@google.com" -} From dc1f9a92a7562e2585e2762c2749eb3207f67c25 Mon Sep 17 00:00:00 2001 From: Zoe Date: Thu, 9 Sep 2021 14:42:00 +1000 Subject: [PATCH 12/37] fix: fix JSON sample test (#1417) --- .../com/example/spanner/QueryWithJsonParameterSample.java | 4 ++-- .../java/com/example/spanner/SpannerStandaloneExamplesIT.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/spanner/QueryWithJsonParameterSample.java b/samples/snippets/src/main/java/com/example/spanner/QueryWithJsonParameterSample.java index c311901a1fa..022818cec66 100644 --- a/samples/snippets/src/main/java/com/example/spanner/QueryWithJsonParameterSample.java +++ b/samples/snippets/src/main/java/com/example/spanner/QueryWithJsonParameterSample.java @@ -42,7 +42,7 @@ static void queryWithJsonParameter() { } static void queryWithJsonParameter(DatabaseClient client) { - String exampleJson = "{rating: 9}"; + String exampleJson = "{\"rating\": 9}"; Statement statement = Statement.newBuilder( "SELECT VenueId, VenueDetails\n" @@ -56,7 +56,7 @@ static void queryWithJsonParameter(DatabaseClient client) { while (resultSet.next()) { System.out.printf( "VenueId: %s, VenueDetails: %s%n", - resultSet.getLong("VenueId"), resultSet.getString("VenueDetails")); + resultSet.getLong("VenueId"), resultSet.getJson("VenueDetails")); } } } diff --git a/samples/snippets/src/test/java/com/example/spanner/SpannerStandaloneExamplesIT.java b/samples/snippets/src/test/java/com/example/spanner/SpannerStandaloneExamplesIT.java index c98c9c590b3..03291a91f61 100644 --- a/samples/snippets/src/test/java/com/example/spanner/SpannerStandaloneExamplesIT.java +++ b/samples/snippets/src/test/java/com/example/spanner/SpannerStandaloneExamplesIT.java @@ -238,7 +238,7 @@ public void updateJsonData_shouldWriteData() { () -> UpdateJsonDataSample.updateJsonData( spanner.getDatabaseClient(DatabaseId.of(projectId, instanceId, databaseId)))); - assertThat(out).contains("VenueDetails successfully updated"); + assertThat(out).contains("Venues successfully updated"); } @Test @@ -274,6 +274,6 @@ public void queryWithJsonParameter_shouldReturnResults() { + "\"tags\":[\"large\",\"airy\"]}")) .build())); String out = runExample(() -> QueryWithJsonParameterSample.queryWithJsonParameter(client)); - assertThat(out).contains("4 35000"); + assertThat(out).contains("VenueId: 19, VenueDetails: {\"open\":true,\"rating\":9}"); } } From fe2ad14eae2002552d61e497f9892c96584efc24 Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Tue, 14 Sep 2021 08:20:12 +1000 Subject: [PATCH 13/37] fix: revert test category refactoring (#1419) Reverts moving the category interfaces of tests to their own package. This is because we export the tests as a jar to maven and it could break application code. --- google-cloud-spanner/pom.xml | 12 ++++----- .../com/google/cloud/spanner/FlakyTest.java | 25 +++++++++++++++++++ .../spanner/ITSessionPoolIntegrationTest.java | 1 - .../{categories => }/IntegrationTest.java | 2 +- .../ParallelIntegrationTest.java | 2 +- .../SerialIntegrationTest.java | 2 +- .../spanner/{categories => }/SlowTest.java | 2 +- .../com/google/cloud/spanner/SpanTest.java | 1 - .../spanner/{categories => }/TracerTest.java | 2 +- .../it/ITAsyncTransactionRetryTest.java | 2 +- .../connection/it/ITBulkConnectionTest.java | 2 +- .../connection/it/ITCommitResponseTest.java | 2 +- .../spanner/connection/it/ITDdlTest.java | 2 +- .../connection/it/ITReadOnlySpannerTest.java | 2 +- .../it/ITReadWriteAutocommitSpannerTest.java | 2 +- .../connection/it/ITSqlMusicScriptTest.java | 2 +- .../connection/it/ITSqlScriptTest.java | 2 +- .../connection/it/ITTransactionModeTest.java | 2 +- .../connection/it/ITTransactionRetryTest.java | 2 +- .../cloud/spanner/it/ITAsyncAPITest.java | 2 +- .../cloud/spanner/it/ITAsyncExamplesTest.java | 2 +- .../cloud/spanner/it/ITBatchDmlTest.java | 2 +- .../cloud/spanner/it/ITBatchReadTest.java | 2 +- .../cloud/spanner/it/ITClosedSessionTest.java | 2 +- .../spanner/it/ITCommitTimestampTest.java | 2 +- .../google/cloud/spanner/it/ITDMLTest.java | 2 +- .../cloud/spanner/it/ITDatabaseAdminTest.java | 2 +- .../cloud/spanner/it/ITDatabaseTest.java | 2 +- .../spanner/it/ITDirectPathFallback.java | 2 +- .../cloud/spanner/it/ITInstanceAdminTest.java | 2 +- .../cloud/spanner/it/ITJsonWriteReadTest.java | 2 +- .../cloud/spanner/it/ITLargeReadTest.java | 2 +- .../spanner/it/ITPitrCreateDatabaseTest.java | 2 +- .../spanner/it/ITPitrUpdateDatabaseTest.java | 2 +- .../cloud/spanner/it/ITQueryOptionsTest.java | 2 +- .../google/cloud/spanner/it/ITQueryTest.java | 2 +- .../cloud/spanner/it/ITReadOnlyTxnTest.java | 2 +- .../google/cloud/spanner/it/ITReadTest.java | 2 +- .../cloud/spanner/it/ITResultSetGetValue.java | 2 +- .../spanner/it/ITSpannerOptionsTest.java | 2 +- .../it/ITTransactionManagerAsyncTest.java | 2 +- .../spanner/it/ITTransactionManagerTest.java | 2 +- .../cloud/spanner/it/ITTransactionTest.java | 2 +- .../cloud/spanner/it/ITVPCNegativeTest.java | 2 +- .../cloud/spanner/it/ITWithGrpcGcpTest.java | 2 +- .../google/cloud/spanner/it/ITWriteTest.java | 2 +- .../cloud/spanner/it/slow/ITBackupTest.java | 2 +- 47 files changed, 74 insertions(+), 51 deletions(-) create mode 100644 google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/{categories => }/IntegrationTest.java (93%) rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/{categories => }/ParallelIntegrationTest.java (94%) rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/{categories => }/SerialIntegrationTest.java (93%) rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/{categories => }/SlowTest.java (94%) rename google-cloud-spanner/src/test/java/com/google/cloud/spanner/{categories => }/TracerTest.java (95%) diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index a55e971b19c..39f25012bd0 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -50,7 +50,7 @@ default-test - com.google.cloud.spanner.categories.TracerTest,com.google.cloud.spanner.categories.IntegrationTest + com.google.cloud.spanner.TracerTest,com.google.cloud.spanner.IntegrationTest @@ -59,7 +59,7 @@ test - com.google.cloud.spanner.categories.TracerTest + com.google.cloud.spanner.TracerTest @@ -81,7 +81,7 @@ default - com.google.cloud.spanner.categories.SerialIntegrationTest + com.google.cloud.spanner.SerialIntegrationTest @@ -91,7 +91,7 @@ integration-test - com.google.cloud.spanner.categories.ParallelIntegrationTest + com.google.cloud.spanner.ParallelIntegrationTest 8 true @@ -377,7 +377,7 @@ default-test - com.google.cloud.spanner.categories.SlowTest + com.google.cloud.spanner.SlowTest @@ -389,7 +389,7 @@ default - com.google.cloud.spanner.categories.SlowTest + com.google.cloud.spanner.SlowTest diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java new file mode 100644 index 00000000000..db0e250376d --- /dev/null +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java @@ -0,0 +1,25 @@ +/* + * Copyright 2017 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.spanner; + +/** + * Annotation for JUnit {@link org.junit.experimental.categories.Category} that indicates a test is + * flaky. These will be excluded from integration tests. Use this annotation sparingly: typically it + * should only be used for a test where the flakiness is dependent on a fix in a module dependency + * (for example, grpc-java) and cannot be addressed locally. + */ +public interface FlakyTest {} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ITSessionPoolIntegrationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ITSessionPoolIntegrationTest.java index 1526dbed0cf..36b9bee0af7 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ITSessionPoolIntegrationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ITSessionPoolIntegrationTest.java @@ -20,7 +20,6 @@ import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory; import com.google.cloud.spanner.SessionPool.PooledSessionFuture; -import com.google.cloud.spanner.categories.SerialIntegrationTest; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/IntegrationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java similarity index 93% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/IntegrationTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java index 0f7c47521e6..f0e7480e4a4 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/IntegrationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.spanner.categories; +package com.google.cloud.spanner; /** Integration Test interface. */ public interface IntegrationTest {} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/ParallelIntegrationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ParallelIntegrationTest.java similarity index 94% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/ParallelIntegrationTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/ParallelIntegrationTest.java index c45e0d6adad..3553f331b31 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/ParallelIntegrationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ParallelIntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.spanner.categories; +package com.google.cloud.spanner; /** Parallel Integration Test interface. */ public interface ParallelIntegrationTest extends IntegrationTest {} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SerialIntegrationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SerialIntegrationTest.java similarity index 93% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SerialIntegrationTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/SerialIntegrationTest.java index 674ee3b79da..1aab60acf99 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SerialIntegrationTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SerialIntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.spanner.categories; +package com.google.cloud.spanner; /** Serial Integration Test interface. */ public interface SerialIntegrationTest {} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SlowTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SlowTest.java similarity index 94% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SlowTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/SlowTest.java index dd7b47be3dc..ba5e58f81f6 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/SlowTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SlowTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.spanner.categories; +package com.google.cloud.spanner; /** Category of slow tests, to be run on the nightly build * */ public interface SlowTest extends IntegrationTest {} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java index a10d37c96ee..34db11d3054 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java @@ -25,7 +25,6 @@ import com.google.cloud.NoCredentials; import com.google.cloud.spanner.MockSpannerServiceImpl.SimulatedExecutionTime; import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult; -import com.google.cloud.spanner.categories.TracerTest; import com.google.protobuf.ListValue; import com.google.spanner.v1.ResultSetMetadata; import com.google.spanner.v1.StructType; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/TracerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TracerTest.java similarity index 95% rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/TracerTest.java rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/TracerTest.java index 978d0fe7dec..c52070b02ab 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/categories/TracerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TracerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.spanner.categories; +package com.google.cloud.spanner; /** * Tests marked with this {@link org.junit.experimental.categories.Category} will be executed in a diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITAsyncTransactionRetryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITAsyncTransactionRetryTest.java index 45d49e516c5..fa44ad6f5d9 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITAsyncTransactionRetryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITAsyncTransactionRetryTest.java @@ -33,11 +33,11 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerExceptionFactory; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.Connection; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.TransactionRetryListener; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java index f71c7f99e21..9cc46e6ee13 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java @@ -21,8 +21,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import com.google.cloud.spanner.ResultSet; +import com.google.cloud.spanner.SerialIntegrationTest; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.SerialIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import java.util.ArrayList; import java.util.List; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITCommitResponseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITCommitResponseTest.java index b316f38409e..91393eed301 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITCommitResponseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITCommitResponseTest.java @@ -25,9 +25,9 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import org.junit.Before; import org.junit.Test; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDdlTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDdlTest.java index 3e1142ed699..74c072cd760 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDdlTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDdlTest.java @@ -16,7 +16,7 @@ package com.google.cloud.spanner.connection.it; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import org.junit.Test; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java index 775e00f9e30..fd5df07954e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadOnlySpannerTest.java @@ -28,11 +28,11 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ReadContext.QueryAnalyzeMode; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import java.math.BigInteger; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java index b801d9a626b..d394013fbea 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITReadWriteAutocommitSpannerTest.java @@ -24,11 +24,11 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerBatchUpdateException; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import java.util.Arrays; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlMusicScriptTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlMusicScriptTest.java index 3d31ced3320..e7afe957705 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlMusicScriptTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlMusicScriptTest.java @@ -24,9 +24,9 @@ import com.google.cloud.spanner.AbortedDueToConcurrentModificationException; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.AbstractSqlScriptVerifier.GenericConnection; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlScriptTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlScriptTest.java index 4a14ea2e00d..026495605ed 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlScriptTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITSqlScriptTest.java @@ -19,8 +19,8 @@ import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator; import com.google.cloud.spanner.ErrorCode; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerException; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import com.google.cloud.spanner.connection.SqlScriptVerifier.SpannerGenericConnection; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionModeTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionModeTest.java index b92238b8e45..33b059c8bf9 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionModeTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionModeTest.java @@ -25,10 +25,10 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.SqlScriptVerifier; import java.util.Arrays; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionRetryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionRetryTest.java index bb06fcbe029..1d7de23cb40 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionRetryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITTransactionRetryTest.java @@ -27,10 +27,10 @@ import com.google.cloud.spanner.AbortedException; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ITAbstractSpannerTest; import com.google.cloud.spanner.connection.TransactionRetryListener; import java.sql.Connection; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java index b3404eecebe..ebd3ab4883f 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java @@ -42,13 +42,13 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.SerialIntegrationTest; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Type; import com.google.cloud.spanner.Type.StructField; -import com.google.cloud.spanner.categories.SerialIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.util.concurrent.SettableFuture; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java index 79308b81e87..5a22c64009f 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java @@ -34,10 +34,10 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.ReadOnlyTransaction; +import com.google.cloud.spanner.SerialIntegrationTest; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; -import com.google.cloud.spanner.categories.SerialIntegrationTest; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java index 57e2a856a7e..3cd9917e1a8 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchDmlTest.java @@ -23,12 +23,12 @@ import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerBatchUpdateException; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.TransactionRunner; import com.google.cloud.spanner.TransactionRunner.TransactionCallable; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata; import java.util.ArrayList; import java.util.Collections; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java index c80b2f77ead..94c3723439a 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java @@ -28,12 +28,12 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.Partition; import com.google.cloud.spanner.PartitionOptions; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.TimestampBound; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java index de4e6e903f3..aeb0256285b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITClosedSessionTest.java @@ -24,6 +24,7 @@ import com.google.cloud.spanner.Database; import com.google.cloud.spanner.IntegrationTestWithClosedSessionsEnv; import com.google.cloud.spanner.IntegrationTestWithClosedSessionsEnv.DatabaseClientWithClosedSessionImpl; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ReadOnlyTransaction; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SessionNotFoundException; @@ -32,7 +33,6 @@ import com.google.cloud.spanner.TransactionContext; import com.google.cloud.spanner.TransactionManager; import com.google.cloud.spanner.TransactionRunner; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.BeforeClass; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java index 91f7e517cee..5a3b5c14707 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITCommitTimestampTest.java @@ -28,11 +28,11 @@ import com.google.cloud.spanner.Key; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Value; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.connection.ConnectionOptions; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.collect.ImmutableList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java index fa5a8c5fa55..2a94ed82abb 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDMLTest.java @@ -28,6 +28,7 @@ import com.google.cloud.spanner.KeyRange; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerExceptionFactory; @@ -35,7 +36,6 @@ import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.TransactionRunner; import com.google.cloud.spanner.TransactionRunner.TransactionCallable; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import java.util.Collections; import org.junit.Before; import org.junit.BeforeClass; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java index a1af56de564..48837d21cec 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java @@ -31,10 +31,10 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerOptions; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java index 8fd8cbc15e0..006d3e2c8a8 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java @@ -36,12 +36,12 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.TransactionContext; import com.google.cloud.spanner.TransactionRunner.TransactionCallable; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDirectPathFallback.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDirectPathFallback.java index 81eacc47390..ae2c99b3e1a 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDirectPathFallback.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDirectPathFallback.java @@ -27,9 +27,9 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerOptions; import com.google.cloud.spanner.TimestampBound; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.base.Stopwatch; import io.grpc.ManagedChannelBuilder; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java index b002a0de640..df541e84ef0 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java @@ -27,7 +27,7 @@ import com.google.cloud.spanner.InstanceInfo; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Options; -import com.google.cloud.spanner.categories.SerialIntegrationTest; +import com.google.cloud.spanner.SerialIntegrationTest; import com.google.common.collect.Iterators; import com.google.spanner.admin.instance.v1.UpdateInstanceMetadata; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java index c13aa11f306..9f55ea60fd1 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITJsonWriteReadTest.java @@ -24,11 +24,11 @@ import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Value; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.EmulatorSpannerHelper; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.io.Resources; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java index d2325b8f0f4..3fa99c225f3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java @@ -25,9 +25,9 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java index 88a7f7e172d..f9fa081e413 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java @@ -27,8 +27,8 @@ import com.google.cloud.spanner.DatabaseNotFoundException; import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerException; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import java.util.ArrayList; import java.util.Collections; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java index a03c9087ea9..d1c09c247df 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java @@ -29,10 +29,10 @@ import com.google.cloud.spanner.DatabaseId; import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata; import java.util.Collections; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java index b9dc912bd66..57aa77e6a7c 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryOptionsTest.java @@ -25,11 +25,11 @@ import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.spanner.v1.ExecuteSqlRequest.QueryOptions; import org.junit.BeforeClass; import org.junit.ClassRule; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java index d993b466e24..e0e887624bf 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java @@ -33,6 +33,7 @@ import com.google.cloud.spanner.ErrorCode; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ReadContext.QueryAnalyzeMode; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; @@ -42,7 +43,6 @@ import com.google.cloud.spanner.Type; import com.google.cloud.spanner.Type.StructField; import com.google.cloud.spanner.Value; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.EmulatorSpannerHelper; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java index 11a146d7763..c93e53f212b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java @@ -26,13 +26,13 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ReadContext; import com.google.cloud.spanner.ReadOnlyTransaction; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java index 1221628451f..5fd4b27fa4e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java @@ -32,12 +32,12 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Type; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import io.grpc.Context; import java.util.ArrayList; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITResultSetGetValue.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITResultSetGetValue.java index f4dac91ebe6..0b2f19e99da 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITResultSetGetValue.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITResultSetGetValue.java @@ -29,13 +29,13 @@ import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.Type; import com.google.cloud.spanner.Type.StructField; import com.google.cloud.spanner.Value; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.primitives.Doubles; import java.math.BigDecimal; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITSpannerOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITSpannerOptionsTest.java index 8f65e6352d0..399fd62a6d8 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITSpannerOptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITSpannerOptionsTest.java @@ -21,11 +21,11 @@ import com.google.cloud.spanner.Database; import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.IntegrationTestEnv; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerOptions; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java index 4b2e5273593..c1e8a903ea5 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerAsyncTest.java @@ -34,11 +34,11 @@ import com.google.cloud.spanner.Key; import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TransactionManager.TransactionState; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.MoreExecutors; import java.util.Arrays; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java index 52d296b2eb5..bb70864d3c3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java @@ -31,12 +31,12 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TransactionContext; import com.google.cloud.spanner.TransactionManager; import com.google.cloud.spanner.TransactionManager.TransactionState; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.common.collect.ImmutableList; import java.util.Arrays; import java.util.Collections; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java index 16f8813772c..2cfb9cbbc5b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java @@ -36,6 +36,7 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.PartitionOptions; import com.google.cloud.spanner.ReadContext; import com.google.cloud.spanner.ReadOnlyTransaction; @@ -46,7 +47,6 @@ import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.TransactionRunner; import com.google.cloud.spanner.TransactionRunner.TransactionCallable; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.EmulatorSpannerHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITVPCNegativeTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITVPCNegativeTest.java index 66888939b22..01d2dc1ad37 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITVPCNegativeTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITVPCNegativeTest.java @@ -38,11 +38,11 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Options; import com.google.cloud.spanner.ResultSet; +import com.google.cloud.spanner.SerialIntegrationTest; import com.google.cloud.spanner.SessionPoolOptions; import com.google.cloud.spanner.Spanner; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerOptions; -import com.google.cloud.spanner.categories.SerialIntegrationTest; import com.google.common.base.Strings; import com.google.longrunning.OperationsClient; import com.google.longrunning.OperationsSettings; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java index 4e522f693d3..8fdf687e444 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java @@ -23,11 +23,11 @@ import com.google.cloud.spanner.IntegrationTestEnv; import com.google.cloud.spanner.Key; import com.google.cloud.spanner.Mutation; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.SpannerOptions; import com.google.cloud.spanner.Statement; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import java.util.ArrayList; import java.util.Arrays; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java index 14b8f02941d..a76c40ea61b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java @@ -38,12 +38,12 @@ import com.google.cloud.spanner.KeySet; import com.google.cloud.spanner.Mutation; import com.google.cloud.spanner.Options; +import com.google.cloud.spanner.ParallelIntegrationTest; import com.google.cloud.spanner.ResultSet; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.Struct; import com.google.cloud.spanner.TimestampBound; import com.google.cloud.spanner.Value; -import com.google.cloud.spanner.categories.ParallelIntegrationTest; import com.google.cloud.spanner.testing.EmulatorSpannerHelper; import com.google.common.collect.ImmutableList; import io.grpc.Context; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/slow/ITBackupTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/slow/ITBackupTest.java index a7b0b263466..672f6551e99 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/slow/ITBackupTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/slow/ITBackupTest.java @@ -44,10 +44,10 @@ import com.google.cloud.spanner.Options; import com.google.cloud.spanner.Restore; import com.google.cloud.spanner.ResultSet; +import com.google.cloud.spanner.SlowTest; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.SpannerExceptionFactory; import com.google.cloud.spanner.Statement; -import com.google.cloud.spanner.categories.SlowTest; import com.google.cloud.spanner.encryption.EncryptionConfigs; import com.google.cloud.spanner.testing.RemoteSpannerHelper; import com.google.common.base.Preconditions; From 2fa3460773aae2f71c4a4297d4db678a538630f2 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 13 Sep 2021 16:36:45 -0700 Subject: [PATCH 14/37] chore: remove readme synth.py config (#1415) * chore(java): remove readme autosynth job config README generation is now handled by owlbot Source-Author: Jeff Ching Source-Date: Wed Sep 8 12:11:28 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: df5093b950d4aafd49a4c7758d74c44485263ada Source-Link: https://github.com/googleapis/synthtool/commit/df5093b950d4aafd49a4c7758d74c44485263ada * chore: remove readme synth.py config Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:23:41 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 2d31a9243781b282202b4f76dc7bbc8b45803196 Source-Link: https://github.com/googleapis/synthtool/commit/2d31a9243781b282202b4f76dc7bbc8b45803196 * chore: add gcf-owl-bot to list of trusted contributors Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:42:12 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: a6b97202771f89a4b76873d43ea9a07d7fc95f91 Source-Link: https://github.com/googleapis/synthtool/commit/a6b97202771f89a4b76873d43ea9a07d7fc95f91 --- .github/trusted-contribution.yml | 3 ++- synth.metadata | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index f247d5c7893..a0ba1f7d907 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,2 +1,3 @@ trustedContributors: -- renovate-bot \ No newline at end of file +- renovate-bot +- gcf-owl-bot[bot] diff --git a/synth.metadata b/synth.metadata index ddee3d6f71f..f0941a2fe31 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "87b77a3be3fc9cb206e147dcce818b594b2c6b4b" + "sha": "0a311ad38558dbf91c863941165cce456cf3c14c" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925" + "sha": "a6b97202771f89a4b76873d43ea9a07d7fc95f91" } } ], @@ -58,7 +58,6 @@ ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", ".github/generated-files-bot.yml", - ".github/readme/synth.py", ".github/release-trigger.yml", ".github/snippet-bot.yml", ".github/trusted-contribution.yml", @@ -70,7 +69,6 @@ ".kokoro/common.cfg", ".kokoro/common.sh", ".kokoro/continuous/java8.cfg", - ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", ".kokoro/nightly/integration.cfg", ".kokoro/nightly/java11.cfg", From 85b4f31d065202527ad3220cca9df94d40020e0a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Sep 2021 01:38:08 +0200 Subject: [PATCH 15/37] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 (#1420) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0690b25508c..d93bdff1f12 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ UTF-8 github google-cloud-spanner-parent - 2.2.0 + 2.2.1 From a69e49cf17c8b7c1667c6a2067a91a4b350747c3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Sep 2021 04:06:15 +0200 Subject: [PATCH 16/37] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.0.2 (#1421) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.0.1` -> `1.0.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.2/compatibility-slim/1.0.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.2/confidence-slim/1.0.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes

googleapis/java-shared-config ### [`v1.0.2`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​102-httpswwwgithubcomgoogleapisjava-shared-configcomparev101v102-2021-09-13) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.0.1...v1.0.2)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-spanner). --- google-cloud-spanner-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 478e13abc38..96cbd34d0ee 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 Google Cloud Spanner BOM diff --git a/pom.xml b/pom.xml index d93bdff1f12..920108cf7a5 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 From d57d47eb3086d7352b6f7af1c4cc694de030e3ee Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Sep 2021 17:32:33 +0200 Subject: [PATCH 17/37] deps: update dependency com.google.cloud:google-cloud-monitoring to v3.0.4 (#1422) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index d3cdddd7c42..49f414394ac 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -23,7 +23,7 @@ UTF-8 0.28.3 2.0.3 - 3.0.3 + 3.0.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index fc202ebea34..2ebd680d0d0 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -23,7 +23,7 @@ UTF-8 0.28.3 2.0.3 - 3.0.3 + 3.0.4 From ce8776a310f0d53ea2aee738e0d56dc56371fa51 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Sep 2021 20:08:50 +0200 Subject: [PATCH 18/37] deps: update dependency com.google.cloud:google-cloud-trace to v2.0.4 (#1425) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 49f414394ac..00f2454a0bf 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -22,7 +22,7 @@ 1.8 UTF-8 0.28.3 - 2.0.3 + 2.0.4 3.0.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2ebd680d0d0..6c07a4be9a5 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -22,7 +22,7 @@ 1.8 UTF-8 0.28.3 - 2.0.3 + 2.0.4 3.0.4 From b5c3b214f01e44664921179864a61dab95bd6a4a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 14 Sep 2021 18:29:59 -0700 Subject: [PATCH 19/37] changes without context (#1418) autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. Co-authored-by: Emily Ball --- .github/readme/synth.py | 19 ++++++++++++ .kokoro/continuous/readme.cfg | 55 +++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 .github/readme/synth.py create mode 100644 .kokoro/continuous/readme.cfg diff --git a/.github/readme/synth.py b/.github/readme/synth.py new file mode 100644 index 00000000000..7b48cc28d36 --- /dev/null +++ b/.github/readme/synth.py @@ -0,0 +1,19 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""This script is used to synthesize generated the README for this library.""" + +from synthtool.languages import java + +java.custom_templates(["java_library/README.md"]) diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg new file mode 100644 index 00000000000..acd7dd9717e --- /dev/null +++ b/.kokoro/continuous/readme.cfg @@ -0,0 +1,55 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-spanner/.kokoro/readme.sh" +} + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + regex: "**/*sponge_log.log" + } +} + +# The github token is stored here. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "yoshi-automation-github-key" + # TODO(theacodes): remove this after secrets have globally propagated + backend_type: FASTCONFIGPUSH + } + } +} + +# Common env vars for all repositories and builds. +env_vars: { + key: "GITHUB_USER" + value: "yoshi-automation" +} +env_vars: { + key: "GITHUB_EMAIL" + value: "yoshi-automation@google.com" +} From 2a3b0d3396b461f81976c8aa183a8e9ff5f23736 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 14 Sep 2021 19:06:20 -0700 Subject: [PATCH 20/37] chore(java): update shared-config and shared-dependencies version in pom template (#1423) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/31a9bae7-af83-42b9-b54f-721fbf7914c2/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e --- .kokoro/release/common.sh | 2 +- .kokoro/release/drop.sh | 2 +- .kokoro/release/promote.sh | 2 +- .kokoro/release/publish_javadoc.sh | 2 +- .kokoro/release/publish_javadoc11.sh | 2 +- .kokoro/release/stage.sh | 2 +- .kokoro/trampoline.sh | 2 +- synth.metadata | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh index 6e3f65999b3..7f78ee414fa 100755 --- a/.kokoro/release/common.sh +++ b/.kokoro/release/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh index 5c4551efa2c..742ec1a8860 100755 --- a/.kokoro/release/drop.sh +++ b/.kokoro/release/drop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh index 1fa95fa537a..3cac3d8a97d 100755 --- a/.kokoro/release/promote.sh +++ b/.kokoro/release/promote.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index ecdcccffed3..40c2797223b 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 Google Inc. +# Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 7f17db09b2d..43db20d266f 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Google Inc. +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 8a1033843cb..77dc4e8f0f3 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 9da0f839877..8b69b793c9e 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/synth.metadata b/synth.metadata index f0941a2fe31..eeca1e595d6 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "0a311ad38558dbf91c863941165cce456cf3c14c" + "sha": "a69e49cf17c8b7c1667c6a2067a91a4b350747c3" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "a6b97202771f89a4b76873d43ea9a07d7fc95f91" + "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e" } } ], From cffde7c2bc404f0cbe544ee83a648cf46e56aaa6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 15 Sep 2021 15:23:07 +1000 Subject: [PATCH 21/37] chore: release 6.12.3 (#1406) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 16 ++++++++++++++++ google-cloud-spanner-bom/pom.xml | 18 +++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 12 files changed, 55 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40003760f64..98df8f8ab1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +### [6.12.3](https://www.github.com/googleapis/java-spanner/compare/v6.12.2...v6.12.3) (2021-09-15) + + +### Bug Fixes + +* drop databases after sample tests ([#1401](https://www.github.com/googleapis/java-spanner/issues/1401)) ([c9f5048](https://www.github.com/googleapis/java-spanner/commit/c9f504829f53bfcff6f78bbbbc447cc8f10f5940)) +* fix JSON sample test ([#1417](https://www.github.com/googleapis/java-spanner/issues/1417)) ([dc1f9a9](https://www.github.com/googleapis/java-spanner/commit/dc1f9a92a7562e2585e2762c2749eb3207f67c25)) +* revert test category refactoring ([#1419](https://www.github.com/googleapis/java-spanner/issues/1419)) ([fe2ad14](https://www.github.com/googleapis/java-spanner/commit/fe2ad14eae2002552d61e497f9892c96584efc24)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-monitoring to v3.0.4 ([#1422](https://www.github.com/googleapis/java-spanner/issues/1422)) ([d57d47e](https://www.github.com/googleapis/java-spanner/commit/d57d47eb3086d7352b6f7af1c4cc694de030e3ee)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 ([#1420](https://www.github.com/googleapis/java-spanner/issues/1420)) ([85b4f31](https://www.github.com/googleapis/java-spanner/commit/85b4f31d065202527ad3220cca9df94d40020e0a)) +* update dependency com.google.cloud:google-cloud-trace to v2.0.4 ([#1425](https://www.github.com/googleapis/java-spanner/issues/1425)) ([ce8776a](https://www.github.com/googleapis/java-spanner/commit/ce8776a310f0d53ea2aee738e0d56dc56371fa51)) + ### [6.12.2](https://www.github.com/googleapis/java-spanner/compare/v6.12.1...v6.12.2) (2021-09-01) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 96cbd34d0ee..1ef93626736 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.12.3-SNAPSHOT + 6.12.3 pom com.google.cloud @@ -54,43 +54,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.cloud google-cloud-spanner - 6.12.3-SNAPSHOT + 6.12.3 com.google.cloud google-cloud-spanner test-jar - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.3-SNAPSHOT + 6.12.3 diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 39f25012bd0..b3300988594 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.12.3-SNAPSHOT + 6.12.3 jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.12.3-SNAPSHOT + 6.12.3 google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index ffc6091d4a8..b950b1bdfaa 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.3-SNAPSHOT + 6.12.3 grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3-SNAPSHOT + 6.12.3 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 8c30e17296a..8823c24bbdb 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.3-SNAPSHOT + 6.12.3 grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3-SNAPSHOT + 6.12.3 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index 02df85b622c..9371dcefed0 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.3-SNAPSHOT + 6.12.3 grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3-SNAPSHOT + 6.12.3 diff --git a/pom.xml b/pom.xml index 920108cf7a5..0bc47bef97c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.12.3-SNAPSHOT + 6.12.3 Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -62,37 +62,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.3-SNAPSHOT + 6.12.3 com.google.cloud google-cloud-spanner - 6.12.3-SNAPSHOT + 6.12.3 diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index 397671095d6..75813b9ed70 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.3-SNAPSHOT + 6.12.3 proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3-SNAPSHOT + 6.12.3 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 29ab98210e4..e5cfc47a60e 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.3-SNAPSHOT + 6.12.3 proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3-SNAPSHOT + 6.12.3 diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index ad95b700bff..f4d11d157a0 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.3-SNAPSHOT + 6.12.3 proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3-SNAPSHOT + 6.12.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6c07a4be9a5..66e6db4714e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 6.12.3-SNAPSHOT + 6.12.3 diff --git a/versions.txt b/versions.txt index 4a0240bd193..9102bed54a8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.12.2:6.12.3-SNAPSHOT -proto-google-cloud-spanner-v1:6.12.2:6.12.3-SNAPSHOT -proto-google-cloud-spanner-admin-database-v1:6.12.2:6.12.3-SNAPSHOT -grpc-google-cloud-spanner-v1:6.12.2:6.12.3-SNAPSHOT -grpc-google-cloud-spanner-admin-instance-v1:6.12.2:6.12.3-SNAPSHOT -grpc-google-cloud-spanner-admin-database-v1:6.12.2:6.12.3-SNAPSHOT -google-cloud-spanner:6.12.2:6.12.3-SNAPSHOT \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:6.12.3:6.12.3 +proto-google-cloud-spanner-v1:6.12.3:6.12.3 +proto-google-cloud-spanner-admin-database-v1:6.12.3:6.12.3 +grpc-google-cloud-spanner-v1:6.12.3:6.12.3 +grpc-google-cloud-spanner-admin-instance-v1:6.12.3:6.12.3 +grpc-google-cloud-spanner-admin-database-v1:6.12.3:6.12.3 +google-cloud-spanner:6.12.3:6.12.3 \ No newline at end of file From 2d262a1e1116680fc1fa659475af1e57b5ebb738 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 15 Sep 2021 05:56:10 +0000 Subject: [PATCH 22/37] chore: release 6.12.4-SNAPSHOT (#1427) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-spanner-bom/pom.xml | 18 +++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 1ef93626736..390672c2391 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.12.3 + 6.12.4-SNAPSHOT pom com.google.cloud @@ -54,43 +54,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.cloud google-cloud-spanner - 6.12.3 + 6.12.4-SNAPSHOT com.google.cloud google-cloud-spanner test-jar - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.3 + 6.12.4-SNAPSHOT diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index b3300988594..1f726e9d147 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.12.3 + 6.12.4-SNAPSHOT jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.12.3 + 6.12.4-SNAPSHOT google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index b950b1bdfaa..a7ff6677134 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.3 + 6.12.4-SNAPSHOT grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3 + 6.12.4-SNAPSHOT diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 8823c24bbdb..f12a9375342 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.3 + 6.12.4-SNAPSHOT grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3 + 6.12.4-SNAPSHOT diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index 9371dcefed0..a7a1be47ce6 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.3 + 6.12.4-SNAPSHOT grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3 + 6.12.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0bc47bef97c..10d2a888ef7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.12.3 + 6.12.4-SNAPSHOT Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -62,37 +62,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.3 + 6.12.4-SNAPSHOT com.google.cloud google-cloud-spanner - 6.12.3 + 6.12.4-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index 75813b9ed70..d8fb2d6312b 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.3 + 6.12.4-SNAPSHOT proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3 + 6.12.4-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index e5cfc47a60e..5fe284b9bd8 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.3 + 6.12.4-SNAPSHOT proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3 + 6.12.4-SNAPSHOT diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index f4d11d157a0..49b7f582ad4 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.3 + 6.12.4-SNAPSHOT proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.3 + 6.12.4-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 66e6db4714e..165d42fadbf 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 6.12.3 + 6.12.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 9102bed54a8..b3da96528cf 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.12.3:6.12.3 -proto-google-cloud-spanner-v1:6.12.3:6.12.3 -proto-google-cloud-spanner-admin-database-v1:6.12.3:6.12.3 -grpc-google-cloud-spanner-v1:6.12.3:6.12.3 -grpc-google-cloud-spanner-admin-instance-v1:6.12.3:6.12.3 -grpc-google-cloud-spanner-admin-database-v1:6.12.3:6.12.3 -google-cloud-spanner:6.12.3:6.12.3 \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:6.12.3:6.12.4-SNAPSHOT +proto-google-cloud-spanner-v1:6.12.3:6.12.4-SNAPSHOT +proto-google-cloud-spanner-admin-database-v1:6.12.3:6.12.4-SNAPSHOT +grpc-google-cloud-spanner-v1:6.12.3:6.12.4-SNAPSHOT +grpc-google-cloud-spanner-admin-instance-v1:6.12.3:6.12.4-SNAPSHOT +grpc-google-cloud-spanner-admin-database-v1:6.12.3:6.12.4-SNAPSHOT +google-cloud-spanner:6.12.3:6.12.4-SNAPSHOT \ No newline at end of file From 29209f83d10fa01b5566da66259da95dd60abca0 Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Wed, 15 Sep 2021 16:23:35 +1000 Subject: [PATCH 23/37] fix: do not serialize unnecessary fields (#1426) Do not serialize java.util.regex.Pattern and executor fields in client side statement. This caused an issue with Java 16 compilation, where an IllegalAccessException is thrown during JSON serialization of such fields. --- .../cloud/spanner/connection/ClientSideStatementImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatementImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatementImpl.java index e9c9c1654e9..05dbc8975ce 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatementImpl.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatementImpl.java @@ -131,10 +131,10 @@ public String getMessage() { private ClientSideSetStatementImpl setStatement; /** The compiled regex pattern for recognizing this statement. */ - private Pattern pattern; + private transient Pattern pattern; /** A reference to the executor that should be used. */ - private ClientSideStatementExecutor executor; + private transient ClientSideStatementExecutor executor; /** * Compiles this {@link ClientSideStatementImpl}. Throws a {@link CompileException} if the From 32eee0aa14f0b276673dca7a65e011a509e96453 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 16 Sep 2021 05:25:54 +0200 Subject: [PATCH 24/37] deps: update dependency com.google.cloud:google-cloud-monitoring to v3.0.5 (#1431) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 00f2454a0bf..da2a721de6a 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -23,7 +23,7 @@ UTF-8 0.28.3 2.0.4 - 3.0.4 + 3.0.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 165d42fadbf..23c020acedd 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -23,7 +23,7 @@ UTF-8 0.28.3 2.0.4 - 3.0.4 + 3.0.5 From ac835ca227dc11b7530140314ad27c56d69091b8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 19:20:26 +0000 Subject: [PATCH 25/37] chore: release 6.12.4 (#1428) :robot: I have created a release \*beep\* \*boop\* --- ### [6.12.4](https://www.github.com/googleapis/java-spanner/compare/v6.12.3...v6.12.4) (2021-09-16) ### Bug Fixes * do not serialize unnecessary fields ([#1426](https://www.github.com/googleapis/java-spanner/issues/1426)) ([29209f8](https://www.github.com/googleapis/java-spanner/commit/29209f83d10fa01b5566da66259da95dd60abca0)) ### Dependencies * update dependency com.google.cloud:google-cloud-monitoring to v3.0.5 ([#1431](https://www.github.com/googleapis/java-spanner/issues/1431)) ([32eee0a](https://www.github.com/googleapis/java-spanner/commit/32eee0aa14f0b276673dca7a65e011a509e96453)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 12 ++++++++++++ google-cloud-spanner-bom/pom.xml | 18 +++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 12 files changed, 51 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98df8f8ab1f..8d806c064ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [6.12.4](https://www.github.com/googleapis/java-spanner/compare/v6.12.3...v6.12.4) (2021-09-16) + + +### Bug Fixes + +* do not serialize unnecessary fields ([#1426](https://www.github.com/googleapis/java-spanner/issues/1426)) ([29209f8](https://www.github.com/googleapis/java-spanner/commit/29209f83d10fa01b5566da66259da95dd60abca0)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-monitoring to v3.0.5 ([#1431](https://www.github.com/googleapis/java-spanner/issues/1431)) ([32eee0a](https://www.github.com/googleapis/java-spanner/commit/32eee0aa14f0b276673dca7a65e011a509e96453)) + ### [6.12.3](https://www.github.com/googleapis/java-spanner/compare/v6.12.2...v6.12.3) (2021-09-15) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 390672c2391..5bbd16686ac 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.12.4-SNAPSHOT + 6.12.4 pom com.google.cloud @@ -54,43 +54,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.cloud google-cloud-spanner - 6.12.4-SNAPSHOT + 6.12.4 com.google.cloud google-cloud-spanner test-jar - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.4-SNAPSHOT + 6.12.4 diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 1f726e9d147..051d41753d1 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.12.4-SNAPSHOT + 6.12.4 jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.12.4-SNAPSHOT + 6.12.4 google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index a7ff6677134..1734cf1ea1c 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.4-SNAPSHOT + 6.12.4 grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4-SNAPSHOT + 6.12.4 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index f12a9375342..745e838f99f 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.4-SNAPSHOT + 6.12.4 grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4-SNAPSHOT + 6.12.4 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index a7a1be47ce6..9cd116fb8d0 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.4-SNAPSHOT + 6.12.4 grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4-SNAPSHOT + 6.12.4 diff --git a/pom.xml b/pom.xml index 10d2a888ef7..e6744e6b68f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.12.4-SNAPSHOT + 6.12.4 Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -62,37 +62,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.4-SNAPSHOT + 6.12.4 com.google.cloud google-cloud-spanner - 6.12.4-SNAPSHOT + 6.12.4 diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index d8fb2d6312b..a740926be75 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.4-SNAPSHOT + 6.12.4 proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4-SNAPSHOT + 6.12.4 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 5fe284b9bd8..6b761b088a4 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.4-SNAPSHOT + 6.12.4 proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4-SNAPSHOT + 6.12.4 diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 49b7f582ad4..d826f9a165f 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.4-SNAPSHOT + 6.12.4 proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4-SNAPSHOT + 6.12.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 23c020acedd..58593287ea9 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 6.12.4-SNAPSHOT + 6.12.4 diff --git a/versions.txt b/versions.txt index b3da96528cf..0634862c4b8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.12.3:6.12.4-SNAPSHOT -proto-google-cloud-spanner-v1:6.12.3:6.12.4-SNAPSHOT -proto-google-cloud-spanner-admin-database-v1:6.12.3:6.12.4-SNAPSHOT -grpc-google-cloud-spanner-v1:6.12.3:6.12.4-SNAPSHOT -grpc-google-cloud-spanner-admin-instance-v1:6.12.3:6.12.4-SNAPSHOT -grpc-google-cloud-spanner-admin-database-v1:6.12.3:6.12.4-SNAPSHOT -google-cloud-spanner:6.12.3:6.12.4-SNAPSHOT \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:6.12.4:6.12.4 +proto-google-cloud-spanner-v1:6.12.4:6.12.4 +proto-google-cloud-spanner-admin-database-v1:6.12.4:6.12.4 +grpc-google-cloud-spanner-v1:6.12.4:6.12.4 +grpc-google-cloud-spanner-admin-instance-v1:6.12.4:6.12.4 +grpc-google-cloud-spanner-admin-database-v1:6.12.4:6.12.4 +google-cloud-spanner:6.12.4:6.12.4 \ No newline at end of file From 03a82fd32fa1ef2edd6d1e697897385cea0532a0 Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Thu, 23 Sep 2021 20:52:07 +1000 Subject: [PATCH 26/37] chore: increase integration tests timeout (#1440) --- google-cloud-spanner/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 051d41753d1..91634213a31 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -74,7 +74,7 @@ gcloud-devel projects/gcloud-devel/locations/us-central1/keyRings/spanner-test-keyring/cryptoKeys/spanner-test-key - 3000 + 6000 @@ -422,7 +422,7 @@ true ipv4 - 3000 + 6000 From 6bdeddf7612964d4d59061d0a7c2956d66619a4b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 23 Sep 2021 13:28:15 +0200 Subject: [PATCH 27/37] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.3.0 (#1439) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6744e6b68f..fbe25def039 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ UTF-8 github google-cloud-spanner-parent - 2.2.1 + 2.3.0 From 1fc25404c7df94816446163efe90b589d76c4cc2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 23 Sep 2021 13:30:12 +0200 Subject: [PATCH 28/37] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.0.3 (#1437) --- google-cloud-spanner-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 5bbd16686ac..f05977fc8e7 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.0.2 + 1.0.3 Google Cloud Spanner BOM diff --git a/pom.xml b/pom.xml index fbe25def039..614ae8c41a5 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.2 + 1.0.3 From 49360b13e5d8904bfdc09cb4db8c24848debfa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Thu, 23 Sep 2021 13:38:51 +0200 Subject: [PATCH 29/37] fix: sessions were not always removed from checkedOutSessions (#1438) Sessions were added to a set of checked out sessions when one was checked out from the session pool. When the session was released back to the pool, the session would normally be removed from the set of checked out sessions. The latter would not always happen if the application that checked out the session did not use the session for any reads or writes. Co-authored-by: Thiago Nunes --- .../com/google/cloud/spanner/SessionPool.java | 33 ++++---- .../cloud/spanner/DatabaseClientImplTest.java | 77 ++++++++++++++++++- 2 files changed, 93 insertions(+), 17 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java index fbfc472bf53..95cc167fe10 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java @@ -1250,25 +1250,27 @@ public void prepareReadWriteTransaction() { @Override public void close() { - synchronized (lock) { - leakedException = null; - checkedOutSessions.remove(this); - } - PooledSession delegate = getOrNull(); - if (delegate != null) { - delegate.close(); + try { + asyncClose().get(); + } catch (InterruptedException e) { + throw SpannerExceptionFactory.propagateInterrupt(e); + } catch (ExecutionException e) { + throw SpannerExceptionFactory.asSpannerException(e.getCause()); } } @Override public ApiFuture asyncClose() { - synchronized (lock) { - leakedException = null; - checkedOutSessions.remove(this); - } - PooledSession delegate = getOrNull(); - if (delegate != null) { - return delegate.asyncClose(); + try { + PooledSession delegate = getOrNull(); + if (delegate != null) { + return delegate.asyncClose(); + } + } finally { + synchronized (lock) { + leakedException = null; + checkedOutSessions.remove(this); + } } return ApiFutures.immediateFuture(Empty.getDefaultInstance()); } @@ -1777,7 +1779,8 @@ private enum Position { private final Set allSessions = new HashSet<>(); @GuardedBy("lock") - private final Set checkedOutSessions = new HashSet<>(); + @VisibleForTesting + final Set checkedOutSessions = new HashSet<>(); private final SessionConsumer sessionConsumer = new SessionConsumerImpl(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java index 0a1efc2a48c..c2d6dc4cd21 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java @@ -69,6 +69,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -534,13 +535,18 @@ public void testAsyncTransactionManagerCommitWithTag() { @Test public void singleUse() { - DatabaseClient client = - spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE)); + DatabaseClientImpl client = + (DatabaseClientImpl) + spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE)); + Set checkedOut = client.pool.checkedOutSessions; + assertThat(checkedOut).isEmpty(); try (ResultSet rs = client.singleUse().executeQuery(SELECT1)) { assertThat(rs.next()).isTrue(); + assertThat(checkedOut).hasSize(1); assertThat(rs.getLong(0)).isEqualTo(1L); assertThat(rs.next()).isFalse(); } + assertThat(checkedOut).isEmpty(); } @Test @@ -2097,4 +2103,71 @@ public void testAsyncTransactionManagerCommitWithPriority() { assertNotNull(request.getRequestOptions()); assertEquals(Priority.PRIORITY_HIGH, request.getRequestOptions().getPriority()); } + + @Test + public void singleUseNoAction_ClearsCheckedOutSession() { + DatabaseClientImpl client = + (DatabaseClientImpl) + spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE)); + Set checkedOut = client.pool.checkedOutSessions; + assertThat(checkedOut).isEmpty(); + + // Getting a single use read-only transaction and not using it should not cause any sessions + // to be stuck in the map of checked out sessions. + client.singleUse().close(); + + assertThat(checkedOut).isEmpty(); + } + + @Test + public void singleUseReadOnlyTransactionNoAction_ClearsCheckedOutSession() { + DatabaseClientImpl client = + (DatabaseClientImpl) + spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE)); + Set checkedOut = client.pool.checkedOutSessions; + assertThat(checkedOut).isEmpty(); + + client.singleUseReadOnlyTransaction().close(); + + assertThat(checkedOut).isEmpty(); + } + + @Test + public void readWriteTransactionNoAction_ClearsCheckedOutSession() { + DatabaseClientImpl client = + (DatabaseClientImpl) + spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE)); + Set checkedOut = client.pool.checkedOutSessions; + assertThat(checkedOut).isEmpty(); + + client.readWriteTransaction(); + + assertThat(checkedOut).isEmpty(); + } + + @Test + public void readOnlyTransactionNoAction_ClearsCheckedOutSession() { + DatabaseClientImpl client = + (DatabaseClientImpl) + spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE)); + Set checkedOut = client.pool.checkedOutSessions; + assertThat(checkedOut).isEmpty(); + + client.readOnlyTransaction().close(); + + assertThat(checkedOut).isEmpty(); + } + + @Test + public void transactionManagerNoAction_ClearsCheckedOutSession() { + DatabaseClientImpl client = + (DatabaseClientImpl) + spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE)); + Set checkedOut = client.pool.checkedOutSessions; + assertThat(checkedOut).isEmpty(); + + client.transactionManager().close(); + + assertThat(checkedOut).isEmpty(); + } } From 3184a4137b9081b745dc6c54860e8d25dcd5b0ea Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 23 Sep 2021 11:36:29 -0700 Subject: [PATCH 30/37] chore: remove readme autosynth config (#1441) --- .github/readme/synth.py | 19 ------------ .kokoro/continuous/readme.cfg | 55 ----------------------------------- 2 files changed, 74 deletions(-) delete mode 100644 .github/readme/synth.py delete mode 100644 .kokoro/continuous/readme.cfg diff --git a/.github/readme/synth.py b/.github/readme/synth.py deleted file mode 100644 index 7b48cc28d36..00000000000 --- a/.github/readme/synth.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""This script is used to synthesize generated the README for this library.""" - -from synthtool.languages import java - -java.custom_templates(["java_library/README.md"]) diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index acd7dd9717e..00000000000 --- a/.kokoro/continuous/readme.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-spanner/.kokoro/readme.sh" -} - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.log" - } -} - -# The github token is stored here. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - # TODO(theacodes): remove this after secrets have globally propagated - backend_type: FASTCONFIGPUSH - } - } -} - -# Common env vars for all repositories and builds. -env_vars: { - key: "GITHUB_USER" - value: "yoshi-automation" -} -env_vars: { - key: "GITHUB_EMAIL" - value: "yoshi-automation@google.com" -} From 06f98b174b785d61ad430b27a3a8216e3c874318 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 18:44:12 +0000 Subject: [PATCH 31/37] chore: release 6.12.5-SNAPSHOT (#1435) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-spanner-bom/pom.xml | 18 +++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index f05977fc8e7..8fdb3cb5322 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.12.4 + 6.12.5-SNAPSHOT pom com.google.cloud @@ -54,43 +54,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.cloud google-cloud-spanner - 6.12.4 + 6.12.5-SNAPSHOT com.google.cloud google-cloud-spanner test-jar - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.4 + 6.12.5-SNAPSHOT diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 91634213a31..196217dc327 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.12.4 + 6.12.5-SNAPSHOT jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.12.4 + 6.12.5-SNAPSHOT google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index 1734cf1ea1c..4077a62df79 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.4 + 6.12.5-SNAPSHOT grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4 + 6.12.5-SNAPSHOT diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 745e838f99f..5082a95511d 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.4 + 6.12.5-SNAPSHOT grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4 + 6.12.5-SNAPSHOT diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index 9cd116fb8d0..69da989f622 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.4 + 6.12.5-SNAPSHOT grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4 + 6.12.5-SNAPSHOT diff --git a/pom.xml b/pom.xml index 614ae8c41a5..dc7be8f8708 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.12.4 + 6.12.5-SNAPSHOT Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -62,37 +62,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.4 + 6.12.5-SNAPSHOT com.google.cloud google-cloud-spanner - 6.12.4 + 6.12.5-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index a740926be75..e88c1577ff1 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.4 + 6.12.5-SNAPSHOT proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4 + 6.12.5-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 6b761b088a4..04a0c7daaac 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.4 + 6.12.5-SNAPSHOT proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4 + 6.12.5-SNAPSHOT diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index d826f9a165f..d69470613fe 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.4 + 6.12.5-SNAPSHOT proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.4 + 6.12.5-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 58593287ea9..ad8e81dc7f3 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 6.12.4 + 6.12.5-SNAPSHOT diff --git a/versions.txt b/versions.txt index 0634862c4b8..0e9c0686329 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.12.4:6.12.4 -proto-google-cloud-spanner-v1:6.12.4:6.12.4 -proto-google-cloud-spanner-admin-database-v1:6.12.4:6.12.4 -grpc-google-cloud-spanner-v1:6.12.4:6.12.4 -grpc-google-cloud-spanner-admin-instance-v1:6.12.4:6.12.4 -grpc-google-cloud-spanner-admin-database-v1:6.12.4:6.12.4 -google-cloud-spanner:6.12.4:6.12.4 \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:6.12.4:6.12.5-SNAPSHOT +proto-google-cloud-spanner-v1:6.12.4:6.12.5-SNAPSHOT +proto-google-cloud-spanner-admin-database-v1:6.12.4:6.12.5-SNAPSHOT +grpc-google-cloud-spanner-v1:6.12.4:6.12.5-SNAPSHOT +grpc-google-cloud-spanner-admin-instance-v1:6.12.4:6.12.5-SNAPSHOT +grpc-google-cloud-spanner-admin-database-v1:6.12.4:6.12.5-SNAPSHOT +google-cloud-spanner:6.12.4:6.12.5-SNAPSHOT \ No newline at end of file From 8cfe6afd30ded41568c82a154858db0089ac5d87 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 24 Sep 2021 02:15:41 -0700 Subject: [PATCH 32/37] chore(java): remove dependencyDashboardLabel config from renovate.json (#1444) Source-Author: Neenu Shaji Source-Date: Thu Sep 23 14:36:33 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 0752ff727a19a467dffed335d5e59303689cf0d1 Source-Link: https://github.com/googleapis/synthtool/commit/0752ff727a19a467dffed335d5e59303689cf0d1 --- renovate.json | 5 +---- synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/renovate.json b/renovate.json index de367d36a86..6c98729fcab 100644 --- a/renovate.json +++ b/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } diff --git a/synth.metadata b/synth.metadata index eeca1e595d6..7cc170aa1bf 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "a69e49cf17c8b7c1667c6a2067a91a4b350747c3" + "sha": "06f98b174b785d61ad430b27a3a8216e3c874318" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e" + "sha": "0752ff727a19a467dffed335d5e59303689cf0d1" } } ], From b52c9e9e9a0b41330ea7fd9fadaa8257baa6974e Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 24 Sep 2021 03:55:13 -0700 Subject: [PATCH 33/37] chore: update gapic-generator-java version to 2.1.0 (#1360) PiperOrigin-RevId: 391407209 Source-Author: Google APIs Source-Date: Tue Aug 17 16:48:10 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: e1738ee972b49fd0c4d4718b035444495142b781 Source-Link: https://github.com/googleapis/googleapis/commit/e1738ee972b49fd0c4d4718b035444495142b781 --- .../admin/database/v1/stub/DatabaseAdminStubSettings.java | 4 +++- .../admin/instance/v1/stub/InstanceAdminStubSettings.java | 4 +++- .../com/google/cloud/spanner/v1/stub/SpannerStubSettings.java | 4 +++- synth.metadata | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java index d1dbb494594..aea9b512a1c 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java @@ -557,7 +557,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java index 556fa9a1b12..9f9cce8660e 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java @@ -350,7 +350,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java index badbcd98ed0..dfa85e2d85d 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java @@ -300,7 +300,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/synth.metadata b/synth.metadata index 7cc170aa1bf..392814c1d12 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a739464cacb3aa6d375683aefe16b79c21da1bb0", - "internalRef": "389657692" + "sha": "e1738ee972b49fd0c4d4718b035444495142b781", + "internalRef": "391407209" } }, { From 2ce9a1bd5cf8edb36b1c4fe57f2d9b304dcd6ccc Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 24 Sep 2021 22:40:26 +0200 Subject: [PATCH 34/37] deps: update dependency com.google.cloud:google-cloud-trace to v2.0.5 (#1459) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-trace](https://togithub.com/googleapis/java-core) | `2.0.4` -> `2.0.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-trace/2.0.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-trace/2.0.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-trace/2.0.5/compatibility-slim/2.0.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-trace/2.0.5/confidence-slim/2.0.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-core ### [`v2.0.5`](https://togithub.com/googleapis/java-core/blob/master/CHANGELOG.md#​205-httpswwwgithubcomgoogleapisjava-corecomparev204v205-2021-08-11) [Compare Source](https://togithub.com/googleapis/java-core/compare/v2.0.4...v2.0.5)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-spanner). --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index da2a721de6a..ce4c09f29c4 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -22,7 +22,7 @@ 1.8 UTF-8 0.28.3 - 2.0.4 + 2.0.5 3.0.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ad8e81dc7f3..2fa4f235c89 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -22,7 +22,7 @@ 1.8 UTF-8 0.28.3 - 2.0.4 + 2.0.5 3.0.5 From 159c026a250e6f9d6d583ef3123403a64f817e40 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 25 Sep 2021 01:22:55 +0200 Subject: [PATCH 35/37] deps: update dependency com.google.cloud:google-cloud-monitoring to v3.0.6 (#1443) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-monitoring](https://togithub.com/googleapis/java-monitoring) | `3.0.5` -> `3.0.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-monitoring/3.0.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-monitoring/3.0.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-monitoring/3.0.6/compatibility-slim/3.0.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-monitoring/3.0.6/confidence-slim/3.0.5)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-monitoring ### [`v3.0.6`](https://togithub.com/googleapis/java-monitoring/blob/master/CHANGELOG.md#​306-httpswwwgithubcomgoogleapisjava-monitoringcomparev305v306-2021-09-23) [Compare Source](https://togithub.com/googleapis/java-monitoring/compare/v3.0.5...v3.0.6)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-spanner). --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ce4c09f29c4..0a046fc9613 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -23,7 +23,7 @@ UTF-8 0.28.3 2.0.5 - 3.0.5 + 3.0.6 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2fa4f235c89..4025a6e3434 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -23,7 +23,7 @@ UTF-8 0.28.3 2.0.5 - 3.0.5 + 3.0.6 From 464c5738198c3b931f028976d888346f327029f1 Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Mon, 27 Sep 2021 21:21:10 +1000 Subject: [PATCH 36/37] chore: run it tests serially (#1458) * chore: fix failsafe plugin hanging * chore: try running all tests serially --- .kokoro/build.sh | 7 ++++++- google-cloud-spanner/pom.xml | 14 +------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index c8c09af3fa5..55441238bf8 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -47,7 +47,10 @@ set +e case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true -Denforcer.skip=true + mvn test -B \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Djava.net.preferIPv4Stack=true RETURN_CODE=$? ;; lint) @@ -62,6 +65,7 @@ integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ -Penable-integration-tests \ + -Djava.net.preferIPv4Stack=true \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ @@ -73,6 +77,7 @@ slowtests) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ -Pslow-tests \ + -Djava.net.preferIPv4Stack=true \ -DskipITs=false \ -DtrimStackTrace=false \ -Dclirr.skip=true \ diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 196217dc327..382da6215b1 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -81,19 +81,7 @@ default - com.google.cloud.spanner.SerialIntegrationTest - - - - - parallel-integration-test - - integration-test - - - com.google.cloud.spanner.ParallelIntegrationTest - 8 - true + com.google.cloud.spanner.SerialIntegrationTest, com.google.cloud.spanner.ParallelIntegrationTest From 62929a99fdbddd1feae497bdfe993b80ada1995d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 22:38:49 +1000 Subject: [PATCH 37/37] chore: release 6.12.5 (#1442) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 14 ++++++++++++++ google-cloud-spanner-bom/pom.xml | 18 +++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 12 files changed, 53 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d806c064ae..a3b87f8a622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [6.12.5](https://www.github.com/googleapis/java-spanner/compare/v6.12.4...v6.12.5) (2021-09-27) + + +### Bug Fixes + +* sessions were not always removed from checkedOutSessions ([#1438](https://www.github.com/googleapis/java-spanner/issues/1438)) ([49360b1](https://www.github.com/googleapis/java-spanner/commit/49360b13e5d8904bfdc09cb4db8c24848debfa0b)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-monitoring to v3.0.6 ([#1443](https://www.github.com/googleapis/java-spanner/issues/1443)) ([159c026](https://www.github.com/googleapis/java-spanner/commit/159c026a250e6f9d6d583ef3123403a64f817e40)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.3.0 ([#1439](https://www.github.com/googleapis/java-spanner/issues/1439)) ([6bdeddf](https://www.github.com/googleapis/java-spanner/commit/6bdeddf7612964d4d59061d0a7c2956d66619a4b)) +* update dependency com.google.cloud:google-cloud-trace to v2.0.5 ([#1459](https://www.github.com/googleapis/java-spanner/issues/1459)) ([2ce9a1b](https://www.github.com/googleapis/java-spanner/commit/2ce9a1bd5cf8edb36b1c4fe57f2d9b304dcd6ccc)) + ### [6.12.4](https://www.github.com/googleapis/java-spanner/compare/v6.12.3...v6.12.4) (2021-09-16) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 8fdb3cb5322..73c83d5f355 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.12.5-SNAPSHOT + 6.12.5 pom com.google.cloud @@ -54,43 +54,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.cloud google-cloud-spanner - 6.12.5-SNAPSHOT + 6.12.5 com.google.cloud google-cloud-spanner test-jar - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.5-SNAPSHOT + 6.12.5 diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 382da6215b1..055883422a0 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.12.5-SNAPSHOT + 6.12.5 jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.12.5-SNAPSHOT + 6.12.5 google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index 4077a62df79..5b9a3b4bd04 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.5-SNAPSHOT + 6.12.5 grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.5-SNAPSHOT + 6.12.5 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 5082a95511d..d79e5557a26 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.5-SNAPSHOT + 6.12.5 grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.5-SNAPSHOT + 6.12.5 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index 69da989f622..1408646f387 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.5-SNAPSHOT + 6.12.5 grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.5-SNAPSHOT + 6.12.5 diff --git a/pom.xml b/pom.xml index dc7be8f8708..313c7767aad 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.12.5-SNAPSHOT + 6.12.5 Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -62,37 +62,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.12.5-SNAPSHOT + 6.12.5 com.google.cloud google-cloud-spanner - 6.12.5-SNAPSHOT + 6.12.5 diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index e88c1577ff1..f884ebdc747 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.12.5-SNAPSHOT + 6.12.5 proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.12.5-SNAPSHOT + 6.12.5 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 04a0c7daaac..072468a787c 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.12.5-SNAPSHOT + 6.12.5 proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.12.5-SNAPSHOT + 6.12.5 diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index d69470613fe..e0f8a8c9933 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.12.5-SNAPSHOT + 6.12.5 proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.12.5-SNAPSHOT + 6.12.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4025a6e3434..cf476922ec5 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 6.12.5-SNAPSHOT + 6.12.5 diff --git a/versions.txt b/versions.txt index 0e9c0686329..14afe0755fb 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.12.4:6.12.5-SNAPSHOT -proto-google-cloud-spanner-v1:6.12.4:6.12.5-SNAPSHOT -proto-google-cloud-spanner-admin-database-v1:6.12.4:6.12.5-SNAPSHOT -grpc-google-cloud-spanner-v1:6.12.4:6.12.5-SNAPSHOT -grpc-google-cloud-spanner-admin-instance-v1:6.12.4:6.12.5-SNAPSHOT -grpc-google-cloud-spanner-admin-database-v1:6.12.4:6.12.5-SNAPSHOT -google-cloud-spanner:6.12.4:6.12.5-SNAPSHOT \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:6.12.5:6.12.5 +proto-google-cloud-spanner-v1:6.12.5:6.12.5 +proto-google-cloud-spanner-admin-database-v1:6.12.5:6.12.5 +grpc-google-cloud-spanner-v1:6.12.5:6.12.5 +grpc-google-cloud-spanner-admin-instance-v1:6.12.5:6.12.5 +grpc-google-cloud-spanner-admin-database-v1:6.12.5:6.12.5 +google-cloud-spanner:6.12.5:6.12.5 \ No newline at end of file