From 51ee1a302241d0ae30a5baeba1eaeb7cf48f69b0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 24 Aug 2021 17:22:23 +0000 Subject: [PATCH 01/42] chore: release 0.2.2-SNAPSHOT (#42) :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-datastream-bom/pom.xml | 8 ++++---- google-cloud-datastream/pom.xml | 4 ++-- grpc-google-cloud-datastream-v1alpha1/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-datastream-v1alpha1/pom.xml | 4 ++-- versions.txt | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/google-cloud-datastream-bom/pom.xml b/google-cloud-datastream-bom/pom.xml index 7f1140bc..70c6e2b8 100644 --- a/google-cloud-datastream-bom/pom.xml +++ b/google-cloud-datastream-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastream-bom - 0.2.1 + 0.2.2-SNAPSHOT pom com.google.cloud @@ -56,17 +56,17 @@ com.google.cloud google-cloud-datastream - 0.2.1 + 0.2.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastream-v1alpha1 - 0.2.1 + 0.2.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastream-v1alpha1 - 0.2.1 + 0.2.2-SNAPSHOT diff --git a/google-cloud-datastream/pom.xml b/google-cloud-datastream/pom.xml index 0b5f789d..b2699218 100644 --- a/google-cloud-datastream/pom.xml +++ b/google-cloud-datastream/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastream - 0.2.1 + 0.2.2-SNAPSHOT jar Google Datastream https://github.com/googleapis/java-datastream @@ -11,7 +11,7 @@ com.google.cloud google-cloud-datastream-parent - 0.2.1 + 0.2.2-SNAPSHOT google-cloud-datastream diff --git a/grpc-google-cloud-datastream-v1alpha1/pom.xml b/grpc-google-cloud-datastream-v1alpha1/pom.xml index 871dca78..537d8ed5 100644 --- a/grpc-google-cloud-datastream-v1alpha1/pom.xml +++ b/grpc-google-cloud-datastream-v1alpha1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastream-v1alpha1 - 0.2.1 + 0.2.2-SNAPSHOT grpc-google-cloud-datastream-v1alpha1 GRPC library for google-cloud-datastream com.google.cloud google-cloud-datastream-parent - 0.2.1 + 0.2.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 36f518e9..6d8e719e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastream-parent pom - 0.2.1 + 0.2.2-SNAPSHOT Google Datastream Parent https://github.com/googleapis/java-datastream @@ -69,17 +69,17 @@ com.google.cloud google-cloud-datastream - 0.2.1 + 0.2.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-datastream-v1alpha1 - 0.2.1 + 0.2.2-SNAPSHOT com.google.api.grpc proto-google-cloud-datastream-v1alpha1 - 0.2.1 + 0.2.2-SNAPSHOT diff --git a/proto-google-cloud-datastream-v1alpha1/pom.xml b/proto-google-cloud-datastream-v1alpha1/pom.xml index b6ba6118..4a405676 100644 --- a/proto-google-cloud-datastream-v1alpha1/pom.xml +++ b/proto-google-cloud-datastream-v1alpha1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastream-v1alpha1 - 0.2.1 + 0.2.2-SNAPSHOT proto-google-cloud-datastream-v1alpha1 Proto library for google-cloud-datastream com.google.cloud google-cloud-datastream-parent - 0.2.1 + 0.2.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index 6d5c17b2..6377bc48 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-datastream:0.2.1:0.2.1 -grpc-google-cloud-datastream-v1alpha1:0.2.1:0.2.1 -proto-google-cloud-datastream-v1alpha1:0.2.1:0.2.1 +google-cloud-datastream:0.2.1:0.2.2-SNAPSHOT +grpc-google-cloud-datastream-v1alpha1:0.2.1:0.2.2-SNAPSHOT +proto-google-cloud-datastream-v1alpha1:0.2.1:0.2.2-SNAPSHOT From 7bfa21a902aabafdedd944e9de66af17853d55a7 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 24 Aug 2021 14:58:23 -0400 Subject: [PATCH 02/42] ci: removing linkage-monitor from the required checks (#41) Linkage Monitor is no longer needed, because the Libraries BOM synchronizes with Google Cloud BOM and the shared dependencies BOM https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/2137 --- .github/sync-repo-settings.yaml | 2 -- README.md | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index ffd39f6f..32e0ea5a 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -10,7 +10,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (8) @@ -26,7 +25,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (7) diff --git a/README.md b/README.md index added4b4..8f82d609 100644 --- a/README.md +++ b/README.md @@ -30,13 +30,13 @@ If you are using Maven, add this to your pom.xml file: If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastream:0.2.0' +compile 'com.google.cloud:google-cloud-datastream:0.2.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastream" % "0.2.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastream" % "0.2.1" ``` ## Authentication From 643750868991e0a8cbd82f86e51c90ca6f1fe697 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 24 Aug 2021 22:10:19 +0200 Subject: [PATCH 03/42] chore(deps): update dependency com.google.cloud:google-cloud-datastream to v0.2.1 (#43) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-datastream to v0.2.1 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- README.md | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8f82d609..184fd936 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-datastream - 0.2.0 + 0.2.1 ``` diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 4668ecf9..8a2fa8b1 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastream - 0.2.0 + 0.2.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ccf62c70..c0775ecb 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastream - 0.2.0 + 0.2.1 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index fc8acd76..e3bd158e 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastream - 0.2.0 + 0.2.1 From 4729a7b7ed86a07a974fa11c7438eaecbbaa5f16 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 25 Aug 2021 23:30:46 +0000 Subject: [PATCH 04/42] chore: enable release-trigger bot (#1192) (#44) --- .github/.OwlBot.lock.yaml | 2 +- .github/release-trigger.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .github/release-trigger.yml diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 1830d09a..34f691d3 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:8e27e5a7297b40eca3ab46ae67f10c575813a85c673839030aa161d0818f3a24 + digest: sha256:677e79291a12251a7c7e9c24db87f50ae0428bbb79c2bebc50e4fc5e9ed1ee32 diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 00000000..d4ca9418 --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true From ca3ada051a7dd170af22a2879ad11d430ed23170 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:14:40 +0000 Subject: [PATCH 05/42] feat: Remove use of deprecated gradle command in java README (#1196) (#46) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 13 ------------- README.md | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 34f691d3..33207c57 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:677e79291a12251a7c7e9c24db87f50ae0428bbb79c2bebc50e4fc5e9ed1ee32 + digest: sha256:8a486672c9a4ae5e7d55b9ac252ce1741582b8c2ceeda40efa32376325809928 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65ae6ecd..d510359d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,19 +42,6 @@ jobs: java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh - linkage-monitor: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - name: Install artifacts to local Maven repository - run: .kokoro/build.sh - shell: bash - - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index 184fd936..7f3fb7f9 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ If you are using Maven, add this to your pom.xml file: If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastream:0.2.1' +implementation 'com.google.cloud:google-cloud-datastream:0.2.1' ``` If you are using SBT, add this to your dependencies From 36fe6f893a30f0ccb44914c0241af370f2221eac Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 31 Aug 2021 22:48:38 +0200 Subject: [PATCH 06/42] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 (#50) 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-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.1.0` -> `2.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/compatibility-slim/2.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.0/confidence-slim/2.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.2.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​220-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare210v220-2021-08-31) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.1.0...v2.2.0) ##### Dependencies - update dependency com.fasterxml.jackson:jackson-bom to v2.12.5 ([#​456](https://www.togithub.com/googleapis/java-shared-dependencies/issues/456)) ([05b58e8](https://www.github.com/googleapis/java-shared-dependencies/commit/05b58e84ff6617bdcbb1ea644aa6e061bdea0319)) - update dependency com.google.api:api-common to v2.0.2 ([#​450](https://www.togithub.com/googleapis/java-shared-dependencies/issues/450)) ([51caebe](https://www.github.com/googleapis/java-shared-dependencies/commit/51caebe89bfade98866f63952bf82bc663a0179a)) - update dependency com.google.http-client:google-http-client-bom to v1.40.0 ([#​455](https://www.togithub.com/googleapis/java-shared-dependencies/issues/455)) ([82a5e42](https://www.github.com/googleapis/java-shared-dependencies/commit/82a5e42b06570a2c7c9d53b03161b110a44487a1)) - update dependency com.google.oauth-client:google-oauth-client-bom to v1.32.1 ([#​447](https://www.togithub.com/googleapis/java-shared-dependencies/issues/447)) ([9d2b895](https://www.github.com/googleapis/java-shared-dependencies/commit/9d2b8958f62daa6a3015a8ac052762fb3d79b35b)) - update dependency io.grpc:grpc-bom to v1.40.1 ([#​451](https://www.togithub.com/googleapis/java-shared-dependencies/issues/451)) ([df668ea](https://www.github.com/googleapis/java-shared-dependencies/commit/df668ead8830a40acf9d5605d47f93c465b779c0)) - update gax.version to v2.4.0 ([#​458](https://www.togithub.com/googleapis/java-shared-dependencies/issues/458)) ([a797d9e](https://www.github.com/googleapis/java-shared-dependencies/commit/a797d9eb8a4bcb3025a9511eae61271278a4a5c9)) - update google.common-protos.version to v2.5.0 ([#​457](https://www.togithub.com/googleapis/java-shared-dependencies/issues/457)) ([38c7bb9](https://www.github.com/googleapis/java-shared-dependencies/commit/38c7bb925414d90ff3065650d06589f79bcab9b6)) - update google.core.version to v2.1.1 ([#​449](https://www.togithub.com/googleapis/java-shared-dependencies/issues/449)) ([b28723a](https://www.github.com/googleapis/java-shared-dependencies/commit/b28723ace0c27ebc73f23a2d094e0fe9ba8a9075)) - update google.core.version to v2.1.2 ([#​459](https://www.togithub.com/googleapis/java-shared-dependencies/issues/459)) ([df4d5b7](https://www.github.com/googleapis/java-shared-dependencies/commit/df4d5b7717386f5e0e2cca87bd9afc56b2c7aee8)) - update iam.version to v1.1.0 ([#​448](https://www.togithub.com/googleapis/java-shared-dependencies/issues/448)) ([3967928](https://www.github.com/googleapis/java-shared-dependencies/commit/39679287f3ef8c1cbca5dfc8aca3f69cfee3d4a6))
--- ### 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-datastream). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d8e719e..cc11a0b3 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.1.0 + 2.2.0 pom import From 45e8e5ec6592cfc13f567335fb503128f57a49c6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 31 Aug 2021 22:02:41 +0000 Subject: [PATCH 07/42] build(java): update renovate config to mark conformance tests as a test commit type (#1199) (#49) --- .github/.OwlBot.lock.yaml | 2 +- renovate.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 33207c57..fb70e14d 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:8a486672c9a4ae5e7d55b9ac252ce1741582b8c2ceeda40efa32376325809928 + digest: sha256:2595f321d9a9acf34c2d02e4dc5ec214ce07eecdb43978382d8a88476dec0c16 diff --git a/renovate.json b/renovate.json index 69a86ad8..986e9ccc 100644 --- a/renovate.json +++ b/renovate.json @@ -50,7 +50,8 @@ "^junit:junit", "^com.google.truth:truth", "^org.mockito:mockito-core", - "^org.objenesis:objenesis" + "^org.objenesis:objenesis", + "^com.google.cloud:google-cloud-conformance-tests" ], "semanticCommitType": "test", "semanticCommitScope": "deps" From b166b5e78d73cc4ea2cd9b0654d11626c3eb068c Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 20:26:39 +0000 Subject: [PATCH 08/42] chore(java): install maven 3.8.1 at runtime (#1202) (#51) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index fb70e14d..91c0ea20 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:2595f321d9a9acf34c2d02e4dc5ec214ce07eecdb43978382d8a88476dec0c16 + digest: sha256:4837f2a7fdff2985b4f7432f8a6d6a87beacebf3ac071746532c0ce2e3f24b9b diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d510359d..e23d923e 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 From adf724c789b1c2122c174fb0460c6afb82966301 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 8 Sep 2021 16:28:53 +0000 Subject: [PATCH 09/42] chore(java): update windows build (#1205) (#52) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 91c0ea20..a173685b 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:4837f2a7fdff2985b4f7432f8a6d6a87beacebf3ac071746532c0ce2e3f24b9b + digest: sha256:a9e9c43309df91d0051ccfcea4860a95bbe9a85eeb3c1822fa1a617a06b649de diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e23d923e..3becb5c0 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 From 71bf0bd654acd3c9eeea2276148214fcad52c059 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 8 Sep 2021 21:00:20 +0000 Subject: [PATCH 10/42] chore: add gcf-owl-bot to list of trusted contributors (#1208) (#55) --- .github/.OwlBot.lock.yaml | 2 +- .github/trusted-contribution.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index a173685b..46b63e03 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:a9e9c43309df91d0051ccfcea4860a95bbe9a85eeb3c1822fa1a617a06b649de + digest: sha256:78ad73bf327217e14460c3a3adbba3e1d9a4b5f35fe85103421ba784fd27529f diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index f247d5c7..a0ba1f7d 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] From 4c6cbd6e1434890ac3025dc2bf362bd7f0b97241 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 8 Sep 2021 15:16:47 -0700 Subject: [PATCH 11/42] chore: remove readme autosynth config (#56) --- .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 7b48cc28..00000000 --- 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 1e34faff..00000000 --- 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-datastream/.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 6e58596f05d3e7daf0b856169053b8bdd56266ba Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 10 Sep 2021 13:38:31 -0400 Subject: [PATCH 12/42] chore(java): update shared-config and shared-dependencies version in pom template (#1182) (#57) Source-Link: https://github.com/googleapis/synthtool/commit/396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 46b63e03..b6721276 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:78ad73bf327217e14460c3a3adbba3e1d9a4b5f35fe85103421ba784fd27529f + digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh index 6e3f6599..7f78ee41 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 5c4551ef..742ec1a8 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 1fa95fa5..3cac3d8a 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 86dd3a5c..83b0d5cb 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 a87aaea6..bbf408f8 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 8a103384..77dc4e8f 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 9da0f839..8b69b793 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. From d5f2e3947d88aa91aa563112771767f9a6e9fd96 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 10 Sep 2021 17:42:12 +0000 Subject: [PATCH 13/42] fix(datastream): Change a few resource pattern variables from camelCase to snake_case (#47) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 393705818 Source-Link: https://github.com/googleapis/googleapis/commit/9e99074fc73529d946fca7914deb0d21968f03d8 Source-Link: https://github.com/googleapis/googleapis-gen/commit/1eee1fcf28b8d8557bd8358d00181ebefffc4a7d --- .../datastream/v1alpha1/DatastreamClient.java | 112 +++--- .../datastream/v1alpha1/package-info.java | 2 +- .../v1alpha1/stub/DatastreamStubSettings.java | 4 +- .../v1alpha1/DatastreamClientTest.java | 62 ++-- .../CloudDatastreamResourcesProto.java | 344 +++++++++--------- .../v1alpha1/ConnectionProfileName.java | 21 +- .../v1alpha1/PrivateConnectionName.java | 21 +- .../cloud/datastream/v1alpha1/RouteName.java | 18 +- .../v1alpha1/datastream_resources.proto | 6 +- 9 files changed, 299 insertions(+), 291 deletions(-) diff --git a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java index 4babda3a..24999ec2 100644 --- a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java +++ b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java @@ -49,7 +49,7 @@ *
{@code
  * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
  *   ConnectionProfileName name =
- *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]");
+ *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]");
  *   ConnectionProfile response = datastreamClient.getConnectionProfile(name);
  * }
  * }
@@ -199,7 +199,7 @@ public final ListConnectionProfilesPagedResponse listConnectionProfiles(Location *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String parent =
-   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]").toString();
+   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]").toString();
    *   for (ConnectionProfile element :
    *       datastreamClient.listConnectionProfiles(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -227,7 +227,7 @@ public final ListConnectionProfilesPagedResponse listConnectionProfiles(String p
    *   ListConnectionProfilesRequest request =
    *       ListConnectionProfilesRequest.newBuilder()
    *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
+   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -260,7 +260,7 @@ public final ListConnectionProfilesPagedResponse listConnectionProfiles(
    *   ListConnectionProfilesRequest request =
    *       ListConnectionProfilesRequest.newBuilder()
    *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
+   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -292,7 +292,7 @@ public final ListConnectionProfilesPagedResponse listConnectionProfiles(
    *   ListConnectionProfilesRequest request =
    *       ListConnectionProfilesRequest.newBuilder()
    *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
+   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -329,7 +329,7 @@ public final ListConnectionProfilesPagedResponse listConnectionProfiles(
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ConnectionProfileName name =
-   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]");
+   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]");
    *   ConnectionProfile response = datastreamClient.getConnectionProfile(name);
    * }
    * }
@@ -354,7 +354,7 @@ public final ConnectionProfile getConnectionProfile(ConnectionProfileName name) *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String name =
-   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]").toString();
+   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]").toString();
    *   ConnectionProfile response = datastreamClient.getConnectionProfile(name);
    * }
    * }
@@ -379,7 +379,7 @@ public final ConnectionProfile getConnectionProfile(String name) { * GetConnectionProfileRequest request = * GetConnectionProfileRequest.newBuilder() * .setName( - * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") * .toString()) * .build(); * ConnectionProfile response = datastreamClient.getConnectionProfile(request); @@ -404,7 +404,7 @@ public final ConnectionProfile getConnectionProfile(GetConnectionProfileRequest * GetConnectionProfileRequest request = * GetConnectionProfileRequest.newBuilder() * .setName( - * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") * .toString()) * .build(); * ApiFuture future = @@ -462,7 +462,7 @@ public final OperationFuture createConnect *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String parent =
-   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]").toString();
+   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]").toString();
    *   ConnectionProfile connectionProfile = ConnectionProfile.newBuilder().build();
    *   String connectionProfileId = "connectionProfileId597575526";
    *   ConnectionProfile response =
@@ -499,7 +499,7 @@ public final OperationFuture createConnect
    *   CreateConnectionProfileRequest request =
    *       CreateConnectionProfileRequest.newBuilder()
    *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
+   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
    *                   .toString())
    *           .setConnectionProfileId("connectionProfileId597575526")
    *           .setConnectionProfile(ConnectionProfile.newBuilder().build())
@@ -528,7 +528,7 @@ public final OperationFuture createConnect
    *   CreateConnectionProfileRequest request =
    *       CreateConnectionProfileRequest.newBuilder()
    *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
+   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
    *                   .toString())
    *           .setConnectionProfileId("connectionProfileId597575526")
    *           .setConnectionProfile(ConnectionProfile.newBuilder().build())
@@ -558,7 +558,7 @@ public final OperationFuture createConnect
    *   CreateConnectionProfileRequest request =
    *       CreateConnectionProfileRequest.newBuilder()
    *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]")
+   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
    *                   .toString())
    *           .setConnectionProfileId("connectionProfileId597575526")
    *           .setConnectionProfile(ConnectionProfile.newBuilder().build())
@@ -696,7 +696,7 @@ public final OperationFuture updateConnect
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ConnectionProfileName name =
-   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]");
+   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]");
    *   datastreamClient.deleteConnectionProfileAsync(name).get();
    * }
    * }
@@ -722,7 +722,7 @@ public final OperationFuture deleteConnectionProfileAs *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String name =
-   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]").toString();
+   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]").toString();
    *   datastreamClient.deleteConnectionProfileAsync(name).get();
    * }
    * }
@@ -747,7 +747,7 @@ public final OperationFuture deleteConnectionProfileAs * DeleteConnectionProfileRequest request = * DeleteConnectionProfileRequest.newBuilder() * .setName( - * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") * .toString()) * .setRequestId("requestId693933066") * .build(); @@ -774,7 +774,7 @@ public final OperationFuture deleteConnectionProfileAs * DeleteConnectionProfileRequest request = * DeleteConnectionProfileRequest.newBuilder() * .setName( - * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") * .toString()) * .setRequestId("requestId693933066") * .build(); @@ -801,7 +801,7 @@ public final OperationFuture deleteConnectionProfileAs * DeleteConnectionProfileRequest request = * DeleteConnectionProfileRequest.newBuilder() * .setName( - * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") * .toString()) * .setRequestId("requestId693933066") * .build(); @@ -830,7 +830,7 @@ public final OperationFuture deleteConnectionProfileAs * DiscoverConnectionProfileRequest request = * DiscoverConnectionProfileRequest.newBuilder() * .setParent( - * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") * .toString()) * .build(); * DiscoverConnectionProfileResponse response = @@ -859,7 +859,7 @@ public final DiscoverConnectionProfileResponse discoverConnectionProfile( * DiscoverConnectionProfileRequest request = * DiscoverConnectionProfileRequest.newBuilder() * .setParent( - * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + * ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") * .toString()) * .build(); * ApiFuture future = @@ -1737,7 +1737,7 @@ public final OperationFuture createPrivate *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String parent =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]").toString();
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]").toString();
    *   PrivateConnection privateConnection = PrivateConnection.newBuilder().build();
    *   String privateConnectionId = "privateConnectionId-1926654532";
    *   PrivateConnection response =
@@ -1774,7 +1774,7 @@ public final OperationFuture createPrivate
    *   CreatePrivateConnectionRequest request =
    *       CreatePrivateConnectionRequest.newBuilder()
    *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setPrivateConnectionId("privateConnectionId-1926654532")
    *           .setPrivateConnection(PrivateConnection.newBuilder().build())
@@ -1803,7 +1803,7 @@ public final OperationFuture createPrivate
    *   CreatePrivateConnectionRequest request =
    *       CreatePrivateConnectionRequest.newBuilder()
    *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setPrivateConnectionId("privateConnectionId-1926654532")
    *           .setPrivateConnection(PrivateConnection.newBuilder().build())
@@ -1833,7 +1833,7 @@ public final OperationFuture createPrivate
    *   CreatePrivateConnectionRequest request =
    *       CreatePrivateConnectionRequest.newBuilder()
    *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setPrivateConnectionId("privateConnectionId-1926654532")
    *           .setPrivateConnection(PrivateConnection.newBuilder().build())
@@ -1860,7 +1860,7 @@ public final OperationFuture createPrivate
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   PrivateConnectionName name =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");
    *   PrivateConnection response = datastreamClient.getPrivateConnection(name);
    * }
    * }
@@ -1885,7 +1885,7 @@ public final PrivateConnection getPrivateConnection(PrivateConnectionName name) *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String name =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]").toString();
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]").toString();
    *   PrivateConnection response = datastreamClient.getPrivateConnection(name);
    * }
    * }
@@ -1910,7 +1910,7 @@ public final PrivateConnection getPrivateConnection(String name) { * GetPrivateConnectionRequest request = * GetPrivateConnectionRequest.newBuilder() * .setName( - * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]") + * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]") * .toString()) * .build(); * PrivateConnection response = datastreamClient.getPrivateConnection(request); @@ -1935,7 +1935,7 @@ public final PrivateConnection getPrivateConnection(GetPrivateConnectionRequest * GetPrivateConnectionRequest request = * GetPrivateConnectionRequest.newBuilder() * .setName( - * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]") + * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]") * .toString()) * .build(); * ApiFuture future = @@ -1987,7 +1987,7 @@ public final ListPrivateConnectionsPagedResponse listPrivateConnections(Location *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String parent =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]").toString();
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]").toString();
    *   for (PrivateConnection element :
    *       datastreamClient.listPrivateConnections(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -2016,7 +2016,7 @@ public final ListPrivateConnectionsPagedResponse listPrivateConnections(String p
    *   ListPrivateConnectionsRequest request =
    *       ListPrivateConnectionsRequest.newBuilder()
    *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -2049,7 +2049,7 @@ public final ListPrivateConnectionsPagedResponse listPrivateConnections(
    *   ListPrivateConnectionsRequest request =
    *       ListPrivateConnectionsRequest.newBuilder()
    *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -2081,7 +2081,7 @@ public final ListPrivateConnectionsPagedResponse listPrivateConnections(
    *   ListPrivateConnectionsRequest request =
    *       ListPrivateConnectionsRequest.newBuilder()
    *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -2118,7 +2118,7 @@ public final ListPrivateConnectionsPagedResponse listPrivateConnections(
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   PrivateConnectionName name =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");
    *   datastreamClient.deletePrivateConnectionAsync(name).get();
    * }
    * }
@@ -2144,7 +2144,7 @@ public final OperationFuture deletePrivateConnectionAs *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String name =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]").toString();
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]").toString();
    *   datastreamClient.deletePrivateConnectionAsync(name).get();
    * }
    * }
@@ -2169,7 +2169,7 @@ public final OperationFuture deletePrivateConnectionAs * DeletePrivateConnectionRequest request = * DeletePrivateConnectionRequest.newBuilder() * .setName( - * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]") + * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]") * .toString()) * .setRequestId("requestId693933066") * .setForce(true) @@ -2197,7 +2197,7 @@ public final OperationFuture deletePrivateConnectionAs * DeletePrivateConnectionRequest request = * DeletePrivateConnectionRequest.newBuilder() * .setName( - * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]") + * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]") * .toString()) * .setRequestId("requestId693933066") * .setForce(true) @@ -2225,7 +2225,7 @@ public final OperationFuture deletePrivateConnectionAs * DeletePrivateConnectionRequest request = * DeletePrivateConnectionRequest.newBuilder() * .setName( - * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]") + * PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]") * .toString()) * .setRequestId("requestId693933066") * .setForce(true) @@ -2251,7 +2251,7 @@ public final OperationFuture deletePrivateConnectionAs *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   PrivateConnectionName parent =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");
    *   Route route = Route.newBuilder().build();
    *   String routeId = "routeId1385647428";
    *   Route response = datastreamClient.createRouteAsync(parent, route, routeId).get();
@@ -2283,7 +2283,7 @@ public final OperationFuture createRouteAsync(
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String parent =
-   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]").toString();
+   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]").toString();
    *   Route route = Route.newBuilder().build();
    *   String routeId = "routeId1385647428";
    *   Route response = datastreamClient.createRouteAsync(parent, route, routeId).get();
@@ -2317,7 +2317,7 @@ public final OperationFuture createRouteAsync(
    *   CreateRouteRequest request =
    *       CreateRouteRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
+   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
    *                   .toString())
    *           .setRouteId("routeId1385647428")
    *           .setRoute(Route.newBuilder().build())
@@ -2346,7 +2346,7 @@ public final OperationFuture createRouteAsync(
    *   CreateRouteRequest request =
    *       CreateRouteRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
+   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
    *                   .toString())
    *           .setRouteId("routeId1385647428")
    *           .setRoute(Route.newBuilder().build())
@@ -2375,7 +2375,7 @@ public final OperationFuture createRouteAsync(
    *   CreateRouteRequest request =
    *       CreateRouteRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
+   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
    *                   .toString())
    *           .setRouteId("routeId1385647428")
    *           .setRoute(Route.newBuilder().build())
@@ -2399,7 +2399,7 @@ public final UnaryCallable createRouteCallable()
    *
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
-   *   RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]");
+   *   RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]");
    *   Route response = datastreamClient.getRoute(name);
    * }
    * }
@@ -2422,7 +2422,7 @@ public final Route getRoute(RouteName name) { *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String name =
-   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]").toString();
+   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]").toString();
    *   Route response = datastreamClient.getRoute(name);
    * }
    * }
@@ -2446,7 +2446,7 @@ public final Route getRoute(String name) { * GetRouteRequest request = * GetRouteRequest.newBuilder() * .setName( - * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]") + * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]") * .toString()) * .build(); * Route response = datastreamClient.getRoute(request); @@ -2471,7 +2471,7 @@ public final Route getRoute(GetRouteRequest request) { * GetRouteRequest request = * GetRouteRequest.newBuilder() * .setName( - * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]") + * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]") * .toString()) * .build(); * ApiFuture future = datastreamClient.getRouteCallable().futureCall(request); @@ -2493,7 +2493,7 @@ public final UnaryCallable getRouteCallable() { *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   PrivateConnectionName parent =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]");
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]");
    *   for (Route element : datastreamClient.listRoutes(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -2518,7 +2518,7 @@ public final ListRoutesPagedResponse listRoutes(PrivateConnectionName parent) {
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String parent =
-   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]").toString();
+   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]").toString();
    *   for (Route element : datastreamClient.listRoutes(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -2544,7 +2544,7 @@ public final ListRoutesPagedResponse listRoutes(String parent) {
    *   ListRoutesRequest request =
    *       ListRoutesRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
+   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -2575,7 +2575,7 @@ public final ListRoutesPagedResponse listRoutes(ListRoutesRequest request) {
    *   ListRoutesRequest request =
    *       ListRoutesRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
+   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -2605,7 +2605,7 @@ public final UnaryCallable listRoute
    *   ListRoutesRequest request =
    *       ListRoutesRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]")
+   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -2639,7 +2639,7 @@ public final UnaryCallable listRoutesCall
    *
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
-   *   RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]");
+   *   RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]");
    *   datastreamClient.deleteRouteAsync(name).get();
    * }
    * }
@@ -2662,7 +2662,7 @@ public final OperationFuture deleteRouteAsync(RouteNam *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String name =
-   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]").toString();
+   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]").toString();
    *   datastreamClient.deleteRouteAsync(name).get();
    * }
    * }
@@ -2686,7 +2686,7 @@ public final OperationFuture deleteRouteAsync(String n * DeleteRouteRequest request = * DeleteRouteRequest.newBuilder() * .setName( - * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]") + * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]") * .toString()) * .setRequestId("requestId693933066") * .build(); @@ -2713,7 +2713,7 @@ public final OperationFuture deleteRouteAsync( * DeleteRouteRequest request = * DeleteRouteRequest.newBuilder() * .setName( - * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]") + * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]") * .toString()) * .setRequestId("requestId693933066") * .build(); @@ -2740,7 +2740,7 @@ public final OperationFuture deleteRouteAsync( * DeleteRouteRequest request = * DeleteRouteRequest.newBuilder() * .setName( - * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]") + * RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]") * .toString()) * .setRequestId("requestId693933066") * .build(); diff --git a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/package-info.java b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/package-info.java index f9cab39f..c01a8ba2 100644 --- a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/package-info.java +++ b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/package-info.java @@ -26,7 +26,7 @@ *
{@code
  * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
  *   ConnectionProfileName name =
- *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]");
+ *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]");
  *   ConnectionProfile response = datastreamClient.getConnectionProfile(name);
  * }
  * }
diff --git a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/DatastreamStubSettings.java b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/DatastreamStubSettings.java index 54f0b03f..8c09735a 100644 --- a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/DatastreamStubSettings.java +++ b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/stub/DatastreamStubSettings.java @@ -723,7 +723,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-datastream/src/test/java/com/google/cloud/datastream/v1alpha1/DatastreamClientTest.java b/google-cloud-datastream/src/test/java/com/google/cloud/datastream/v1alpha1/DatastreamClientTest.java index 5f89da30..3427ce72 100644 --- a/google-cloud-datastream/src/test/java/com/google/cloud/datastream/v1alpha1/DatastreamClientTest.java +++ b/google-cloud-datastream/src/test/java/com/google/cloud/datastream/v1alpha1/DatastreamClientTest.java @@ -186,7 +186,7 @@ public void getConnectionProfileTest() throws Exception { ConnectionProfile expectedResponse = ConnectionProfile.newBuilder() .setName( - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -196,7 +196,7 @@ public void getConnectionProfileTest() throws Exception { mockDatastream.addResponse(expectedResponse); ConnectionProfileName name = - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]"); + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]"); ConnectionProfile actualResponse = client.getConnectionProfile(name); Assert.assertEquals(expectedResponse, actualResponse); @@ -220,7 +220,7 @@ public void getConnectionProfileExceptionTest() throws Exception { try { ConnectionProfileName name = - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]"); + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]"); client.getConnectionProfile(name); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -233,7 +233,7 @@ public void getConnectionProfileTest2() throws Exception { ConnectionProfile expectedResponse = ConnectionProfile.newBuilder() .setName( - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -278,7 +278,7 @@ public void createConnectionProfileTest() throws Exception { ConnectionProfile expectedResponse = ConnectionProfile.newBuilder() .setName( - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -338,7 +338,7 @@ public void createConnectionProfileTest2() throws Exception { ConnectionProfile expectedResponse = ConnectionProfile.newBuilder() .setName( - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -398,7 +398,7 @@ public void updateConnectionProfileTest() throws Exception { ConnectionProfile expectedResponse = ConnectionProfile.newBuilder() .setName( - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -462,7 +462,7 @@ public void deleteConnectionProfileTest() throws Exception { mockDatastream.addResponse(resultOperation); ConnectionProfileName name = - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]"); + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]"); client.deleteConnectionProfileAsync(name).get(); @@ -485,7 +485,7 @@ public void deleteConnectionProfileExceptionTest() throws Exception { try { ConnectionProfileName name = - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]"); + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]"); client.deleteConnectionProfileAsync(name).get(); Assert.fail("No exception raised"); } catch (ExecutionException e) { @@ -547,7 +547,7 @@ public void discoverConnectionProfileTest() throws Exception { DiscoverConnectionProfileRequest request = DiscoverConnectionProfileRequest.newBuilder() .setParent( - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") .toString()) .build(); @@ -582,7 +582,7 @@ public void discoverConnectionProfileExceptionTest() throws Exception { DiscoverConnectionProfileRequest request = DiscoverConnectionProfileRequest.newBuilder() .setParent( - ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTIONPROFILE]") + ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]") .toString()) .build(); client.discoverConnectionProfile(request); @@ -1171,7 +1171,7 @@ public void createPrivateConnectionTest() throws Exception { PrivateConnection expectedResponse = PrivateConnection.newBuilder() .setName( - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]") + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1233,7 +1233,7 @@ public void createPrivateConnectionTest2() throws Exception { PrivateConnection expectedResponse = PrivateConnection.newBuilder() .setName( - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]") + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1295,7 +1295,7 @@ public void getPrivateConnectionTest() throws Exception { PrivateConnection expectedResponse = PrivateConnection.newBuilder() .setName( - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]") + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1307,7 +1307,7 @@ public void getPrivateConnectionTest() throws Exception { mockDatastream.addResponse(expectedResponse); PrivateConnectionName name = - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]"); + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]"); PrivateConnection actualResponse = client.getPrivateConnection(name); Assert.assertEquals(expectedResponse, actualResponse); @@ -1331,7 +1331,7 @@ public void getPrivateConnectionExceptionTest() throws Exception { try { PrivateConnectionName name = - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]"); + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]"); client.getPrivateConnection(name); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -1344,7 +1344,7 @@ public void getPrivateConnectionTest2() throws Exception { PrivateConnection expectedResponse = PrivateConnection.newBuilder() .setName( - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]") + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1488,7 +1488,7 @@ public void deletePrivateConnectionTest() throws Exception { mockDatastream.addResponse(resultOperation); PrivateConnectionName name = - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]"); + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]"); client.deletePrivateConnectionAsync(name).get(); @@ -1511,7 +1511,7 @@ public void deletePrivateConnectionExceptionTest() throws Exception { try { PrivateConnectionName name = - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]"); + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]"); client.deletePrivateConnectionAsync(name).get(); Assert.fail("No exception raised"); } catch (ExecutionException e) { @@ -1569,7 +1569,7 @@ public void createRouteTest() throws Exception { Route expectedResponse = Route.newBuilder() .setName( - RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]") + RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1587,7 +1587,7 @@ public void createRouteTest() throws Exception { mockDatastream.addResponse(resultOperation); PrivateConnectionName parent = - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]"); + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]"); Route route = Route.newBuilder().build(); String routeId = "routeId1385647428"; @@ -1614,7 +1614,7 @@ public void createRouteExceptionTest() throws Exception { try { PrivateConnectionName parent = - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]"); + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]"); Route route = Route.newBuilder().build(); String routeId = "routeId1385647428"; client.createRouteAsync(parent, route, routeId).get(); @@ -1631,7 +1631,7 @@ public void createRouteTest2() throws Exception { Route expectedResponse = Route.newBuilder() .setName( - RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]") + RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1691,7 +1691,7 @@ public void getRouteTest() throws Exception { Route expectedResponse = Route.newBuilder() .setName( - RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]") + RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1702,7 +1702,7 @@ public void getRouteTest() throws Exception { .build(); mockDatastream.addResponse(expectedResponse); - RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]"); + RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]"); Route actualResponse = client.getRoute(name); Assert.assertEquals(expectedResponse, actualResponse); @@ -1724,7 +1724,7 @@ public void getRouteExceptionTest() throws Exception { mockDatastream.addException(exception); try { - RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]"); + RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]"); client.getRoute(name); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -1737,7 +1737,7 @@ public void getRouteTest2() throws Exception { Route expectedResponse = Route.newBuilder() .setName( - RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]") + RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]") .toString()) .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) @@ -1789,7 +1789,7 @@ public void listRoutesTest() throws Exception { mockDatastream.addResponse(expectedResponse); PrivateConnectionName parent = - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]"); + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]"); ListRoutesPagedResponse pagedListResponse = client.listRoutes(parent); @@ -1816,7 +1816,7 @@ public void listRoutesExceptionTest() throws Exception { try { PrivateConnectionName parent = - PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]"); + PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]"); client.listRoutes(parent); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -1879,7 +1879,7 @@ public void deleteRouteTest() throws Exception { .build(); mockDatastream.addResponse(resultOperation); - RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]"); + RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]"); client.deleteRouteAsync(name).get(); @@ -1900,7 +1900,7 @@ public void deleteRouteExceptionTest() throws Exception { mockDatastream.addException(exception); try { - RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATECONNECTION]", "[ROUTE]"); + RouteName name = RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]"); client.deleteRouteAsync(name).get(); Assert.fail("No exception raised"); } catch (ExecutionException e) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CloudDatastreamResourcesProto.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CloudDatastreamResourcesProto.java index f898181d..3c834769 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CloudDatastreamResourcesProto.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CloudDatastreamResourcesProto.java @@ -226,7 +226,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\004port\030\003 \001(\005\022\027\n\010password\030d \001(\tB\003\340A\004H\000\022\032\n\013" + "private_key\030e \001(\tB\003\340A\004H\000B\027\n\025authenticati" + "on_method\">\n\020VpcPeeringConfig\022\025\n\010vpc_nam" - + "e\030\001 \001(\tB\003\340A\002\022\023\n\006subnet\030\002 \001(\tB\003\340A\002\"\323\005\n\021Pr" + + "e\030\001 \001(\tB\003\340A\002\022\023\n\006subnet\030\002 \001(\tB\003\340A\002\"\324\005\n\021Pr" + "ivateConnection\022\021\n\004name\030\001 \001(\tB\003\340A\003\0224\n\013cr" + "eate_time\030\002 \001(\0132\032.google.protobuf.Timest" + "ampB\003\340A\003\0224\n\013update_time\030\003 \001(\0132\032.google.p" @@ -241,179 +241,179 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ream.v1alpha1.VpcPeeringConfig\032-\n\013Labels" + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"E\n" + "\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CREATIN" - + "G\020\001\022\013\n\007CREATED\020\002\022\n\n\006FAILED\020\003:\200\001\352A}\n+data" + + "G\020\001\022\013\n\007CREATED\020\002\022\n\n\006FAILED\020\003:\201\001\352A~\n+data" + "stream.googleapis.com/PrivateConnection\022" - + "Nprojects/{project}/locations/{location}" - + "/privateConnections/{privateConnection}\"" - + ";\n\023PrivateConnectivity\022$\n\027private_connec" - + "tion_name\030\001 \001(\tB\003\340A\002\"\330\003\n\005Route\022\021\n\004name\030\001" - + " \001(\tB\003\340A\003\0224\n\013create_time\030\002 \001(\0132\032.google." - + "protobuf.TimestampB\003\340A\003\0224\n\013update_time\030\003" - + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003\022C\n" - + "\006labels\030\004 \003(\01323.google.cloud.datastream." - + "v1alpha1.Route.LabelsEntry\022\031\n\014display_na" - + "me\030\005 \001(\tB\003\340A\002\022 \n\023destination_address\030\006 \001" - + "(\tB\003\340A\002\022\030\n\020destination_port\030\007 \001(\005\032-\n\013Lab" - + "elsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" - + ":\204\001\352A\200\001\n\037datastream.googleapis.com/Route" - + "\022]projects/{project}/locations/{location" - + "}/privateConnections/{privateConnection}" - + "/routes/{route}\"\312\001\n\016MysqlSslConfig\022\027\n\ncl" - + "ient_key\030\013 \001(\tB\003\340A\004\022\033\n\016client_key_set\030\014 " - + "\001(\010B\003\340A\003\022\037\n\022client_certificate\030\r \001(\tB\003\340A" - + "\004\022#\n\026client_certificate_set\030\016 \001(\010B\003\340A\003\022\033" - + "\n\016ca_certificate\030\017 \001(\tB\003\340A\004\022\037\n\022ca_certif" - + "icate_set\030\020 \001(\010B\003\340A\003\"\241\010\n\021ConnectionProfi" - + "le\022\021\n\004name\030\001 \001(\tB\003\340A\003\0224\n\013create_time\030\002 \001" - + "(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n\013u" - + "pdate_time\030\003 \001(\0132\032.google.protobuf.Times" - + "tampB\003\340A\003\022O\n\006labels\030\004 \003(\0132?.google.cloud" - + ".datastream.v1alpha1.ConnectionProfile.L" - + "abelsEntry\022\031\n\014display_name\030\005 \001(\tB\003\340A\002\022I\n" - + "\016oracle_profile\030d \001(\0132/.google.cloud.dat" - + "astream.v1alpha1.OracleProfileH\000\022C\n\013gcs_" - + "profile\030e \001(\0132,.google.cloud.datastream." - + "v1alpha1.GcsProfileH\000\022G\n\rmysql_profile\030f" - + " \001(\0132..google.cloud.datastream.v1alpha1." - + "MysqlProfileH\000\022T\n\017no_connectivity\030\310\001 \001(\013" - + "28.google.cloud.datastream.v1alpha1.NoCo" - + "nnectivitySettingsH\001\022h\n\036static_service_i" - + "p_connectivity\030\311\001 \001(\0132=.google.cloud.dat" - + "astream.v1alpha1.StaticServiceIpConnecti" - + "vityH\001\022c\n\030forward_ssh_connectivity\030\312\001 \001(" - + "\0132>.google.cloud.datastream.v1alpha1.For" - + "wardSshTunnelConnectivityH\001\022V\n\024private_c" - + "onnectivity\030\313\001 \001(\01325.google.cloud.datast" - + "ream.v1alpha1.PrivateConnectivityH\001\032-\n\013L" - + "abelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002" - + "8\001:\200\001\352A}\n+datastream.googleapis.com/Conn" - + "ectionProfile\022Nprojects/{project}/locati" - + "ons/{location}/connectionProfiles/{conne" - + "ctionProfile}B\t\n\007profileB\016\n\014connectivity" - + "\"\273\001\n\014OracleColumn\022\023\n\013column_name\030\001 \001(\t\022\021" - + "\n\tdata_type\030\002 \001(\t\022\016\n\006length\030\003 \001(\005\022\021\n\tpre" - + "cision\030\004 \001(\005\022\r\n\005scale\030\005 \001(\005\022\020\n\010encoding\030" - + "\006 \001(\t\022\023\n\013primary_key\030\007 \001(\010\022\020\n\010nullable\030\010" - + " \001(\010\022\030\n\020ordinal_position\030\t \001(\005\"i\n\013Oracle" - + "Table\022\022\n\ntable_name\030\001 \001(\t\022F\n\016oracle_colu" - + "mns\030\002 \003(\0132..google.cloud.datastream.v1al" - + "pha1.OracleColumn\"i\n\014OracleSchema\022\023\n\013sch" - + "ema_name\030\001 \001(\t\022D\n\roracle_tables\030\002 \003(\0132-." - + "google.cloud.datastream.v1alpha1.OracleT" - + "able\"U\n\013OracleRdbms\022F\n\016oracle_schemas\030\001 " - + "\003(\0132..google.cloud.datastream.v1alpha1.O" - + "racleSchema\"\231\001\n\022OracleSourceConfig\022@\n\tal" - + "lowlist\030\001 \001(\0132-.google.cloud.datastream." - + "v1alpha1.OracleRdbms\022A\n\nrejectlist\030\002 \001(\013" + + "Oprojects/{project}/locations/{location}" + + "/privateConnections/{private_connection}" + + "\";\n\023PrivateConnectivity\022$\n\027private_conne" + + "ction_name\030\001 \001(\tB\003\340A\002\"\331\003\n\005Route\022\021\n\004name\030" + + "\001 \001(\tB\003\340A\003\0224\n\013create_time\030\002 \001(\0132\032.google" + + ".protobuf.TimestampB\003\340A\003\0224\n\013update_time\030" + + "\003 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\022C" + + "\n\006labels\030\004 \003(\01323.google.cloud.datastream" + + ".v1alpha1.Route.LabelsEntry\022\031\n\014display_n" + + "ame\030\005 \001(\tB\003\340A\002\022 \n\023destination_address\030\006 " + + "\001(\tB\003\340A\002\022\030\n\020destination_port\030\007 \001(\005\032-\n\013La" + + "belsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028" + + "\001:\205\001\352A\201\001\n\037datastream.googleapis.com/Rout" + + "e\022^projects/{project}/locations/{locatio" + + "n}/privateConnections/{private_connectio" + + "n}/routes/{route}\"\312\001\n\016MysqlSslConfig\022\027\n\n" + + "client_key\030\013 \001(\tB\003\340A\004\022\033\n\016client_key_set\030" + + "\014 \001(\010B\003\340A\003\022\037\n\022client_certificate\030\r \001(\tB\003" + + "\340A\004\022#\n\026client_certificate_set\030\016 \001(\010B\003\340A\003" + + "\022\033\n\016ca_certificate\030\017 \001(\tB\003\340A\004\022\037\n\022ca_cert" + + "ificate_set\030\020 \001(\010B\003\340A\003\"\242\010\n\021ConnectionPro" + + "file\022\021\n\004name\030\001 \001(\tB\003\340A\003\0224\n\013create_time\030\002" + + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n" + + "\013update_time\030\003 \001(\0132\032.google.protobuf.Tim" + + "estampB\003\340A\003\022O\n\006labels\030\004 \003(\0132?.google.clo" + + "ud.datastream.v1alpha1.ConnectionProfile" + + ".LabelsEntry\022\031\n\014display_name\030\005 \001(\tB\003\340A\002\022" + + "I\n\016oracle_profile\030d \001(\0132/.google.cloud.d" + + "atastream.v1alpha1.OracleProfileH\000\022C\n\013gc" + + "s_profile\030e \001(\0132,.google.cloud.datastrea" + + "m.v1alpha1.GcsProfileH\000\022G\n\rmysql_profile" + + "\030f \001(\0132..google.cloud.datastream.v1alpha" + + "1.MysqlProfileH\000\022T\n\017no_connectivity\030\310\001 \001" + + "(\01328.google.cloud.datastream.v1alpha1.No" + + "ConnectivitySettingsH\001\022h\n\036static_service" + + "_ip_connectivity\030\311\001 \001(\0132=.google.cloud.d" + + "atastream.v1alpha1.StaticServiceIpConnec" + + "tivityH\001\022c\n\030forward_ssh_connectivity\030\312\001 " + + "\001(\0132>.google.cloud.datastream.v1alpha1.F" + + "orwardSshTunnelConnectivityH\001\022V\n\024private" + + "_connectivity\030\313\001 \001(\01325.google.cloud.data" + + "stream.v1alpha1.PrivateConnectivityH\001\032-\n" + + "\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t" + + ":\0028\001:\201\001\352A~\n+datastream.googleapis.com/Co" + + "nnectionProfile\022Oprojects/{project}/loca" + + "tions/{location}/connectionProfiles/{con" + + "nection_profile}B\t\n\007profileB\016\n\014connectiv" + + "ity\"\273\001\n\014OracleColumn\022\023\n\013column_name\030\001 \001(" + + "\t\022\021\n\tdata_type\030\002 \001(\t\022\016\n\006length\030\003 \001(\005\022\021\n\t" + + "precision\030\004 \001(\005\022\r\n\005scale\030\005 \001(\005\022\020\n\010encodi" + + "ng\030\006 \001(\t\022\023\n\013primary_key\030\007 \001(\010\022\020\n\010nullabl" + + "e\030\010 \001(\010\022\030\n\020ordinal_position\030\t \001(\005\"i\n\013Ora" + + "cleTable\022\022\n\ntable_name\030\001 \001(\t\022F\n\016oracle_c" + + "olumns\030\002 \003(\0132..google.cloud.datastream.v" + + "1alpha1.OracleColumn\"i\n\014OracleSchema\022\023\n\013" + + "schema_name\030\001 \001(\t\022D\n\roracle_tables\030\002 \003(\013" + "2-.google.cloud.datastream.v1alpha1.Orac" - + "leRdbms\"\231\001\n\013MysqlColumn\022\023\n\013column_name\030\001" - + " \001(\t\022\021\n\tdata_type\030\002 \001(\t\022\016\n\006length\030\003 \001(\005\022" - + "\021\n\tcollation\030\004 \001(\t\022\023\n\013primary_key\030\005 \001(\010\022" - + "\020\n\010nullable\030\006 \001(\010\022\030\n\020ordinal_position\030\007 " - + "\001(\005\"f\n\nMysqlTable\022\022\n\ntable_name\030\001 \001(\t\022D\n" - + "\rmysql_columns\030\002 \003(\0132-.google.cloud.data" - + "stream.v1alpha1.MysqlColumn\"j\n\rMysqlData" - + "base\022\025\n\rdatabase_name\030\001 \001(\t\022B\n\014mysql_tab" - + "les\030\002 \003(\0132,.google.cloud.datastream.v1al" - + "pha1.MysqlTable\"V\n\nMysqlRdbms\022H\n\017mysql_d" - + "atabases\030\001 \003(\0132/.google.cloud.datastream" - + ".v1alpha1.MysqlDatabase\"\226\001\n\021MysqlSourceC" - + "onfig\022?\n\tallowlist\030\001 \001(\0132,.google.cloud." - + "datastream.v1alpha1.MysqlRdbms\022@\n\nreject" - + "list\030\002 \001(\0132,.google.cloud.datastream.v1a" - + "lpha1.MysqlRdbms\"\375\001\n\014SourceConfig\022+\n\036sou" - + "rce_connection_profile_name\030\001 \001(\tB\003\340A\002\022T" - + "\n\024oracle_source_config\030d \001(\01324.google.cl" - + "oud.datastream.v1alpha1.OracleSourceConf" - + "igH\000\022R\n\023mysql_source_config\030e \001(\01323.goog" - + "le.cloud.datastream.v1alpha1.MysqlSource" - + "ConfigH\000B\026\n\024source_stream_config\"\020\n\016Avro" - + "FileFormat\"\212\002\n\016JsonFileFormat\022N\n\022schema_" - + "file_format\030\001 \001(\01622.google.cloud.datastr" - + "eam.v1alpha1.SchemaFileFormat\022U\n\013compres" - + "sion\030\002 \001(\0162@.google.cloud.datastream.v1a" - + "lpha1.JsonFileFormat.JsonCompression\"Q\n\017" - + "JsonCompression\022 \n\034JSON_COMPRESSION_UNSP" - + "ECIFIED\020\000\022\022\n\016NO_COMPRESSION\020\001\022\010\n\004GZIP\020\002\"" - + "\362\002\n\024GcsDestinationConfig\022\014\n\004path\030\001 \001(\t\022L" - + "\n\017gcs_file_format\030\002 \001(\0162/.google.cloud.d" - + "atastream.v1alpha1.GcsFileFormatB\002\030\001\022\030\n\020" - + "file_rotation_mb\030\003 \001(\005\0229\n\026file_rotation_" - + "interval\030\004 \001(\0132\031.google.protobuf.Duratio" - + "n\022L\n\020avro_file_format\030d \001(\01320.google.clo" - + "ud.datastream.v1alpha1.AvroFileFormatH\000\022" - + "L\n\020json_file_format\030e \001(\01320.google.cloud" - + ".datastream.v1alpha1.JsonFileFormatH\000B\r\n" - + "\013file_format\"\274\001\n\021DestinationConfig\0220\n#de" - + "stination_connection_profile_name\030\001 \001(\tB" - + "\003\340A\002\022X\n\026gcs_destination_config\030d \001(\01326.g" - + "oogle.cloud.datastream.v1alpha1.GcsDesti" - + "nationConfigH\000B\033\n\031destination_stream_con" - + "fig\"\330\t\n\006Stream\022\021\n\004name\030\001 \001(\tB\003\340A\003\0224\n\013cre" - + "ate_time\030\002 \001(\0132\032.google.protobuf.Timesta" - + "mpB\003\340A\003\0224\n\013update_time\030\003 \001(\0132\032.google.pr" - + "otobuf.TimestampB\003\340A\003\022D\n\006labels\030\004 \003(\01324." - + "google.cloud.datastream.v1alpha1.Stream." - + "LabelsEntry\022\031\n\014display_name\030\005 \001(\tB\003\340A\002\022J" - + "\n\rsource_config\030\006 \001(\0132..google.cloud.dat" - + "astream.v1alpha1.SourceConfigB\003\340A\002\022T\n\022de" - + "stination_config\030\007 \001(\01323.google.cloud.da" - + "tastream.v1alpha1.DestinationConfigB\003\340A\002" - + "\022=\n\005state\030\010 \001(\0162..google.cloud.datastrea" - + "m.v1alpha1.Stream.State\022T\n\014backfill_all\030" - + "e \001(\0132<.google.cloud.datastream.v1alpha1" - + ".Stream.BackfillAllStrategyH\000\022V\n\rbackfil" - + "l_none\030f \001(\0132=.google.cloud.datastream.v" - + "1alpha1.Stream.BackfillNoneStrategyH\000\022<\n" - + "\006errors\030\t \003(\0132\'.google.cloud.datastream." - + "v1alpha1.ErrorB\003\340A\003\032\313\001\n\023BackfillAllStrat" - + "egy\022P\n\027oracle_excluded_objects\030\001 \001(\0132-.g" - + "oogle.cloud.datastream.v1alpha1.OracleRd" - + "bmsH\000\022N\n\026mysql_excluded_objects\030\002 \001(\0132,." - + "google.cloud.datastream.v1alpha1.MysqlRd" - + "bmsH\000B\022\n\020excluded_objects\032\026\n\024BackfillNon" - + "eStrategy\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" - + "\005value\030\002 \001(\t:\0028\001\"\225\001\n\005State\022\025\n\021STATE_UNSP" - + "ECIFIED\020\000\022\013\n\007CREATED\020\001\022\013\n\007RUNNING\020\002\022\n\n\006P" - + "AUSED\020\003\022\017\n\013MAINTENANCE\020\004\022\n\n\006FAILED\020\005\022\026\n\022" - + "FAILED_PERMANENTLY\020\006\022\014\n\010STARTING\020\007\022\014\n\010DR" - + "AINING\020\010:_\352A\\\n datastream.googleapis.com" - + "/Stream\0228projects/{project}/locations/{l" - + "ocation}/streams/{stream}B\023\n\021backfill_st" - + "rategy\"\343\001\n\005Error\022\016\n\006reason\030\001 \001(\t\022\022\n\nerro" - + "r_uuid\030\002 \001(\t\022\017\n\007message\030\003 \001(\t\022.\n\nerror_t" - + "ime\030\004 \001(\0132\032.google.protobuf.Timestamp\022E\n" - + "\007details\030\005 \003(\01324.google.cloud.datastream" - + ".v1alpha1.Error.DetailsEntry\032.\n\014DetailsE" - + "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"U\n\020" - + "ValidationResult\022A\n\013validations\030\001 \003(\0132,." - + "google.cloud.datastream.v1alpha1.Validat" - + "ion\"\206\002\n\nValidation\022\023\n\013description\030\001 \001(\t\022" - + "C\n\006status\030\002 \001(\01623.google.cloud.datastrea" - + "m.v1alpha1.Validation.Status\022D\n\007message\030" - + "\003 \003(\01323.google.cloud.datastream.v1alpha1" - + ".ValidationMessage\022\014\n\004code\030\004 \001(\t\"J\n\006Stat" - + "us\022\026\n\022STATUS_UNSPECIFIED\020\000\022\020\n\014NOT_EXECUT" - + "ED\020\001\022\n\n\006FAILED\020\002\022\n\n\006PASSED\020\003\"\272\002\n\021Validat" - + "ionMessage\022\017\n\007message\030\001 \001(\t\022H\n\005level\030\002 \001" - + "(\01629.google.cloud.datastream.v1alpha1.Va" - + "lidationMessage.Level\022S\n\010metadata\030\003 \003(\0132" - + "A.google.cloud.datastream.v1alpha1.Valid" - + "ationMessage.MetadataEntry\022\014\n\004code\030\004 \001(\t" - + "\032/\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" - + "\002 \001(\t:\0028\001\"6\n\005Level\022\025\n\021LEVEL_UNSPECIFIED\020" - + "\000\022\013\n\007WARNING\020\001\022\t\n\005ERROR\020\002*>\n\rGcsFileForm" - + "at\022\037\n\033GCS_FILE_FORMAT_UNSPECIFIED\020\000\022\010\n\004A" - + "VRO\020\001\032\002\030\001*`\n\020SchemaFileFormat\022\"\n\036SCHEMA_" - + "FILE_FORMAT_UNSPECIFIED\020\000\022\022\n\016NO_SCHEMA_F" - + "ILE\020\001\022\024\n\020AVRO_SCHEMA_FILE\020\002B\377\001\n$com.goog" - + "le.cloud.datastream.v1alpha1B\035CloudDatas" - + "treamResourcesProtoP\001ZJgoogle.golang.org" - + "/genproto/googleapis/cloud/datastream/v1" - + "alpha1;datastream\252\002 Google.Cloud.Datastr" - + "eam.V1Alpha1\312\002 Google\\Cloud\\Datastream\\V" - + "1alpha1\352\002#Google::Cloud::Datastream::V1a" - + "lpha1b\006proto3" + + "leTable\"U\n\013OracleRdbms\022F\n\016oracle_schemas" + + "\030\001 \003(\0132..google.cloud.datastream.v1alpha" + + "1.OracleSchema\"\231\001\n\022OracleSourceConfig\022@\n" + + "\tallowlist\030\001 \001(\0132-.google.cloud.datastre" + + "am.v1alpha1.OracleRdbms\022A\n\nrejectlist\030\002 " + + "\001(\0132-.google.cloud.datastream.v1alpha1.O" + + "racleRdbms\"\231\001\n\013MysqlColumn\022\023\n\013column_nam" + + "e\030\001 \001(\t\022\021\n\tdata_type\030\002 \001(\t\022\016\n\006length\030\003 \001" + + "(\005\022\021\n\tcollation\030\004 \001(\t\022\023\n\013primary_key\030\005 \001" + + "(\010\022\020\n\010nullable\030\006 \001(\010\022\030\n\020ordinal_position" + + "\030\007 \001(\005\"f\n\nMysqlTable\022\022\n\ntable_name\030\001 \001(\t" + + "\022D\n\rmysql_columns\030\002 \003(\0132-.google.cloud.d" + + "atastream.v1alpha1.MysqlColumn\"j\n\rMysqlD" + + "atabase\022\025\n\rdatabase_name\030\001 \001(\t\022B\n\014mysql_" + + "tables\030\002 \003(\0132,.google.cloud.datastream.v" + + "1alpha1.MysqlTable\"V\n\nMysqlRdbms\022H\n\017mysq" + + "l_databases\030\001 \003(\0132/.google.cloud.datastr" + + "eam.v1alpha1.MysqlDatabase\"\226\001\n\021MysqlSour" + + "ceConfig\022?\n\tallowlist\030\001 \001(\0132,.google.clo" + + "ud.datastream.v1alpha1.MysqlRdbms\022@\n\nrej" + + "ectlist\030\002 \001(\0132,.google.cloud.datastream." + + "v1alpha1.MysqlRdbms\"\375\001\n\014SourceConfig\022+\n\036" + + "source_connection_profile_name\030\001 \001(\tB\003\340A" + + "\002\022T\n\024oracle_source_config\030d \001(\01324.google" + + ".cloud.datastream.v1alpha1.OracleSourceC" + + "onfigH\000\022R\n\023mysql_source_config\030e \001(\01323.g" + + "oogle.cloud.datastream.v1alpha1.MysqlSou" + + "rceConfigH\000B\026\n\024source_stream_config\"\020\n\016A" + + "vroFileFormat\"\212\002\n\016JsonFileFormat\022N\n\022sche" + + "ma_file_format\030\001 \001(\01622.google.cloud.data" + + "stream.v1alpha1.SchemaFileFormat\022U\n\013comp" + + "ression\030\002 \001(\0162@.google.cloud.datastream." + + "v1alpha1.JsonFileFormat.JsonCompression\"" + + "Q\n\017JsonCompression\022 \n\034JSON_COMPRESSION_U" + + "NSPECIFIED\020\000\022\022\n\016NO_COMPRESSION\020\001\022\010\n\004GZIP" + + "\020\002\"\362\002\n\024GcsDestinationConfig\022\014\n\004path\030\001 \001(" + + "\t\022L\n\017gcs_file_format\030\002 \001(\0162/.google.clou" + + "d.datastream.v1alpha1.GcsFileFormatB\002\030\001\022" + + "\030\n\020file_rotation_mb\030\003 \001(\005\0229\n\026file_rotati" + + "on_interval\030\004 \001(\0132\031.google.protobuf.Dura" + + "tion\022L\n\020avro_file_format\030d \001(\01320.google." + + "cloud.datastream.v1alpha1.AvroFileFormat" + + "H\000\022L\n\020json_file_format\030e \001(\01320.google.cl" + + "oud.datastream.v1alpha1.JsonFileFormatH\000" + + "B\r\n\013file_format\"\274\001\n\021DestinationConfig\0220\n" + + "#destination_connection_profile_name\030\001 \001" + + "(\tB\003\340A\002\022X\n\026gcs_destination_config\030d \001(\0132" + + "6.google.cloud.datastream.v1alpha1.GcsDe" + + "stinationConfigH\000B\033\n\031destination_stream_" + + "config\"\330\t\n\006Stream\022\021\n\004name\030\001 \001(\tB\003\340A\003\0224\n\013" + + "create_time\030\002 \001(\0132\032.google.protobuf.Time" + + "stampB\003\340A\003\0224\n\013update_time\030\003 \001(\0132\032.google" + + ".protobuf.TimestampB\003\340A\003\022D\n\006labels\030\004 \003(\013" + + "24.google.cloud.datastream.v1alpha1.Stre" + + "am.LabelsEntry\022\031\n\014display_name\030\005 \001(\tB\003\340A" + + "\002\022J\n\rsource_config\030\006 \001(\0132..google.cloud." + + "datastream.v1alpha1.SourceConfigB\003\340A\002\022T\n" + + "\022destination_config\030\007 \001(\01323.google.cloud" + + ".datastream.v1alpha1.DestinationConfigB\003" + + "\340A\002\022=\n\005state\030\010 \001(\0162..google.cloud.datast" + + "ream.v1alpha1.Stream.State\022T\n\014backfill_a" + + "ll\030e \001(\0132<.google.cloud.datastream.v1alp" + + "ha1.Stream.BackfillAllStrategyH\000\022V\n\rback" + + "fill_none\030f \001(\0132=.google.cloud.datastrea" + + "m.v1alpha1.Stream.BackfillNoneStrategyH\000" + + "\022<\n\006errors\030\t \003(\0132\'.google.cloud.datastre" + + "am.v1alpha1.ErrorB\003\340A\003\032\313\001\n\023BackfillAllSt" + + "rategy\022P\n\027oracle_excluded_objects\030\001 \001(\0132" + + "-.google.cloud.datastream.v1alpha1.Oracl" + + "eRdbmsH\000\022N\n\026mysql_excluded_objects\030\002 \001(\013" + + "2,.google.cloud.datastream.v1alpha1.Mysq" + + "lRdbmsH\000B\022\n\020excluded_objects\032\026\n\024Backfill" + + "NoneStrategy\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t" + + "\022\r\n\005value\030\002 \001(\t:\0028\001\"\225\001\n\005State\022\025\n\021STATE_U" + + "NSPECIFIED\020\000\022\013\n\007CREATED\020\001\022\013\n\007RUNNING\020\002\022\n" + + "\n\006PAUSED\020\003\022\017\n\013MAINTENANCE\020\004\022\n\n\006FAILED\020\005\022" + + "\026\n\022FAILED_PERMANENTLY\020\006\022\014\n\010STARTING\020\007\022\014\n" + + "\010DRAINING\020\010:_\352A\\\n datastream.googleapis." + + "com/Stream\0228projects/{project}/locations" + + "/{location}/streams/{stream}B\023\n\021backfill" + + "_strategy\"\343\001\n\005Error\022\016\n\006reason\030\001 \001(\t\022\022\n\ne" + + "rror_uuid\030\002 \001(\t\022\017\n\007message\030\003 \001(\t\022.\n\nerro" + + "r_time\030\004 \001(\0132\032.google.protobuf.Timestamp" + + "\022E\n\007details\030\005 \003(\01324.google.cloud.datastr" + + "eam.v1alpha1.Error.DetailsEntry\032.\n\014Detai" + + "lsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"" + + "U\n\020ValidationResult\022A\n\013validations\030\001 \003(\013" + + "2,.google.cloud.datastream.v1alpha1.Vali" + + "dation\"\206\002\n\nValidation\022\023\n\013description\030\001 \001" + + "(\t\022C\n\006status\030\002 \001(\01623.google.cloud.datast" + + "ream.v1alpha1.Validation.Status\022D\n\007messa" + + "ge\030\003 \003(\01323.google.cloud.datastream.v1alp" + + "ha1.ValidationMessage\022\014\n\004code\030\004 \001(\t\"J\n\006S" + + "tatus\022\026\n\022STATUS_UNSPECIFIED\020\000\022\020\n\014NOT_EXE" + + "CUTED\020\001\022\n\n\006FAILED\020\002\022\n\n\006PASSED\020\003\"\272\002\n\021Vali" + + "dationMessage\022\017\n\007message\030\001 \001(\t\022H\n\005level\030" + + "\002 \001(\01629.google.cloud.datastream.v1alpha1" + + ".ValidationMessage.Level\022S\n\010metadata\030\003 \003" + + "(\0132A.google.cloud.datastream.v1alpha1.Va" + + "lidationMessage.MetadataEntry\022\014\n\004code\030\004 " + + "\001(\t\032/\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" + + "ue\030\002 \001(\t:\0028\001\"6\n\005Level\022\025\n\021LEVEL_UNSPECIFI" + + "ED\020\000\022\013\n\007WARNING\020\001\022\t\n\005ERROR\020\002*>\n\rGcsFileF" + + "ormat\022\037\n\033GCS_FILE_FORMAT_UNSPECIFIED\020\000\022\010" + + "\n\004AVRO\020\001\032\002\030\001*`\n\020SchemaFileFormat\022\"\n\036SCHE" + + "MA_FILE_FORMAT_UNSPECIFIED\020\000\022\022\n\016NO_SCHEM" + + "A_FILE\020\001\022\024\n\020AVRO_SCHEMA_FILE\020\002B\377\001\n$com.g" + + "oogle.cloud.datastream.v1alpha1B\035CloudDa" + + "tastreamResourcesProtoP\001ZJgoogle.golang." + + "org/genproto/googleapis/cloud/datastream" + + "/v1alpha1;datastream\252\002 Google.Cloud.Data" + + "stream.V1Alpha1\312\002 Google\\Cloud\\Datastrea" + + "m\\V1alpha1\352\002#Google::Cloud::Datastream::" + + "V1alpha1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ConnectionProfileName.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ConnectionProfileName.java index a4a96289..244e99db 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ConnectionProfileName.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ConnectionProfileName.java @@ -29,9 +29,9 @@ // AUTO-GENERATED DOCUMENTATION AND CLASS. @Generated("by gapic-generator-java") public class ConnectionProfileName implements ResourceName { - private static final PathTemplate PROJECT_LOCATION_CONNECTIONPROFILE = + private static final PathTemplate PROJECT_LOCATION_CONNECTION_PROFILE = PathTemplate.createWithoutUrlEncoding( - "projects/{project}/locations/{location}/connectionProfiles/{connectionProfile}"); + "projects/{project}/locations/{location}/connectionProfiles/{connection_profile}"); private volatile Map fieldValuesMap; private final String project; private final String location; @@ -93,9 +93,10 @@ public static ConnectionProfileName parse(String formattedString) { return null; } Map matchMap = - PROJECT_LOCATION_CONNECTIONPROFILE.validatedMatch( + PROJECT_LOCATION_CONNECTION_PROFILE.validatedMatch( formattedString, "ConnectionProfileName.parse: formattedString not in valid format"); - return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("connectionProfile")); + return of( + matchMap.get("project"), matchMap.get("location"), matchMap.get("connection_profile")); } public static List parseList(List formattedStrings) { @@ -119,7 +120,7 @@ public static List toStringList(List values) { } public static boolean isParsableFrom(String formattedString) { - return PROJECT_LOCATION_CONNECTIONPROFILE.matches(formattedString); + return PROJECT_LOCATION_CONNECTION_PROFILE.matches(formattedString); } @Override @@ -135,7 +136,7 @@ public Map getFieldValuesMap() { fieldMapBuilder.put("location", location); } if (connectionProfile != null) { - fieldMapBuilder.put("connectionProfile", connectionProfile); + fieldMapBuilder.put("connection_profile", connectionProfile); } fieldValuesMap = fieldMapBuilder.build(); } @@ -150,8 +151,8 @@ public String getFieldValue(String fieldName) { @Override public String toString() { - return PROJECT_LOCATION_CONNECTIONPROFILE.instantiate( - "project", project, "location", location, "connectionProfile", connectionProfile); + return PROJECT_LOCATION_CONNECTION_PROFILE.instantiate( + "project", project, "location", location, "connection_profile", connectionProfile); } @Override @@ -180,7 +181,9 @@ public int hashCode() { return h; } - /** Builder for projects/{project}/locations/{location}/connectionProfiles/{connectionProfile}. */ + /** + * Builder for projects/{project}/locations/{location}/connectionProfiles/{connection_profile}. + */ public static class Builder { private String project; private String location; diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnectionName.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnectionName.java index aa29b47e..721b0e56 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnectionName.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnectionName.java @@ -29,9 +29,9 @@ // AUTO-GENERATED DOCUMENTATION AND CLASS. @Generated("by gapic-generator-java") public class PrivateConnectionName implements ResourceName { - private static final PathTemplate PROJECT_LOCATION_PRIVATECONNECTION = + private static final PathTemplate PROJECT_LOCATION_PRIVATE_CONNECTION = PathTemplate.createWithoutUrlEncoding( - "projects/{project}/locations/{location}/privateConnections/{privateConnection}"); + "projects/{project}/locations/{location}/privateConnections/{private_connection}"); private volatile Map fieldValuesMap; private final String project; private final String location; @@ -93,9 +93,10 @@ public static PrivateConnectionName parse(String formattedString) { return null; } Map matchMap = - PROJECT_LOCATION_PRIVATECONNECTION.validatedMatch( + PROJECT_LOCATION_PRIVATE_CONNECTION.validatedMatch( formattedString, "PrivateConnectionName.parse: formattedString not in valid format"); - return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("privateConnection")); + return of( + matchMap.get("project"), matchMap.get("location"), matchMap.get("private_connection")); } public static List parseList(List formattedStrings) { @@ -119,7 +120,7 @@ public static List toStringList(List values) { } public static boolean isParsableFrom(String formattedString) { - return PROJECT_LOCATION_PRIVATECONNECTION.matches(formattedString); + return PROJECT_LOCATION_PRIVATE_CONNECTION.matches(formattedString); } @Override @@ -135,7 +136,7 @@ public Map getFieldValuesMap() { fieldMapBuilder.put("location", location); } if (privateConnection != null) { - fieldMapBuilder.put("privateConnection", privateConnection); + fieldMapBuilder.put("private_connection", privateConnection); } fieldValuesMap = fieldMapBuilder.build(); } @@ -150,8 +151,8 @@ public String getFieldValue(String fieldName) { @Override public String toString() { - return PROJECT_LOCATION_PRIVATECONNECTION.instantiate( - "project", project, "location", location, "privateConnection", privateConnection); + return PROJECT_LOCATION_PRIVATE_CONNECTION.instantiate( + "project", project, "location", location, "private_connection", privateConnection); } @Override @@ -180,7 +181,9 @@ public int hashCode() { return h; } - /** Builder for projects/{project}/locations/{location}/privateConnections/{privateConnection}. */ + /** + * Builder for projects/{project}/locations/{location}/privateConnections/{private_connection}. + */ public static class Builder { private String project; private String location; diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/RouteName.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/RouteName.java index 963d6e28..3decc4e1 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/RouteName.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/RouteName.java @@ -29,9 +29,9 @@ // AUTO-GENERATED DOCUMENTATION AND CLASS. @Generated("by gapic-generator-java") public class RouteName implements ResourceName { - private static final PathTemplate PROJECT_LOCATION_PRIVATECONNECTION_ROUTE = + private static final PathTemplate PROJECT_LOCATION_PRIVATE_CONNECTION_ROUTE = PathTemplate.createWithoutUrlEncoding( - "projects/{project}/locations/{location}/privateConnections/{privateConnection}/routes/{route}"); + "projects/{project}/locations/{location}/privateConnections/{private_connection}/routes/{route}"); private volatile Map fieldValuesMap; private final String project; private final String location; @@ -103,12 +103,12 @@ public static RouteName parse(String formattedString) { return null; } Map matchMap = - PROJECT_LOCATION_PRIVATECONNECTION_ROUTE.validatedMatch( + PROJECT_LOCATION_PRIVATE_CONNECTION_ROUTE.validatedMatch( formattedString, "RouteName.parse: formattedString not in valid format"); return of( matchMap.get("project"), matchMap.get("location"), - matchMap.get("privateConnection"), + matchMap.get("private_connection"), matchMap.get("route")); } @@ -133,7 +133,7 @@ public static List toStringList(List values) { } public static boolean isParsableFrom(String formattedString) { - return PROJECT_LOCATION_PRIVATECONNECTION_ROUTE.matches(formattedString); + return PROJECT_LOCATION_PRIVATE_CONNECTION_ROUTE.matches(formattedString); } @Override @@ -149,7 +149,7 @@ public Map getFieldValuesMap() { fieldMapBuilder.put("location", location); } if (privateConnection != null) { - fieldMapBuilder.put("privateConnection", privateConnection); + fieldMapBuilder.put("private_connection", privateConnection); } if (route != null) { fieldMapBuilder.put("route", route); @@ -167,12 +167,12 @@ public String getFieldValue(String fieldName) { @Override public String toString() { - return PROJECT_LOCATION_PRIVATECONNECTION_ROUTE.instantiate( + return PROJECT_LOCATION_PRIVATE_CONNECTION_ROUTE.instantiate( "project", project, "location", location, - "privateConnection", + "private_connection", privateConnection, "route", route); @@ -209,7 +209,7 @@ public int hashCode() { /** * Builder for - * projects/{project}/locations/{location}/privateConnections/{privateConnection}/routes/{route}. + * projects/{project}/locations/{location}/privateConnections/{private_connection}/routes/{route}. */ public static class Builder { private String project; diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/proto/google/cloud/datastream/v1alpha1/datastream_resources.proto b/proto-google-cloud-datastream-v1alpha1/src/main/proto/google/cloud/datastream/v1alpha1/datastream_resources.proto index 8b8ef5f3..73320b91 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/proto/google/cloud/datastream/v1alpha1/datastream_resources.proto +++ b/proto-google-cloud-datastream-v1alpha1/src/main/proto/google/cloud/datastream/v1alpha1/datastream_resources.proto @@ -127,7 +127,7 @@ message VpcPeeringConfig { message PrivateConnection { option (google.api.resource) = { type: "datastream.googleapis.com/PrivateConnection" - pattern: "projects/{project}/locations/{location}/privateConnections/{privateConnection}" + pattern: "projects/{project}/locations/{location}/privateConnections/{private_connection}" }; // Private Connection state. @@ -179,7 +179,7 @@ message PrivateConnectivity { message Route { option (google.api.resource) = { type: "datastream.googleapis.com/Route" - pattern: "projects/{project}/locations/{location}/privateConnections/{privateConnection}/routes/{route}" + pattern: "projects/{project}/locations/{location}/privateConnections/{private_connection}/routes/{route}" }; // Output only. The resource's name. @@ -233,7 +233,7 @@ message MysqlSslConfig { message ConnectionProfile { option (google.api.resource) = { type: "datastream.googleapis.com/ConnectionProfile" - pattern: "projects/{project}/locations/{location}/connectionProfiles/{connectionProfile}" + pattern: "projects/{project}/locations/{location}/connectionProfiles/{connection_profile}" }; // Output only. The resource's name. From 185cdd2dcff3b5fc2aa39393468a36075989b682 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Sep 2021 03:54:34 +0200 Subject: [PATCH 14/42] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.0.2 (#59) 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-datastream). --- google-cloud-datastream-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-datastream-bom/pom.xml b/google-cloud-datastream-bom/pom.xml index 70c6e2b8..b77d3189 100644 --- a/google-cloud-datastream-bom/pom.xml +++ b/google-cloud-datastream-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 Google Datastream BOM diff --git a/pom.xml b/pom.xml index cc11a0b3..1b9df607 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 55b9eccf5254281f5ab96bf25f4a5952e34a691e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Sep 2021 04:26:30 +0200 Subject: [PATCH 15/42] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 (#58) 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-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.2.0` -> `2.2.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.1/compatibility-slim/2.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.2.1/confidence-slim/2.2.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.2.1`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​221-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare220v221-2021-09-13) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.2.0...v2.2.1)
--- ### 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-datastream). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b9df607..3e2c6da8 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.2.0 + 2.2.1 pom import From 96b4681bac17191ee4f258d154f789f93e8f50df Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Sep 2021 23:00:48 +0200 Subject: [PATCH 16/42] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1 (#53) 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 | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-javadoc-plugin](https://maven.apache.org/plugins/) | `3.3.0` -> `3.3.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/compatibility-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/confidence-slim/3.3.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-datastream). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3e2c6da8..f55d7c96 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 html From 1ba0d76120078e1f4fada5441f5d81183c1b52f8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 22 Sep 2021 01:20:24 +0200 Subject: [PATCH 17/42] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.0.3 (#61) 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.2` -> `1.0.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.3/compatibility-slim/1.0.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.3/confidence-slim/1.0.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.0.3`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​103-httpswwwgithubcomgoogleapisjava-shared-configcomparev102v103-2021-09-21) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.0.2...v1.0.3)
--- ### 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-datastream). --- google-cloud-datastream-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-datastream-bom/pom.xml b/google-cloud-datastream-bom/pom.xml index b77d3189..683f71ac 100644 --- a/google-cloud-datastream-bom/pom.xml +++ b/google-cloud-datastream-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.0.2 + 1.0.3 Google Datastream BOM diff --git a/pom.xml b/pom.xml index f55d7c96..2d75db07 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 cbe1e551685f84dedacfa1ff978ee42768f869f3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 22 Sep 2021 22:32:26 +0200 Subject: [PATCH 18/42] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.3.0 (#62) 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-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.2.1` -> `2.3.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.3.0/compatibility-slim/2.2.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.3.0/confidence-slim/2.2.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.3.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​230-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare221v230-2021-09-22) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.2.1...v2.3.0) ##### Dependencies - keep protobuf at 3.17.3 (not the latest 3.18.0) ([#​476](https://www.togithub.com/googleapis/java-shared-dependencies/issues/476)) ([e207c81](https://www.github.com/googleapis/java-shared-dependencies/commit/e207c818f220967e3618d7a9d36f2cf26c07892e)) - update gax.version to v2.5.0 ([#​479](https://www.togithub.com/googleapis/java-shared-dependencies/issues/479)) ([e22e62a](https://www.github.com/googleapis/java-shared-dependencies/commit/e22e62a3b248023ae94da2a02ec50006377a5157)) - update google.core.version to v2.1.4 ([#​473](https://www.togithub.com/googleapis/java-shared-dependencies/issues/473)) ([116f278](https://www.github.com/googleapis/java-shared-dependencies/commit/116f2783dfc18f215905ceaff9f85f331f83472b)) - update google.core.version to v2.1.6 ([#​478](https://www.togithub.com/googleapis/java-shared-dependencies/issues/478)) ([9e09728](https://www.github.com/googleapis/java-shared-dependencies/commit/9e0972834764b25e5e194e0e805efc5453120df3)) - update iam.version to v1.1.1 ([#​470](https://www.togithub.com/googleapis/java-shared-dependencies/issues/470)) ([3b6e960](https://www.github.com/googleapis/java-shared-dependencies/commit/3b6e96050af8d976a30165481d764d8226143a39)) - update iam.version to v1.1.2 ([#​472](https://www.togithub.com/googleapis/java-shared-dependencies/issues/472)) ([85329cc](https://www.github.com/googleapis/java-shared-dependencies/commit/85329cc6c13d16fe2eeeb076959ee16a752c1f9e)) ##### [2.2.1](https://www.github.com/googleapis/java-shared-dependencies/compare/2.2.0...v2.2.1) (2021-09-13) ##### Dependencies - update gax.version to v2.4.1 ([#​464](https://www.togithub.com/googleapis/java-shared-dependencies/issues/464)) ([bc7c6d7](https://www.github.com/googleapis/java-shared-dependencies/commit/bc7c6d7ca161ebfa31895c375d65bca29d4c7336)) - update google.core.version to v2.1.3 ([#​465](https://www.togithub.com/googleapis/java-shared-dependencies/issues/465)) ([848f608](https://www.github.com/googleapis/java-shared-dependencies/commit/848f608ae850bd2dd80ec56034eb0c9a18f0415b))
--- ### 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-datastream). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2d75db07..7b0fba14 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.2.1 + 2.3.0 pom import From 1d9ba107a2acab2eda8501b7a49e32742ebb39f0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 19:32:22 +0000 Subject: [PATCH 19/42] chore(java): remove dependencyDashboardLabel config from renovate.json (#1220) (#63) --- .github/.OwlBot.lock.yaml | 2 +- renovate.json | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b6721276..9fb406b3 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db + digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a diff --git a/renovate.json b/renovate.json index 986e9ccc..b595383d 100644 --- a/renovate.json +++ b/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } From 006acbb8f528e296fd1a3cfef1c048ee17690dd8 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:13:51 -0700 Subject: [PATCH 20/42] build: add jdk 17 to java units and dependency builds (#1216) (#65) * update dependencies.sh to not pass MaxPermSize when jdk 17 is used. MaxPermSize is an unrecognized flag in jdk 17. Source-Link: https://github.com/googleapis/synthtool/commit/a4be3384ccb92364795d981f2863f6986fcee620 Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .github/blunderbuss.yml | 2 +- .github/workflows/ci.yaml | 21 +++++++++++++-------- .kokoro/dependencies.sh | 23 ++++++++++++++++++++++- README.md | 8 ++++---- 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9fb406b3..284c8b69 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a + digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5 diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 1a23ea42..2176b054 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,5 +1,5 @@ # Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_prs_by: - labels: - samples diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3becb5c0..2425d723 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: ci jobs: @@ -9,14 +9,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh @@ -29,8 +30,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.bat @@ -40,14 +42,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh @@ -58,8 +61,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh @@ -72,8 +76,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9030ba8f..9a5105d7 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -28,7 +28,28 @@ source ${scriptDir}/common.sh java -version echo $JOB_TYPE -export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" +function determineMavenOpts() { + local javaVersion=$( + # filter down to the version line, then pull out the version between quotes, + # then trim the version number down to its minimal number (removing any + # update or suffix number). + java -version 2>&1 | grep "version" \ + | sed -E 's/^.*"(.*?)".*$/\1/g' \ + | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' + ) + + case $javaVersion in + "17") + # MaxPermSize is no longer supported as of jdk 17 + echo -n "-Xmx1024m" + ;; + *) + echo -n "-Xmx1024m -XX:MaxPermSize=128m" + ;; + esac +} + +export MAVEN_OPTS=$(determineMavenOpts) # this should run maven enforcer retry_with_backoff 3 10 \ diff --git a/README.md b/README.md index 7f3fb7f9..e14c647b 100644 --- a/README.md +++ b/README.md @@ -187,10 +187,10 @@ Java is a registered trademark of Oracle and/or its affiliates. [developer-console]: https://console.developers.google.com/ [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects [cloud-sdk]: https://cloud.google.com/sdk/ -[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting -[contributing]: https://github.com/googleapis/java-datastream/blob/master/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-datastream/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-datastream/blob/master/LICENSE +[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting +[contributing]: https://github.com/googleapis/java-datastream/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-datastream/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-datastream/blob/main/LICENSE [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=datastream.googleapis.com [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM From 564be8d1491dea2933f7ea6756c66baca1515cc9 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Wed, 29 Sep 2021 14:32:57 -0400 Subject: [PATCH 21/42] chore: change branch master to main in github configurations (#68) --- .github/sync-repo-settings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 32e0ea5a..6f09d695 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -2,7 +2,7 @@ rebaseMergeAllowed: false squashMergeAllowed: true mergeCommitAllowed: false branchProtectionRules: - - pattern: master + - pattern: main isAdminEnforced: true requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true From fb16a15fd45f872cda9488680bb3e5b48705d049 Mon Sep 17 00:00:00 2001 From: Jeffrey Rennie Date: Thu, 30 Sep 2021 11:07:10 -0700 Subject: [PATCH 22/42] chore: relocate owl bot post processor (#60) * chore: relocate owl bot post processor * chore: relocate owl bot post processor --- .github/.OwlBot.lock.yaml | 4 ++-- .github/.OwlBot.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 284c8b69..f66be60f 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5 + image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest + digest: sha256:e56a9ac49143216f08cd6d5f7f8769b456ce35b576ae14dbbf8d9891bbb859c3 \ No newline at end of file diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index aad3cb6b..b08f9f41 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -13,7 +13,7 @@ # limitations under the License. docker: - image: "gcr.io/repo-automation-bots/owlbot-java:latest" + image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" deep-remove-regex: - "/grpc-google-.*/src" From 1d5ba3d2c4bd43d2b6629890570bf9db77256849 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Fri, 1 Oct 2021 09:23:09 -0700 Subject: [PATCH 23/42] chore: change branch master to main (#67) From 9681d2ac7203da6be5a93eff19ae322a78db0237 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 13 Oct 2021 17:36:30 +0200 Subject: [PATCH 24/42] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.1.0 (#69) 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.3` -> `1.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/compatibility-slim/1.0.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/confidence-slim/1.0.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.1.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​110-httpswwwgithubcomgoogleapisjava-shared-configcomparev103v110-2021-10-12) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.0.3...v1.1.0) ##### Features - introduce Maven configuration for GraalVM testing ([#​314](https://www.togithub.com/googleapis/java-shared-config/issues/314)) ([28fbeb8](https://www.github.com/googleapis/java-shared-config/commit/28fbeb86c4466a58a05d6933584564dbf3352e79)) ##### Bug Fixes - update doclet version ([#​332](https://www.togithub.com/googleapis/java-shared-config/issues/332)) ([3fd0350](https://www.github.com/googleapis/java-shared-config/commit/3fd035030e4f0954dd1f62f7b8ea62583685880c)) ##### Dependencies - update dependency com.puppycrawl.tools:checkstyle to v9.0.1 ([#​327](https://www.togithub.com/googleapis/java-shared-config/issues/327)) ([b6c9b65](https://www.github.com/googleapis/java-shared-config/commit/b6c9b657550db2dee6b36edbb9a6084baee125e2)) - update dependency org.graalvm.buildtools:junit-platform-native to v0.9.6 ([#​330](https://www.togithub.com/googleapis/java-shared-config/issues/330)) ([271ed7d](https://www.github.com/googleapis/java-shared-config/commit/271ed7dba35623e22fc8a7f7d477e6043e772014)) - update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.6 ([#​331](https://www.togithub.com/googleapis/java-shared-config/issues/331)) ([4f9ba15](https://www.github.com/googleapis/java-shared-config/commit/4f9ba1551df0a2d4fc8c9acca8a951afbe8cb78a)) - update dependency org.junit.vintage:junit-vintage-engine to v5.8.1 ([#​329](https://www.togithub.com/googleapis/java-shared-config/issues/329)) ([4a8789e](https://www.github.com/googleapis/java-shared-config/commit/4a8789ee814ba8a3480beecc76c16fd1cb4e5f12)) ##### [1.0.3](https://www.github.com/googleapis/java-shared-config/compare/v1.0.2...v1.0.3) (2021-09-21) ##### Bug Fixes - update java-docfx-doclet version ([#​315](https://www.togithub.com/googleapis/java-shared-config/issues/315)) ([07af07c](https://www.github.com/googleapis/java-shared-config/commit/07af07c188447ea5728ecd2700121ff477d1c58a)) ##### [1.0.2](https://www.github.com/googleapis/java-shared-config/compare/v1.0.1...v1.0.2) (2021-09-13) ##### Bug Fixes - specify animal-sniffer-maven-plugin version ([#​308](https://www.togithub.com/googleapis/java-shared-config/issues/308)) ([378bf43](https://www.github.com/googleapis/java-shared-config/commit/378bf431383306c1cdd0a4f922956c87edf321b5)) - update java docfx doclet version ([#​312](https://www.togithub.com/googleapis/java-shared-config/issues/312)) ([dd7f6e0](https://www.github.com/googleapis/java-shared-config/commit/dd7f6e0c1a7cc73831b74b4475457611a8c097d3)) ##### Dependencies - update dependency com.puppycrawl.tools:checkstyle to v9 ([#​303](https://www.togithub.com/googleapis/java-shared-config/issues/303)) ([71faea3](https://www.github.com/googleapis/java-shared-config/commit/71faea38d4132407598550e2bb4c77f9d4a4d83d)) ##### [1.0.1](https://www.github.com/googleapis/java-shared-config/compare/v1.0.0...v1.0.1) (2021-08-18) ##### Dependencies - update dependency com.puppycrawl.tools:checkstyle to v8.45.1 ([#​292](https://www.togithub.com/googleapis/java-shared-config/issues/292)) ([66bf6e6](https://www.github.com/googleapis/java-shared-config/commit/66bf6e6fb95997b9eb4b34268b8d20c2fbe9ed5a))
--- ### 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-datastream). --- google-cloud-datastream-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-datastream-bom/pom.xml b/google-cloud-datastream-bom/pom.xml index 683f71ac..3f2763b8 100644 --- a/google-cloud-datastream-bom/pom.xml +++ b/google-cloud-datastream-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 Google Datastream BOM diff --git a/pom.xml b/pom.xml index 7b0fba14..bee58457 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 From 4bd03cf8981af9cce0b8b7a1f5651fdd94c802c7 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 16:56:36 +0000 Subject: [PATCH 25/42] build(java): Introduce Native Image testing build script changes (#71) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/build.sh | 5 +++++ .kokoro/presubmit/graalvm-native.cfg | 33 ++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 .kokoro/presubmit/graalvm-native.cfg diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index f66be60f..dc53bbb5 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:e56a9ac49143216f08cd6d5f7f8769b456ce35b576ae14dbbf8d9891bbb859c3 \ No newline at end of file + digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 36462fea..c5dd6552 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -69,6 +69,11 @@ integration) verify RETURN_CODE=$? ;; +graalvm) + # Run Unit and Integration Tests with Native Image + mvn test -Pnative -Penable-integration-tests + 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/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg new file mode 100644 index 00000000..4c7225ec --- /dev/null +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# 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: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} From 663f719292e6370f0fbb3e3ad6c8b7b2192176c6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 19 Oct 2021 17:34:42 +0200 Subject: [PATCH 26/42] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 (#72) 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-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.3.0` -> `2.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/compatibility-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/confidence-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.4.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​240-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare230v240-2021-10-18) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.3.0...v2.4.0) ##### Dependencies - update dependency com.fasterxml.jackson:jackson-bom to v2.13.0 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.api-client:google-api-client-bom to v1.32.2 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.api:api-common to v2.0.5 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.auth:google-auth-library-bom to v1.2.1 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.guava:guava-bom to v31 ([#​498](https://www.togithub.com/googleapis/java-shared-dependencies/issues/498)) ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.http-client:google-http-client-bom to v1.40.1 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.protobuf:protobuf-bom to v3.18.1 ([#​494](https://www.togithub.com/googleapis/java-shared-dependencies/issues/494)) ([a30e376](https://www.github.com/googleapis/java-shared-dependencies/commit/a30e3762b5fb0e2d31304d211c12eb2c1320f0c1)) - update dependency io.grpc:grpc-bom to v1.41.0 ([#​482](https://www.togithub.com/googleapis/java-shared-dependencies/issues/482)) ([8a7d227](https://www.github.com/googleapis/java-shared-dependencies/commit/8a7d227f2a1dab9ff23d247a4e6131c817804c36)) - update gax.version to v2.6.1 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update iam.version to v1.1.6 ([#​485](https://www.togithub.com/googleapis/java-shared-dependencies/issues/485)) ([cef7e09](https://www.github.com/googleapis/java-shared-dependencies/commit/cef7e090bbc2e3ae775fa83505f98df286ba7d42))
--- ### 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, click this checkbox. --- 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-datastream). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bee58457..14a75a56 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.3.0 + 2.4.0 pom import From 5be385e8ea4c2089d3dbbb50a3e60753995fe584 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 23:38:20 +0000 Subject: [PATCH 27/42] chore(ruby): Re-enable bigquery-storage-v1 generation, which also required updating protobuf from 3.15.3 to 3.18.1 for codegen (#70) - [x] Regenerate this pull request now. PiperOrigin-RevId: 403132955 Source-Link: https://github.com/googleapis/googleapis/commit/d2977af9e9f1fc0c9dc8368352daa032471f3c63 Source-Link: https://github.com/googleapis/googleapis-gen/commit/99bb13c813c0e9c2682d03a8b3c3bcb382a909c9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTliYjEzYzgxM2MwZTljMjY4MmQwM2E4YjNjM2JjYjM4MmE5MDljOSJ9 --- .../datastream/v1alpha1/ConnectionProfile.java | 8 ++++---- .../v1alpha1/CreateConnectionProfileRequest.java | 12 ++++++------ .../v1alpha1/CreatePrivateConnectionRequest.java | 12 ++++++------ .../datastream/v1alpha1/CreateRouteRequest.java | 12 ++++++------ .../datastream/v1alpha1/CreateStreamRequest.java | 12 ++++++------ .../v1alpha1/DeleteConnectionProfileRequest.java | 8 ++++---- .../v1alpha1/DeletePrivateConnectionRequest.java | 8 ++++---- .../datastream/v1alpha1/DeleteRouteRequest.java | 8 ++++---- .../datastream/v1alpha1/DeleteStreamRequest.java | 8 ++++---- .../datastream/v1alpha1/DestinationConfig.java | 4 ++-- .../DiscoverConnectionProfileRequest.java | 4 ++-- .../google/cloud/datastream/v1alpha1/Error.java | 12 ++++++------ .../datastream/v1alpha1/FetchErrorsRequest.java | 4 ++-- .../v1alpha1/FetchStaticIpsRequest.java | 8 ++++---- .../v1alpha1/FetchStaticIpsResponse.java | 4 ++-- .../v1alpha1/ForwardSshTunnelConnectivity.java | 8 ++++---- .../v1alpha1/GcsDestinationConfig.java | 4 ++-- .../cloud/datastream/v1alpha1/GcsProfile.java | 8 ++++---- .../v1alpha1/GetConnectionProfileRequest.java | 4 ++-- .../v1alpha1/GetPrivateConnectionRequest.java | 4 ++-- .../datastream/v1alpha1/GetRouteRequest.java | 4 ++-- .../datastream/v1alpha1/GetStreamRequest.java | 4 ++-- .../v1alpha1/ListConnectionProfilesRequest.java | 16 ++++++++-------- .../v1alpha1/ListConnectionProfilesResponse.java | 4 ++-- .../v1alpha1/ListPrivateConnectionsRequest.java | 16 ++++++++-------- .../v1alpha1/ListPrivateConnectionsResponse.java | 4 ++-- .../datastream/v1alpha1/ListRoutesRequest.java | 16 ++++++++-------- .../datastream/v1alpha1/ListRoutesResponse.java | 4 ++-- .../datastream/v1alpha1/ListStreamsRequest.java | 16 ++++++++-------- .../datastream/v1alpha1/ListStreamsResponse.java | 4 ++-- .../cloud/datastream/v1alpha1/MysqlColumn.java | 12 ++++++------ .../cloud/datastream/v1alpha1/MysqlDatabase.java | 4 ++-- .../cloud/datastream/v1alpha1/MysqlProfile.java | 12 ++++++------ .../datastream/v1alpha1/MysqlSslConfig.java | 12 ++++++------ .../cloud/datastream/v1alpha1/MysqlTable.java | 4 ++-- .../datastream/v1alpha1/OperationMetadata.java | 16 ++++++++-------- .../cloud/datastream/v1alpha1/OracleColumn.java | 12 ++++++------ .../cloud/datastream/v1alpha1/OracleProfile.java | 16 ++++++++-------- .../cloud/datastream/v1alpha1/OracleSchema.java | 4 ++-- .../cloud/datastream/v1alpha1/OracleTable.java | 4 ++-- .../datastream/v1alpha1/PrivateConnection.java | 8 ++++---- .../datastream/v1alpha1/PrivateConnectivity.java | 4 ++-- .../google/cloud/datastream/v1alpha1/Route.java | 12 ++++++------ .../cloud/datastream/v1alpha1/SourceConfig.java | 4 ++-- .../google/cloud/datastream/v1alpha1/Stream.java | 8 ++++---- .../v1alpha1/UpdateConnectionProfileRequest.java | 4 ++-- .../datastream/v1alpha1/UpdateStreamRequest.java | 4 ++-- .../cloud/datastream/v1alpha1/Validation.java | 8 ++++---- .../datastream/v1alpha1/ValidationMessage.java | 8 ++++---- .../datastream/v1alpha1/VpcPeeringConfig.java | 8 ++++---- 50 files changed, 202 insertions(+), 202 deletions(-) diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ConnectionProfile.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ConnectionProfile.java index aa3834ea..51b23c3e 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ConnectionProfile.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ConnectionProfile.java @@ -1091,7 +1091,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (createTime_ != null) { @@ -1102,7 +1102,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 4); - if (!getDisplayNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, displayName_); } if (profileCase_ == 100) { @@ -1139,7 +1139,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (createTime_ != null) { @@ -1158,7 +1158,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, labels__); } - if (!getDisplayNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, displayName_); } if (profileCase_ == 100) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateConnectionProfileRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateConnectionProfileRequest.java index 689a8577..f968f508 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateConnectionProfileRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateConnectionProfileRequest.java @@ -377,16 +377,16 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } - if (!getConnectionProfileIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(connectionProfileId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, connectionProfileId_); } if (connectionProfile_ != null) { output.writeMessage(3, getConnectionProfile()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, requestId_); } unknownFields.writeTo(output); @@ -398,16 +398,16 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } - if (!getConnectionProfileIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(connectionProfileId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, connectionProfileId_); } if (connectionProfile_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getConnectionProfile()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, requestId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreatePrivateConnectionRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreatePrivateConnectionRequest.java index 3f8c36a8..cf7f35a7 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreatePrivateConnectionRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreatePrivateConnectionRequest.java @@ -377,16 +377,16 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } - if (!getPrivateConnectionIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(privateConnectionId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, privateConnectionId_); } if (privateConnection_ != null) { output.writeMessage(3, getPrivateConnection()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, requestId_); } unknownFields.writeTo(output); @@ -398,16 +398,16 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } - if (!getPrivateConnectionIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(privateConnectionId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, privateConnectionId_); } if (privateConnection_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getPrivateConnection()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, requestId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateRouteRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateRouteRequest.java index a1e5c6bd..1373a0bd 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateRouteRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateRouteRequest.java @@ -382,16 +382,16 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } - if (!getRouteIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(routeId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, routeId_); } if (route_ != null) { output.writeMessage(3, getRoute()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, requestId_); } unknownFields.writeTo(output); @@ -403,16 +403,16 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } - if (!getRouteIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(routeId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, routeId_); } if (route_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getRoute()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, requestId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateStreamRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateStreamRequest.java index 1e45844f..c6bf8f5a 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateStreamRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/CreateStreamRequest.java @@ -421,16 +421,16 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } - if (!getStreamIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(streamId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, streamId_); } if (stream_ != null) { output.writeMessage(3, getStream()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, requestId_); } if (validateOnly_ != false) { @@ -448,16 +448,16 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } - if (!getStreamIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(streamId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, streamId_); } if (stream_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getStream()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, requestId_); } if (validateOnly_ != false) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteConnectionProfileRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteConnectionProfileRequest.java index 3dc27f65..0b128b4e 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteConnectionProfileRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteConnectionProfileRequest.java @@ -248,10 +248,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, requestId_); } unknownFields.writeTo(output); @@ -263,10 +263,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, requestId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeletePrivateConnectionRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeletePrivateConnectionRequest.java index f157cea5..9f7259a6 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeletePrivateConnectionRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeletePrivateConnectionRequest.java @@ -272,10 +272,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, requestId_); } if (force_ != false) { @@ -290,10 +290,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, requestId_); } if (force_ != false) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteRouteRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteRouteRequest.java index 5885df7c..11747525 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteRouteRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteRouteRequest.java @@ -255,10 +255,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, requestId_); } unknownFields.writeTo(output); @@ -270,10 +270,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, requestId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteStreamRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteStreamRequest.java index f02cbeae..9a06c4ad 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteStreamRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DeleteStreamRequest.java @@ -247,10 +247,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, requestId_); } unknownFields.writeTo(output); @@ -262,10 +262,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, requestId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DestinationConfig.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DestinationConfig.java index 9b06e51a..8ed63ac6 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DestinationConfig.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DestinationConfig.java @@ -279,7 +279,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getDestinationConnectionProfileNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationConnectionProfileName_)) { com.google.protobuf.GeneratedMessageV3.writeString( output, 1, destinationConnectionProfileName_); } @@ -297,7 +297,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getDestinationConnectionProfileNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationConnectionProfileName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize( 1, destinationConnectionProfileName_); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DiscoverConnectionProfileRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DiscoverConnectionProfileRequest.java index bc8627e5..d3fe1e78 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DiscoverConnectionProfileRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DiscoverConnectionProfileRequest.java @@ -691,7 +691,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } if (depthCase_ == 3) { @@ -721,7 +721,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } if (depthCase_ == 3) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Error.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Error.java index f4f593aa..b3c0b40a 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Error.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Error.java @@ -475,13 +475,13 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getReasonBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, reason_); } - if (!getErrorUuidBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(errorUuid_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, errorUuid_); } - if (!getMessageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, message_); } if (errorTime_ != null) { @@ -498,13 +498,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getReasonBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, reason_); } - if (!getErrorUuidBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(errorUuid_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, errorUuid_); } - if (!getMessageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, message_); } if (errorTime_ != null) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchErrorsRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchErrorsRequest.java index 154417e4..8fa70dfb 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchErrorsRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchErrorsRequest.java @@ -174,7 +174,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getStreamBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(stream_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, stream_); } unknownFields.writeTo(output); @@ -186,7 +186,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getStreamBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(stream_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, stream_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchStaticIpsRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchStaticIpsRequest.java index c2a7b502..49c49061 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchStaticIpsRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchStaticIpsRequest.java @@ -262,13 +262,13 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (pageSize_ != 0) { output.writeInt32(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_); } unknownFields.writeTo(output); @@ -280,13 +280,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (pageSize_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchStaticIpsResponse.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchStaticIpsResponse.java index 5a995de9..01212f04 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchStaticIpsResponse.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/FetchStaticIpsResponse.java @@ -255,7 +255,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < staticIps_.size(); i++) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, staticIps_.getRaw(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_); } unknownFields.writeTo(output); @@ -275,7 +275,7 @@ public int getSerializedSize() { size += dataSize; size += 1 * getStaticIpsList().size(); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ForwardSshTunnelConnectivity.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ForwardSshTunnelConnectivity.java index 57920fc3..0b6b66c8 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ForwardSshTunnelConnectivity.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ForwardSshTunnelConnectivity.java @@ -455,10 +455,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getHostnameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hostname_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, hostname_); } - if (!getUsernameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(username_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, username_); } if (port_ != 0) { @@ -479,10 +479,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getHostnameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hostname_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, hostname_); } - if (!getUsernameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(username_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, username_); } if (port_ != 0) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GcsDestinationConfig.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GcsDestinationConfig.java index 3156c5c1..714b6b42 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GcsDestinationConfig.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GcsDestinationConfig.java @@ -502,7 +502,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getPathBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, path_); } if (gcsFileFormat_ @@ -531,7 +531,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getPathBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, path_); } if (gcsFileFormat_ diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GcsProfile.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GcsProfile.java index 548a0042..d2c9d8fd 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GcsProfile.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GcsProfile.java @@ -233,10 +233,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getBucketNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bucketName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, bucketName_); } - if (!getRootPathBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(rootPath_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, rootPath_); } unknownFields.writeTo(output); @@ -248,10 +248,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getBucketNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bucketName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, bucketName_); } - if (!getRootPathBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(rootPath_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, rootPath_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetConnectionProfileRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetConnectionProfileRequest.java index b4a1488d..b9c01e72 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetConnectionProfileRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetConnectionProfileRequest.java @@ -170,7 +170,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -182,7 +182,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetPrivateConnectionRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetPrivateConnectionRequest.java index 1c1d97cc..693987d4 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetPrivateConnectionRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetPrivateConnectionRequest.java @@ -170,7 +170,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -182,7 +182,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetRouteRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetRouteRequest.java index 82114082..57c31d69 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetRouteRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetRouteRequest.java @@ -178,7 +178,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -190,7 +190,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetStreamRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetStreamRequest.java index 6d3dac37..2dcacd58 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetStreamRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/GetStreamRequest.java @@ -170,7 +170,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } unknownFields.writeTo(output); @@ -182,7 +182,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListConnectionProfilesRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListConnectionProfilesRequest.java index 9d930f05..38be2ff1 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListConnectionProfilesRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListConnectionProfilesRequest.java @@ -372,19 +372,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } if (pageSize_ != 0) { output.writeInt32(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_); } - if (!getFilterBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, filter_); } - if (!getOrderByBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(orderBy_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, orderBy_); } unknownFields.writeTo(output); @@ -396,19 +396,19 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } if (pageSize_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_); } - if (!getFilterBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, filter_); } - if (!getOrderByBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(orderBy_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, orderBy_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListConnectionProfilesResponse.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListConnectionProfilesResponse.java index 8f7a4c4f..cfb1289e 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListConnectionProfilesResponse.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListConnectionProfilesResponse.java @@ -343,7 +343,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < connectionProfiles_.size(); i++) { output.writeMessage(1, connectionProfiles_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_); } for (int i = 0; i < unreachable_.size(); i++) { @@ -362,7 +362,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, connectionProfiles_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_); } { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListPrivateConnectionsRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListPrivateConnectionsRequest.java index b51967d9..852149c8 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListPrivateConnectionsRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListPrivateConnectionsRequest.java @@ -375,19 +375,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } if (pageSize_ != 0) { output.writeInt32(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_); } - if (!getFilterBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, filter_); } - if (!getOrderByBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(orderBy_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, orderBy_); } unknownFields.writeTo(output); @@ -399,19 +399,19 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } if (pageSize_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_); } - if (!getFilterBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, filter_); } - if (!getOrderByBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(orderBy_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, orderBy_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListPrivateConnectionsResponse.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListPrivateConnectionsResponse.java index cce7e029..6c75dde9 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListPrivateConnectionsResponse.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListPrivateConnectionsResponse.java @@ -343,7 +343,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < privateConnections_.size(); i++) { output.writeMessage(1, privateConnections_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_); } for (int i = 0; i < unreachable_.size(); i++) { @@ -362,7 +362,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, privateConnections_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_); } { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListRoutesRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListRoutesRequest.java index c8b67d4b..78e9f5c1 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListRoutesRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListRoutesRequest.java @@ -383,19 +383,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } if (pageSize_ != 0) { output.writeInt32(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_); } - if (!getFilterBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, filter_); } - if (!getOrderByBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(orderBy_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, orderBy_); } unknownFields.writeTo(output); @@ -407,19 +407,19 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } if (pageSize_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_); } - if (!getFilterBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, filter_); } - if (!getOrderByBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(orderBy_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, orderBy_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListRoutesResponse.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListRoutesResponse.java index 4189a064..ebb391e1 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListRoutesResponse.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListRoutesResponse.java @@ -339,7 +339,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < routes_.size(); i++) { output.writeMessage(1, routes_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_); } for (int i = 0; i < unreachable_.size(); i++) { @@ -357,7 +357,7 @@ public int getSerializedSize() { for (int i = 0; i < routes_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, routes_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_); } { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListStreamsRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListStreamsRequest.java index a589debe..e54f166b 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListStreamsRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListStreamsRequest.java @@ -372,19 +372,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } if (pageSize_ != 0) { output.writeInt32(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_); } - if (!getFilterBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, filter_); } - if (!getOrderByBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(orderBy_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, orderBy_); } unknownFields.writeTo(output); @@ -396,19 +396,19 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getParentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_); } if (pageSize_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_); } - if (!getPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_); } - if (!getFilterBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filter_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, filter_); } - if (!getOrderByBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(orderBy_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, orderBy_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListStreamsResponse.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListStreamsResponse.java index 82799c47..6fbdaf40 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListStreamsResponse.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ListStreamsResponse.java @@ -331,7 +331,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < streams_.size(); i++) { output.writeMessage(1, streams_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_); } for (int i = 0; i < unreachable_.size(); i++) { @@ -349,7 +349,7 @@ public int getSerializedSize() { for (int i = 0; i < streams_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, streams_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_); } { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlColumn.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlColumn.java index 24c35a36..43c13c1c 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlColumn.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlColumn.java @@ -382,16 +382,16 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getColumnNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(columnName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, columnName_); } - if (!getDataTypeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dataType_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, dataType_); } if (length_ != 0) { output.writeInt32(3, length_); } - if (!getCollationBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(collation_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, collation_); } if (primaryKey_ != false) { @@ -412,16 +412,16 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getColumnNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(columnName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, columnName_); } - if (!getDataTypeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dataType_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, dataType_); } if (length_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(3, length_); } - if (!getCollationBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(collation_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, collation_); } if (primaryKey_ != false) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlDatabase.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlDatabase.java index 9f765a5b..934603c3 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlDatabase.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlDatabase.java @@ -261,7 +261,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getDatabaseNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, databaseName_); } for (int i = 0; i < mysqlTables_.size(); i++) { @@ -276,7 +276,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getDatabaseNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, databaseName_); } for (int i = 0; i < mysqlTables_.size(); i++) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlProfile.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlProfile.java index 3c457ae5..ecd518d5 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlProfile.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlProfile.java @@ -380,16 +380,16 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getHostnameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hostname_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, hostname_); } if (port_ != 0) { output.writeInt32(2, port_); } - if (!getUsernameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(username_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, username_); } - if (!getPasswordBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(password_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, password_); } if (sslConfig_ != null) { @@ -404,16 +404,16 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getHostnameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hostname_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, hostname_); } if (port_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, port_); } - if (!getUsernameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(username_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, username_); } - if (!getPasswordBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(password_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, password_); } if (sslConfig_ != null) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlSslConfig.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlSslConfig.java index cc858ae3..749825ae 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlSslConfig.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlSslConfig.java @@ -367,19 +367,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getClientKeyBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientKey_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 11, clientKey_); } if (clientKeySet_ != false) { output.writeBool(12, clientKeySet_); } - if (!getClientCertificateBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientCertificate_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 13, clientCertificate_); } if (clientCertificateSet_ != false) { output.writeBool(14, clientCertificateSet_); } - if (!getCaCertificateBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(caCertificate_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 15, caCertificate_); } if (caCertificateSet_ != false) { @@ -394,19 +394,19 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getClientKeyBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientKey_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, clientKey_); } if (clientKeySet_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(12, clientKeySet_); } - if (!getClientCertificateBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientCertificate_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, clientCertificate_); } if (clientCertificateSet_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(14, clientCertificateSet_); } - if (!getCaCertificateBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(caCertificate_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, caCertificate_); } if (caCertificateSet_ != false) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlTable.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlTable.java index f28b556e..a9cfa958 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlTable.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/MysqlTable.java @@ -272,7 +272,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, tableName_); } for (int i = 0; i < mysqlColumns_.size(); i++) { @@ -287,7 +287,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, tableName_); } for (int i = 0; i < mysqlColumns_.size(); i++) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OperationMetadata.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OperationMetadata.java index f053744e..3da720c7 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OperationMetadata.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OperationMetadata.java @@ -577,19 +577,19 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (endTime_ != null) { output.writeMessage(2, getEndTime()); } - if (!getTargetBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, target_); } - if (!getVerbBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(verb_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, verb_); } - if (!getStatusMessageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusMessage_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, statusMessage_); } if (requestedCancellation_ != false) { output.writeBool(6, requestedCancellation_); } - if (!getApiVersionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 7, apiVersion_); } if (validationResult_ != null) { @@ -610,19 +610,19 @@ public int getSerializedSize() { if (endTime_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime()); } - if (!getTargetBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, target_); } - if (!getVerbBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(verb_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, verb_); } - if (!getStatusMessageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusMessage_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, statusMessage_); } if (requestedCancellation_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(6, requestedCancellation_); } - if (!getApiVersionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, apiVersion_); } if (validationResult_ != null) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleColumn.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleColumn.java index f41a1ea1..b675565f 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleColumn.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleColumn.java @@ -426,10 +426,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getColumnNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(columnName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, columnName_); } - if (!getDataTypeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dataType_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, dataType_); } if (length_ != 0) { @@ -441,7 +441,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (scale_ != 0) { output.writeInt32(5, scale_); } - if (!getEncodingBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(encoding_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 6, encoding_); } if (primaryKey_ != false) { @@ -462,10 +462,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getColumnNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(columnName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, columnName_); } - if (!getDataTypeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dataType_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, dataType_); } if (length_ != 0) { @@ -477,7 +477,7 @@ public int getSerializedSize() { if (scale_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(5, scale_); } - if (!getEncodingBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(encoding_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, encoding_); } if (primaryKey_ != false) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleProfile.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleProfile.java index 49f2b2ef..6fb7902e 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleProfile.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleProfile.java @@ -501,19 +501,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getHostnameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hostname_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, hostname_); } if (port_ != 0) { output.writeInt32(2, port_); } - if (!getUsernameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(username_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, username_); } - if (!getPasswordBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(password_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, password_); } - if (!getDatabaseServiceBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseService_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, databaseService_); } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( @@ -530,19 +530,19 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getHostnameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hostname_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, hostname_); } if (port_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, port_); } - if (!getUsernameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(username_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, username_); } - if (!getPasswordBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(password_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, password_); } - if (!getDatabaseServiceBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseService_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, databaseService_); } for (java.util.Map.Entry entry : diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleSchema.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleSchema.java index 7035caa7..66de52ae 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleSchema.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleSchema.java @@ -262,7 +262,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, schemaName_); } for (int i = 0; i < oracleTables_.size(); i++) { @@ -277,7 +277,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getSchemaNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schemaName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, schemaName_); } for (int i = 0; i < oracleTables_.size(); i++) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleTable.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleTable.java index 93ab6d26..baf7109c 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleTable.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/OracleTable.java @@ -272,7 +272,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, tableName_); } for (int i = 0; i < oracleColumns_.size(); i++) { @@ -287,7 +287,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getTableNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tableName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, tableName_); } for (int i = 0; i < oracleColumns_.size(); i++) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnection.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnection.java index e0194302..e19e3423 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnection.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnection.java @@ -834,7 +834,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (createTime_ != null) { @@ -845,7 +845,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 4); - if (!getDisplayNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, displayName_); } if (state_ @@ -868,7 +868,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (createTime_ != null) { @@ -887,7 +887,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, labels__); } - if (!getDisplayNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, displayName_); } if (state_ diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnectivity.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnectivity.java index a330a335..de9d53cd 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnectivity.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/PrivateConnectivity.java @@ -162,7 +162,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getPrivateConnectionNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(privateConnectionName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, privateConnectionName_); } unknownFields.writeTo(output); @@ -174,7 +174,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getPrivateConnectionNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(privateConnectionName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, privateConnectionName_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Route.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Route.java index 5ddd4dd4..53d8c764 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Route.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Route.java @@ -563,7 +563,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (createTime_ != null) { @@ -574,10 +574,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 4); - if (!getDisplayNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, displayName_); } - if (!getDestinationAddressBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationAddress_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 6, destinationAddress_); } if (destinationPort_ != 0) { @@ -592,7 +592,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (createTime_ != null) { @@ -611,10 +611,10 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, labels__); } - if (!getDisplayNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, displayName_); } - if (!getDestinationAddressBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(destinationAddress_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, destinationAddress_); } if (destinationPort_ != 0) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/SourceConfig.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/SourceConfig.java index 292b013a..9fa9bda7 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/SourceConfig.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/SourceConfig.java @@ -367,7 +367,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getSourceConnectionProfileNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sourceConnectionProfileName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, sourceConnectionProfileName_); } if (sourceStreamConfigCase_ == 100) { @@ -387,7 +387,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getSourceConnectionProfileNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sourceConnectionProfileName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, sourceConnectionProfileName_); } diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Stream.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Stream.java index d713b00f..caf8e406 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Stream.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Stream.java @@ -2946,7 +2946,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (createTime_ != null) { @@ -2957,7 +2957,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 4); - if (!getDisplayNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, displayName_); } if (sourceConfig_ != null) { @@ -2990,7 +2990,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (createTime_ != null) { @@ -3009,7 +3009,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, labels__); } - if (!getDisplayNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, displayName_); } if (sourceConfig_ != null) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/UpdateConnectionProfileRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/UpdateConnectionProfileRequest.java index 8e594783..c6d0c8d8 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/UpdateConnectionProfileRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/UpdateConnectionProfileRequest.java @@ -341,7 +341,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (connectionProfile_ != null) { output.writeMessage(2, getConnectionProfile()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, requestId_); } unknownFields.writeTo(output); @@ -359,7 +359,7 @@ public int getSerializedSize() { if (connectionProfile_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getConnectionProfile()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, requestId_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/UpdateStreamRequest.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/UpdateStreamRequest.java index b6308b91..503775ce 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/UpdateStreamRequest.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/UpdateStreamRequest.java @@ -385,7 +385,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (stream_ != null) { output.writeMessage(2, getStream()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, requestId_); } if (validateOnly_ != false) { @@ -409,7 +409,7 @@ public int getSerializedSize() { if (stream_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getStream()); } - if (!getRequestIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, requestId_); } if (validateOnly_ != false) { diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Validation.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Validation.java index 7bc79458..75739ed6 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Validation.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/Validation.java @@ -537,7 +537,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getDescriptionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, description_); } if (status_ @@ -547,7 +547,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < message_.size(); i++) { output.writeMessage(3, message_.get(i)); } - if (!getCodeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, code_); } unknownFields.writeTo(output); @@ -559,7 +559,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getDescriptionBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, description_); } if (status_ @@ -569,7 +569,7 @@ public int getSerializedSize() { for (int i = 0; i < message_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, message_.get(i)); } - if (!getCodeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, code_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ValidationMessage.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ValidationMessage.java index 0495e57b..baf32115 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ValidationMessage.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/ValidationMessage.java @@ -562,7 +562,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getMessageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, message_); } if (level_ @@ -572,7 +572,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetMetadata(), MetadataDefaultEntryHolder.defaultEntry, 3); - if (!getCodeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, code_); } unknownFields.writeTo(output); @@ -584,7 +584,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getMessageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, message_); } if (level_ @@ -602,7 +602,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, metadata__); } - if (!getCodeBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, code_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/VpcPeeringConfig.java b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/VpcPeeringConfig.java index 27bf88a3..d31fc2ea 100644 --- a/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/VpcPeeringConfig.java +++ b/proto-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/VpcPeeringConfig.java @@ -232,10 +232,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getVpcNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(vpcName_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, vpcName_); } - if (!getSubnetBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(subnet_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, subnet_); } unknownFields.writeTo(output); @@ -247,10 +247,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getVpcNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(vpcName_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, vpcName_); } - if (!getSubnetBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(subnet_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, subnet_); } size += unknownFields.getSerializedSize(); From 1fbf88ca19e9477742891603d2fbf4d5e6656461 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:16:36 +0000 Subject: [PATCH 28/42] fix(java): java 17 dependency arguments (#1266) (#74) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/dependencies.sh | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index dc53bbb5..0df65ebe 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 + digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75 diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7..d7476cfe 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,15 +38,13 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) - case $javaVersion in - "17") + if [[ $javaVersion == 17* ]] + then # MaxPermSize is no longer supported as of jdk 17 echo -n "-Xmx1024m" - ;; - *) + else echo -n "-Xmx1024m -XX:MaxPermSize=128m" - ;; - esac + fi } export MAVEN_OPTS=$(determineMavenOpts) From c453c5c2c980223ada0ce23fc5e4b4e3fbbfdce7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 25 Oct 2021 23:06:23 +0200 Subject: [PATCH 29/42] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.0 (#73) 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.1.0` -> `1.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/compatibility-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.0/confidence-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​120-httpswwwgithubcomgoogleapisjava-shared-configcomparev110v120-2021-10-21) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.1.0...v1.2.0) ##### Features - Introduce Native Image testing build script changes ([#​1240](https://www.togithub.com/googleapis/java-shared-config/issues/1240)) ([#​334](https://www.togithub.com/googleapis/java-shared-config/issues/334)) ([4643cf1](https://www.github.com/googleapis/java-shared-config/commit/4643cf15be0b37fa8fa905d544d438cda7ef2ecd)) ##### Bug Fixes - **java:** downgrade native maven plugin version ([#​335](https://www.togithub.com/googleapis/java-shared-config/issues/335)) ([5834284](https://www.github.com/googleapis/java-shared-config/commit/5834284176fb34713d10082ce04f3b6abba85ad8))
--- ### 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, click this checkbox. --- 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-datastream). --- google-cloud-datastream-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-datastream-bom/pom.xml b/google-cloud-datastream-bom/pom.xml index 3f2763b8..42b4b5e5 100644 --- a/google-cloud-datastream-bom/pom.xml +++ b/google-cloud-datastream-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.0 Google Datastream BOM diff --git a/pom.xml b/pom.xml index 14a75a56..cf4f4951 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.0 From a3a3c22f132d82d22861d6469a672ca83b5719a2 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:56:24 +0000 Subject: [PATCH 30/42] chore(java): remove pin on Apache Maven 3.8.1 from github actions (#1268) (#75) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 0df65ebe..5a79fcd5 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75 + digest: sha256:ed012741acaae5d03e011244585a1f0625a596d31568967d77772aa5a0a51d5e diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2425d723..d95a11a2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,9 +12,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -27,9 +24,6 @@ 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@v2 with: distribution: zulu @@ -45,9 +39,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -58,9 +49,6 @@ 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@v2 with: distribution: zulu @@ -73,9 +61,6 @@ 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@v2 with: distribution: zulu @@ -83,4 +68,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file From ee84522256109a842c2cd2a91e2d99029c4d2de6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Sat, 6 Nov 2021 00:38:19 +0000 Subject: [PATCH 31/42] Update ci.yaml (#1275) (#76) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5a79fcd5..994dd04b 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:ed012741acaae5d03e011244585a1f0625a596d31568967d77772aa5a0a51d5e + digest: sha256:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d95a11a2..93b337c6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,7 @@ jobs: units: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [8, 11, 17] steps: @@ -68,4 +69,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr From 282f8bd9371f4a06965dd268075e4d2beac75863 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 13:46:16 -0800 Subject: [PATCH 32/42] chore: cleanup cloud RAD generation (#1269) (#77) Updating cloud rad generation to support [java-shared-config/pull/344](https://github.com/googleapis/java-shared-config/pull/344) updates and removing inclusion of README as we're not currently supporting this feature yet Source-Link: https://github.com/googleapis/synthtool/commit/99ea92a109dbcd4e2b8c179e337848ba6a25fe16 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/release/publish_javadoc11.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 994dd04b..325daaa4 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c + digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index bbf408f8..e87b1015 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true export NAME=google-cloud-datastream export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) -# V3 generates docfx yml from javadoc -# generate yml -mvn clean site -B -q -P docFX - -# copy README to docfx-yml dir and rename index.md -cp README.md target/docfx-yml/index.md -# copy CHANGELOG to docfx-yml dir and rename history.md +# cloud RAD generation +mvn clean javadoc:aggregate -B -q -P docFX +# include CHANGELOG cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml From 87857bd2e385876fd060421c6937fb51ce2b6cb9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 9 Nov 2021 00:22:18 +0100 Subject: [PATCH 33/42] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.1 (#78) 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.2.0` -> `1.2.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/compatibility-slim/1.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.1/confidence-slim/1.2.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.1`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​121-httpswwwgithubcomgoogleapisjava-shared-configcomparev120v121-2021-11-08) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.0...v1.2.1)
--- ### 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, click this checkbox. --- 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-datastream). --- google-cloud-datastream-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-datastream-bom/pom.xml b/google-cloud-datastream-bom/pom.xml index 42b4b5e5..303b1d34 100644 --- a/google-cloud-datastream-bom/pom.xml +++ b/google-cloud-datastream-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.0 + 1.2.1 Google Datastream BOM diff --git a/pom.xml b/pom.xml index cf4f4951..13db63d7 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.0 + 1.2.1 From a7008377212a8b00b1ad26879714952db4dc5df6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 9 Nov 2021 14:56:21 +0000 Subject: [PATCH 34/42] chore: update jre to 11 for linter (#1278) (#79) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 325daaa4..886d0949 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa + digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 93b337c6..05de1f60 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: zulu - java-version: 8 + java-version: 11 - run: java -version - run: .kokoro/build.sh env: From fa8bf79ff66eeffd175dc84707a93c3bff74d3cc Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 20:52:23 +0000 Subject: [PATCH 35/42] chore: update Java and Python dependencies (#80) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 408420890 Source-Link: https://github.com/googleapis/googleapis/commit/2921f9fb3bfbd16f6b2da0104373e2b47a80a65e Source-Link: https://github.com/googleapis/googleapis-gen/commit/6598ca8cbbf5226733a099c4506518a5af6ff74c Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjU5OGNhOGNiYmY1MjI2NzMzYTA5OWM0NTA2NTE4YTVhZjZmZjc0YyJ9 --- .../datastream/v1alpha1/DatastreamClient.java | 100 ++++++------------ .../v1alpha1/DatastreamClientTest.java | 8 +- .../datastream/v1alpha1/DatastreamGrpc.java | 1 + 3 files changed, 37 insertions(+), 72 deletions(-) diff --git a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java index 24999ec2..e5f09a0f 100644 --- a/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java +++ b/google-cloud-datastream/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamClient.java @@ -198,8 +198,7 @@ public final ListConnectionProfilesPagedResponse listConnectionProfiles(Location * *
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
-   *   String parent =
-   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]").toString();
+   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
    *   for (ConnectionProfile element :
    *       datastreamClient.listConnectionProfiles(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -226,9 +225,7 @@ public final ListConnectionProfilesPagedResponse listConnectionProfiles(String p
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ListConnectionProfilesRequest request =
    *       ListConnectionProfilesRequest.newBuilder()
-   *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -259,9 +256,7 @@ public final ListConnectionProfilesPagedResponse listConnectionProfiles(
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ListConnectionProfilesRequest request =
    *       ListConnectionProfilesRequest.newBuilder()
-   *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -291,9 +286,7 @@ public final ListConnectionProfilesPagedResponse listConnectionProfiles(
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ListConnectionProfilesRequest request =
    *       ListConnectionProfilesRequest.newBuilder()
-   *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -461,8 +454,7 @@ public final OperationFuture createConnect
    *
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
-   *   String parent =
-   *       ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]").toString();
+   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
    *   ConnectionProfile connectionProfile = ConnectionProfile.newBuilder().build();
    *   String connectionProfileId = "connectionProfileId597575526";
    *   ConnectionProfile response =
@@ -498,9 +490,7 @@ public final OperationFuture createConnect
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   CreateConnectionProfileRequest request =
    *       CreateConnectionProfileRequest.newBuilder()
-   *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setConnectionProfileId("connectionProfileId597575526")
    *           .setConnectionProfile(ConnectionProfile.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -527,9 +517,7 @@ public final OperationFuture createConnect
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   CreateConnectionProfileRequest request =
    *       CreateConnectionProfileRequest.newBuilder()
-   *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setConnectionProfileId("connectionProfileId597575526")
    *           .setConnectionProfile(ConnectionProfile.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -557,9 +545,7 @@ public final OperationFuture createConnect
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   CreateConnectionProfileRequest request =
    *       CreateConnectionProfileRequest.newBuilder()
-   *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setConnectionProfileId("connectionProfileId597575526")
    *           .setConnectionProfile(ConnectionProfile.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -829,9 +815,7 @@ public final OperationFuture deleteConnectionProfileAs
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   DiscoverConnectionProfileRequest request =
    *       DiscoverConnectionProfileRequest.newBuilder()
-   *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .build();
    *   DiscoverConnectionProfileResponse response =
    *       datastreamClient.discoverConnectionProfile(request);
@@ -858,9 +842,7 @@ public final DiscoverConnectionProfileResponse discoverConnectionProfile(
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   DiscoverConnectionProfileRequest request =
    *       DiscoverConnectionProfileRequest.newBuilder()
-   *           .setParent(
-   *               ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .build();
    *   ApiFuture future =
    *       datastreamClient.discoverConnectionProfileCallable().futureCall(request);
@@ -908,7 +890,7 @@ public final ListStreamsPagedResponse listStreams(LocationName parent) {
    *
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
-   *   String parent = StreamName.of("[PROJECT]", "[LOCATION]", "[STREAM]").toString();
+   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
    *   for (Stream element : datastreamClient.listStreams(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -933,7 +915,7 @@ public final ListStreamsPagedResponse listStreams(String parent) {
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ListStreamsRequest request =
    *       ListStreamsRequest.newBuilder()
-   *           .setParent(StreamName.of("[PROJECT]", "[LOCATION]", "[STREAM]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -962,7 +944,7 @@ public final ListStreamsPagedResponse listStreams(ListStreamsRequest request) {
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ListStreamsRequest request =
    *       ListStreamsRequest.newBuilder()
-   *           .setParent(StreamName.of("[PROJECT]", "[LOCATION]", "[STREAM]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -991,7 +973,7 @@ public final ListStreamsPagedResponse listStreams(ListStreamsRequest request) {
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ListStreamsRequest request =
    *       ListStreamsRequest.newBuilder()
-   *           .setParent(StreamName.of("[PROJECT]", "[LOCATION]", "[STREAM]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -1143,7 +1125,7 @@ public final OperationFuture createStreamAsync(
    *
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
-   *   String parent = StreamName.of("[PROJECT]", "[LOCATION]", "[STREAM]").toString();
+   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
    *   Stream stream = Stream.newBuilder().build();
    *   String streamId = "streamId1790933179";
    *   Stream response = datastreamClient.createStreamAsync(parent, stream, streamId).get();
@@ -1176,7 +1158,7 @@ public final OperationFuture createStreamAsync(
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   CreateStreamRequest request =
    *       CreateStreamRequest.newBuilder()
-   *           .setParent(StreamName.of("[PROJECT]", "[LOCATION]", "[STREAM]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setStreamId("streamId1790933179")
    *           .setStream(Stream.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -1205,7 +1187,7 @@ public final OperationFuture createStreamAsync(
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   CreateStreamRequest request =
    *       CreateStreamRequest.newBuilder()
-   *           .setParent(StreamName.of("[PROJECT]", "[LOCATION]", "[STREAM]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setStreamId("streamId1790933179")
    *           .setStream(Stream.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -1234,7 +1216,7 @@ public final OperationFuture createStreamAsync(
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   CreateStreamRequest request =
    *       CreateStreamRequest.newBuilder()
-   *           .setParent(StreamName.of("[PROJECT]", "[LOCATION]", "[STREAM]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setStreamId("streamId1790933179")
    *           .setStream(Stream.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -1736,8 +1718,7 @@ public final OperationFuture createPrivate
    *
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
-   *   String parent =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]").toString();
+   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
    *   PrivateConnection privateConnection = PrivateConnection.newBuilder().build();
    *   String privateConnectionId = "privateConnectionId-1926654532";
    *   PrivateConnection response =
@@ -1773,9 +1754,7 @@ public final OperationFuture createPrivate
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   CreatePrivateConnectionRequest request =
    *       CreatePrivateConnectionRequest.newBuilder()
-   *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPrivateConnectionId("privateConnectionId-1926654532")
    *           .setPrivateConnection(PrivateConnection.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -1802,9 +1781,7 @@ public final OperationFuture createPrivate
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   CreatePrivateConnectionRequest request =
    *       CreatePrivateConnectionRequest.newBuilder()
-   *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPrivateConnectionId("privateConnectionId-1926654532")
    *           .setPrivateConnection(PrivateConnection.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -1832,9 +1809,7 @@ public final OperationFuture createPrivate
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   CreatePrivateConnectionRequest request =
    *       CreatePrivateConnectionRequest.newBuilder()
-   *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPrivateConnectionId("privateConnectionId-1926654532")
    *           .setPrivateConnection(PrivateConnection.newBuilder().build())
    *           .setRequestId("requestId693933066")
@@ -1986,8 +1961,7 @@ public final ListPrivateConnectionsPagedResponse listPrivateConnections(Location
    *
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
-   *   String parent =
-   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]").toString();
+   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
    *   for (PrivateConnection element :
    *       datastreamClient.listPrivateConnections(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -2015,9 +1989,7 @@ public final ListPrivateConnectionsPagedResponse listPrivateConnections(String p
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ListPrivateConnectionsRequest request =
    *       ListPrivateConnectionsRequest.newBuilder()
-   *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -2048,9 +2020,7 @@ public final ListPrivateConnectionsPagedResponse listPrivateConnections(
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ListPrivateConnectionsRequest request =
    *       ListPrivateConnectionsRequest.newBuilder()
-   *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -2080,9 +2050,7 @@ public final ListPrivateConnectionsPagedResponse listPrivateConnections(
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   ListPrivateConnectionsRequest request =
    *       ListPrivateConnectionsRequest.newBuilder()
-   *           .setParent(
-   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
-   *                   .toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .setFilter("filter-1274492040")
@@ -2283,7 +2251,7 @@ public final OperationFuture createRouteAsync(
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String parent =
-   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]").toString();
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]").toString();
    *   Route route = Route.newBuilder().build();
    *   String routeId = "routeId1385647428";
    *   Route response = datastreamClient.createRouteAsync(parent, route, routeId).get();
@@ -2317,7 +2285,7 @@ public final OperationFuture createRouteAsync(
    *   CreateRouteRequest request =
    *       CreateRouteRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setRouteId("routeId1385647428")
    *           .setRoute(Route.newBuilder().build())
@@ -2346,7 +2314,7 @@ public final OperationFuture createRouteAsync(
    *   CreateRouteRequest request =
    *       CreateRouteRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setRouteId("routeId1385647428")
    *           .setRoute(Route.newBuilder().build())
@@ -2375,7 +2343,7 @@ public final OperationFuture createRouteAsync(
    *   CreateRouteRequest request =
    *       CreateRouteRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setRouteId("routeId1385647428")
    *           .setRoute(Route.newBuilder().build())
@@ -2518,7 +2486,7 @@ public final ListRoutesPagedResponse listRoutes(PrivateConnectionName parent) {
    * 
{@code
    * try (DatastreamClient datastreamClient = DatastreamClient.create()) {
    *   String parent =
-   *       RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]").toString();
+   *       PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]").toString();
    *   for (Route element : datastreamClient.listRoutes(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -2544,7 +2512,7 @@ public final ListRoutesPagedResponse listRoutes(String parent) {
    *   ListRoutesRequest request =
    *       ListRoutesRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -2575,7 +2543,7 @@ public final ListRoutesPagedResponse listRoutes(ListRoutesRequest request) {
    *   ListRoutesRequest request =
    *       ListRoutesRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
@@ -2605,7 +2573,7 @@ public final UnaryCallable listRoute
    *   ListRoutesRequest request =
    *       ListRoutesRequest.newBuilder()
    *           .setParent(
-   *               RouteName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]", "[ROUTE]")
+   *               PrivateConnectionName.of("[PROJECT]", "[LOCATION]", "[PRIVATE_CONNECTION]")
    *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
diff --git a/google-cloud-datastream/src/test/java/com/google/cloud/datastream/v1alpha1/DatastreamClientTest.java b/google-cloud-datastream/src/test/java/com/google/cloud/datastream/v1alpha1/DatastreamClientTest.java
index 3427ce72..6bd13c59 100644
--- a/google-cloud-datastream/src/test/java/com/google/cloud/datastream/v1alpha1/DatastreamClientTest.java
+++ b/google-cloud-datastream/src/test/java/com/google/cloud/datastream/v1alpha1/DatastreamClientTest.java
@@ -546,9 +546,7 @@ public void discoverConnectionProfileTest() throws Exception {
 
     DiscoverConnectionProfileRequest request =
         DiscoverConnectionProfileRequest.newBuilder()
-            .setParent(
-                ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-                    .toString())
+            .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
             .build();
 
     DiscoverConnectionProfileResponse actualResponse = client.discoverConnectionProfile(request);
@@ -581,9 +579,7 @@ public void discoverConnectionProfileExceptionTest() throws Exception {
     try {
       DiscoverConnectionProfileRequest request =
           DiscoverConnectionProfileRequest.newBuilder()
-              .setParent(
-                  ConnectionProfileName.of("[PROJECT]", "[LOCATION]", "[CONNECTION_PROFILE]")
-                      .toString())
+              .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
               .build();
       client.discoverConnectionProfile(request);
       Assert.fail("No exception raised");
diff --git a/grpc-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamGrpc.java b/grpc-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamGrpc.java
index ba2b1be2..d1c53d48 100644
--- a/grpc-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamGrpc.java
+++ b/grpc-google-cloud-datastream-v1alpha1/src/main/java/com/google/cloud/datastream/v1alpha1/DatastreamGrpc.java
@@ -27,6 +27,7 @@
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
     comments = "Source: google/cloud/datastream/v1alpha1/datastream.proto")
+@io.grpc.stub.annotations.GrpcGenerated
 public final class DatastreamGrpc {
 
   private DatastreamGrpc() {}

From 5851f401c5ee82be554240a66c8718313babf161 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Nov 2021 21:18:28 +0000
Subject: [PATCH 36/42] chore: update minimum java version to java 8 (#1281)
 (#81)

---
 .github/.OwlBot.lock.yaml | 2 +-
 README.md                 | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 886d0949..5d788be0 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8
+  digest: sha256:a744afda1956beb7bd6dc8d0b740a7839bbe402e34e2f4ef24589074db53ceb0
diff --git a/README.md b/README.md
index e14c647b..70c60c7c 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Datastream uses gRPC for the transport layer.
 
 ## Supported Java Versions
 
-Java 7 or above is required for using this client.
+Java 8 or above is required for using this client.
 
 Google's Java client libraries,
 [Google Cloud Client Libraries][cloudlibs]
@@ -157,7 +157,6 @@ Apache 2.0 - See [LICENSE][license] for more information.
 
 Java Version | Status
 ------------ | ------
-Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1]
 Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
 Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
 Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]

From 7410ba8b439bd5b203edac4e12e38af001d793b0 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Mon, 15 Nov 2021 17:14:34 +0100
Subject: [PATCH 37/42] deps: update dependency
 com.google.cloud:google-cloud-shared-dependencies to v2.5.0 (#82)
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-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.4.0` -> `2.5.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/compatibility-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.0/confidence-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes

googleapis/java-shared-dependencies ### [`v2.5.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​250-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare240v250-2021-11-12) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.4.0...v2.5.0) ##### Features - next release from main branch is 2.5.0 ([#​510](https://www.togithub.com/googleapis/java-shared-dependencies/issues/510)) ([ca9eb8a](https://www.github.com/googleapis/java-shared-dependencies/commit/ca9eb8a40ae81d69de0d82d9499ef21b0136ae49)) ##### Bug Fixes - dependencies.sh to work with Java 17 ([#​516](https://www.togithub.com/googleapis/java-shared-dependencies/issues/516)) ([8422c1d](https://www.github.com/googleapis/java-shared-dependencies/commit/8422c1d7e9ef479f348e63c530789050b5235426)) ##### Dependencies - update dependency com.google.api:api-common to v2.1.0 ([#​508](https://www.togithub.com/googleapis/java-shared-dependencies/issues/508)) ([ae32d16](https://www.github.com/googleapis/java-shared-dependencies/commit/ae32d1689c78fc1469206c8c0df0ebaca59edd2c)) - update dependency com.google.auth:google-auth-library-bom to v1.2.2 ([#​506](https://www.togithub.com/googleapis/java-shared-dependencies/issues/506)) ([b9a8209](https://www.github.com/googleapis/java-shared-dependencies/commit/b9a82098655f29e858bd0c7a9b1049a379e5062a)) - update dependency com.google.auth:google-auth-library-bom to v1.3.0 ([#​524](https://www.togithub.com/googleapis/java-shared-dependencies/issues/524)) ([fc07879](https://www.github.com/googleapis/java-shared-dependencies/commit/fc07879fa6531e39b21977fe77abc19354a1fd33)) - update dependency com.google.code.gson:gson to v2.8.9 ([#​509](https://www.togithub.com/googleapis/java-shared-dependencies/issues/509)) ([bece99b](https://www.github.com/googleapis/java-shared-dependencies/commit/bece99bb3e0365e60e7376ba18d046ab6436a235)) - update dependency com.google.errorprone:error_prone_annotations to v2.10.0 ([#​512](https://www.togithub.com/googleapis/java-shared-dependencies/issues/512)) ([c281f13](https://www.github.com/googleapis/java-shared-dependencies/commit/c281f137525e2111e97349657be578ed1fc832f2)) - update dependency com.google.protobuf:protobuf-bom to v3.19.1 ([#​505](https://www.togithub.com/googleapis/java-shared-dependencies/issues/505)) ([94cde96](https://www.github.com/googleapis/java-shared-dependencies/commit/94cde96069900f9f8c2ff9a522671d03b26828bd)) - update dependency io.grpc:grpc-bom to v1.42.1 ([#​513](https://www.togithub.com/googleapis/java-shared-dependencies/issues/513)) ([0d2b774](https://www.github.com/googleapis/java-shared-dependencies/commit/0d2b774287a132821cc6fe2789140086bc48d525)) - update dependency org.checkerframework:checker-qual to v3.19.0 ([#​501](https://www.togithub.com/googleapis/java-shared-dependencies/issues/501)) ([2b3e0b5](https://www.github.com/googleapis/java-shared-dependencies/commit/2b3e0b5ddc3a645b20a837f3123394f1ca114f08)) - update dependency org.threeten:threetenbp to v1.5.2 ([#​514](https://www.togithub.com/googleapis/java-shared-dependencies/issues/514)) ([4885f40](https://www.github.com/googleapis/java-shared-dependencies/commit/4885f402e2c70435cd10d4f1b893df9873808c56)) - update gax.version to v2.7.0 ([#​515](https://www.togithub.com/googleapis/java-shared-dependencies/issues/515)) ([567e728](https://www.github.com/googleapis/java-shared-dependencies/commit/567e728b0e59233a04e2d04183e6a0c36cca2437)) - update google.core.version to v2.3.0 ([#​530](https://www.togithub.com/googleapis/java-shared-dependencies/issues/530)) ([78e87e9](https://www.github.com/googleapis/java-shared-dependencies/commit/78e87e96befab34dc4a494e752aeb473cd14a156)) - update iam.version to v1.1.7 ([#​504](https://www.togithub.com/googleapis/java-shared-dependencies/issues/504)) ([63dd583](https://www.github.com/googleapis/java-shared-dependencies/commit/63dd583c80f35b01a66fd1908d41467468c66436))
--- ### 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, click this checkbox. --- 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-datastream). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13db63d7..b9a20715 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.5.0 pom import From b2951fc6ffc6c237c179a853719c63f6b79286b3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 17 Nov 2021 18:46:48 +0100 Subject: [PATCH 38/42] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.2 (#83) 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.2.1` -> `1.2.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/compatibility-slim/1.2.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.2/confidence-slim/1.2.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.2`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​122-httpswwwgithubcomgoogleapisjava-shared-configcomparev121v122-2021-11-16) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.1...v1.2.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, click this checkbox. --- 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-datastream). --- google-cloud-datastream-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-datastream-bom/pom.xml b/google-cloud-datastream-bom/pom.xml index 303b1d34..58e5eb34 100644 --- a/google-cloud-datastream-bom/pom.xml +++ b/google-cloud-datastream-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 Google Datastream BOM diff --git a/pom.xml b/pom.xml index b9a20715..32d418ac 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 From a618c1de4ca6473a5ce76859e81e294c7ea874d3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 18:36:12 +0000 Subject: [PATCH 39/42] chore: remove enable-samples profile (#1284) (#84) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/build.sh | 1 - CONTRIBUTING.md | 61 +++++---------------------------------- 3 files changed, 8 insertions(+), 56 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5d788be0..88d9b926 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:a744afda1956beb7bd6dc8d0b740a7839bbe402e34e2f4ef24589074db53ceb0 + digest: sha256:5b8c790f57cca57e6b37ba25f79291265c218cea3e6ba9714b001910ab3f1419 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index c5dd6552..7b5914fb 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -91,7 +91,6 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ - -Penable-samples \ -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2dbdee0..b65dd279 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,12 +53,12 @@ mvn -Penable-integration-tests clean verify ## Code Samples -Code Samples must be bundled in separate Maven modules, and guarded by a -Maven profile with the name `enable-samples`. +All code samples must be in compliance with the [java sample formatting guide][3]. +Code Samples must be bundled in separate Maven modules. The samples must be separate from the primary project for a few reasons: -1. Primary projects have a minimum Java version of Java 7 whereas samples have - a minimum Java version of Java 8. Due to this we need the ability to +1. Primary projects have a minimum Java version of Java 8 whereas samples can have + Java version of Java 11. Due to this we need the ability to selectively exclude samples from a build run. 2. Many code samples depend on external GCP services and need credentials to access the service. @@ -68,39 +68,16 @@ The samples must be separate from the primary project for a few reasons: ### Building ```bash -mvn -Penable-samples clean verify +mvn clean verify ``` Some samples require access to GCP services and require a service account: ```bash export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json -mvn -Penable-samples clean verify +mvn clean verify ``` -### Profile Config - -1. To add samples in a profile to your Maven project, add the following to your -`pom.xml` - - ```xml - - [...] - - - enable-samples - - sample - - - - [...] - - ``` - -2. [Activate](#profile-activation) the profile. -3. Define your samples in a normal Maven project in the `samples/` directory. - ### Code Formatting Code in this repo is formatted with @@ -110,30 +87,6 @@ To run formatting on your project, you can run: mvn com.coveo:fmt-maven-plugin:format ``` -### Profile Activation - -To include code samples when building and testing the project, enable the -`enable-samples` Maven profile. - -#### Command line - -To activate the Maven profile on the command line add `-Penable-samples` to your -Maven command. - -#### Maven `settings.xml` - -To activate the Maven profile in your `~/.m2/settings.xml` add an entry of -`enable-samples` following the instructions in [Active Profiles][2]. - -This method has the benefit of applying to all projects you build (and is -respected by IntelliJ IDEA) and is recommended if you are going to be -contributing samples to several projects. - -#### IntelliJ IDEA - -To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in -[Activate Maven profiles][3] to activate `enable-samples`. - [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account [2]: https://maven.apache.org/settings.html#Active_Profiles -[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles +[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md \ No newline at end of file From ce382b2f079de2c60f9b4d16578dd3b39e235e2a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 3 Dec 2021 17:12:30 +0100 Subject: [PATCH 40/42] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 (#87) 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-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.5.0` -> `2.5.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/compatibility-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/confidence-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.5.1`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​251-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare250v251-2021-12-03) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.5.0...v2.5.1)
--- ### 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, click this checkbox. --- 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-datastream). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32d418ac..d740cf15 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.5.0 + 2.5.1 pom import From 98fb3f8871fb6b02c16ce5bdd3de33b62753a931 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 18:04:29 +0000 Subject: [PATCH 41/42] fix(java): add -ntp flag to native image testing command (#1299) (#88) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 88d9b926..3d2f8282 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:5b8c790f57cca57e6b37ba25f79291265c218cea3e6ba9714b001910ab3f1419 + digest: sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 7b5914fb..cc33dd98 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -71,7 +71,7 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn test -Pnative -Penable-integration-tests + mvn -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; samples) From 2026ad52c1edeb7f925280876c92a118392d6de9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 12:03:57 -0800 Subject: [PATCH 42/42] chore: release 0.3.0 (#66) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 24 +++++++++++++++++++ google-cloud-datastream-bom/pom.xml | 8 +++---- google-cloud-datastream/pom.xml | 4 ++-- grpc-google-cloud-datastream-v1alpha1/pom.xml | 4 ++-- pom.xml | 8 +++---- .../pom.xml | 4 ++-- versions.txt | 6 ++--- 7 files changed, 41 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddea5d7c..6277a510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## [0.3.0](https://www.github.com/googleapis/java-datastream/compare/v0.2.1...v0.3.0) (2021-12-06) + + +### Features + +* Remove use of deprecated gradle command in java README ([#1196](https://www.github.com/googleapis/java-datastream/issues/1196)) ([#46](https://www.github.com/googleapis/java-datastream/issues/46)) ([ca3ada0](https://www.github.com/googleapis/java-datastream/commit/ca3ada051a7dd170af22a2879ad11d430ed23170)) + + +### Bug Fixes + +* **datastream:** Change a few resource pattern variables from camelCase to snake_case ([#47](https://www.github.com/googleapis/java-datastream/issues/47)) ([d5f2e39](https://www.github.com/googleapis/java-datastream/commit/d5f2e3947d88aa91aa563112771767f9a6e9fd96)) +* **java:** add -ntp flag to native image testing command ([#1299](https://www.github.com/googleapis/java-datastream/issues/1299)) ([#88](https://www.github.com/googleapis/java-datastream/issues/88)) ([98fb3f8](https://www.github.com/googleapis/java-datastream/commit/98fb3f8871fb6b02c16ce5bdd3de33b62753a931)) +* **java:** java 17 dependency arguments ([#1266](https://www.github.com/googleapis/java-datastream/issues/1266)) ([#74](https://www.github.com/googleapis/java-datastream/issues/74)) ([1fbf88c](https://www.github.com/googleapis/java-datastream/commit/1fbf88ca19e9477742891603d2fbf4d5e6656461)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#50](https://www.github.com/googleapis/java-datastream/issues/50)) ([36fe6f8](https://www.github.com/googleapis/java-datastream/commit/36fe6f893a30f0ccb44914c0241af370f2221eac)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 ([#58](https://www.github.com/googleapis/java-datastream/issues/58)) ([55b9ecc](https://www.github.com/googleapis/java-datastream/commit/55b9eccf5254281f5ab96bf25f4a5952e34a691e)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.3.0 ([#62](https://www.github.com/googleapis/java-datastream/issues/62)) ([cbe1e55](https://www.github.com/googleapis/java-datastream/commit/cbe1e551685f84dedacfa1ff978ee42768f869f3)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#72](https://www.github.com/googleapis/java-datastream/issues/72)) ([663f719](https://www.github.com/googleapis/java-datastream/commit/663f719292e6370f0fbb3e3ad6c8b7b2192176c6)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 ([#82](https://www.github.com/googleapis/java-datastream/issues/82)) ([7410ba8](https://www.github.com/googleapis/java-datastream/commit/7410ba8b439bd5b203edac4e12e38af001d793b0)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#87](https://www.github.com/googleapis/java-datastream/issues/87)) ([ce382b2](https://www.github.com/googleapis/java-datastream/commit/ce382b2f079de2c60f9b4d16578dd3b39e235e2a)) + ### [0.2.1](https://www.github.com/googleapis/java-datastream/compare/v0.2.0...v0.2.1) (2021-08-24) diff --git a/google-cloud-datastream-bom/pom.xml b/google-cloud-datastream-bom/pom.xml index 58e5eb34..66f40045 100644 --- a/google-cloud-datastream-bom/pom.xml +++ b/google-cloud-datastream-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastream-bom - 0.2.2-SNAPSHOT + 0.3.0 pom com.google.cloud @@ -56,17 +56,17 @@ com.google.cloud google-cloud-datastream - 0.2.2-SNAPSHOT + 0.3.0 com.google.api.grpc grpc-google-cloud-datastream-v1alpha1 - 0.2.2-SNAPSHOT + 0.3.0 com.google.api.grpc proto-google-cloud-datastream-v1alpha1 - 0.2.2-SNAPSHOT + 0.3.0 diff --git a/google-cloud-datastream/pom.xml b/google-cloud-datastream/pom.xml index b2699218..8c1b48c0 100644 --- a/google-cloud-datastream/pom.xml +++ b/google-cloud-datastream/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastream - 0.2.2-SNAPSHOT + 0.3.0 jar Google Datastream https://github.com/googleapis/java-datastream @@ -11,7 +11,7 @@ com.google.cloud google-cloud-datastream-parent - 0.2.2-SNAPSHOT + 0.3.0 google-cloud-datastream diff --git a/grpc-google-cloud-datastream-v1alpha1/pom.xml b/grpc-google-cloud-datastream-v1alpha1/pom.xml index 537d8ed5..eb31b487 100644 --- a/grpc-google-cloud-datastream-v1alpha1/pom.xml +++ b/grpc-google-cloud-datastream-v1alpha1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastream-v1alpha1 - 0.2.2-SNAPSHOT + 0.3.0 grpc-google-cloud-datastream-v1alpha1 GRPC library for google-cloud-datastream com.google.cloud google-cloud-datastream-parent - 0.2.2-SNAPSHOT + 0.3.0 diff --git a/pom.xml b/pom.xml index d740cf15..ebb1ce94 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastream-parent pom - 0.2.2-SNAPSHOT + 0.3.0 Google Datastream Parent https://github.com/googleapis/java-datastream @@ -69,17 +69,17 @@ com.google.cloud google-cloud-datastream - 0.2.2-SNAPSHOT + 0.3.0 com.google.api.grpc grpc-google-cloud-datastream-v1alpha1 - 0.2.2-SNAPSHOT + 0.3.0 com.google.api.grpc proto-google-cloud-datastream-v1alpha1 - 0.2.2-SNAPSHOT + 0.3.0 diff --git a/proto-google-cloud-datastream-v1alpha1/pom.xml b/proto-google-cloud-datastream-v1alpha1/pom.xml index 4a405676..a560c74b 100644 --- a/proto-google-cloud-datastream-v1alpha1/pom.xml +++ b/proto-google-cloud-datastream-v1alpha1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastream-v1alpha1 - 0.2.2-SNAPSHOT + 0.3.0 proto-google-cloud-datastream-v1alpha1 Proto library for google-cloud-datastream com.google.cloud google-cloud-datastream-parent - 0.2.2-SNAPSHOT + 0.3.0 diff --git a/versions.txt b/versions.txt index 6377bc48..8edb85c0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-datastream:0.2.1:0.2.2-SNAPSHOT -grpc-google-cloud-datastream-v1alpha1:0.2.1:0.2.2-SNAPSHOT -proto-google-cloud-datastream-v1alpha1:0.2.1:0.2.2-SNAPSHOT +google-cloud-datastream:0.3.0:0.3.0 +grpc-google-cloud-datastream-v1alpha1:0.3.0:0.3.0 +proto-google-cloud-datastream-v1alpha1:0.3.0:0.3.0