diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 3c91bfd7..903dd96f 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-websecurityscanner.git", - "sha": "a742069f069ba2e1bda64e9338594fb9dca0ba69" + "sha": "a0f9b9fa94b10131fb24eb35290736796f183ec5" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "9763f20e4b7bb1091082462b2f7970e965d0d414" + "sha": "3d32990b6f4b57be77455e3ca89e6e21cd0c06b3" } } ] diff --git a/.github/release-please.yml b/.github/release-please.yml index 8ca7f9ca..7bf58076 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,3 +1,8 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi +branches: + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-yoshi + branch: java7 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 6bddd18e..7dd5c376 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -1,49 +1,42 @@ - -# Whether or not rebase-merging is enabled on this repository. -# Defaults to `true` rebaseMergeAllowed: false - -# Whether or not squash-merging is enabled on this repository. -# Defaults to `true` squashMergeAllowed: true - -# Whether or not PRs are merged with a merge commit on this repository. -# Defaults to `false` mergeCommitAllowed: false - -# Rules for master branch protection branchProtectionRules: -# Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master - # Can admins overwrite branch protection. - # Defaults to `true` - isAdminEnforced: true - # Number of approving reviews required to update matching branches. - # Defaults to `1` - requiredApprovingReviewCount: 1 - # Are reviews from code owners required to update matching branches. - # Defaults to `false` - requiresCodeOwnerReviews: true - # Require up to date branches - requiresStrictStatusChecks: false - # List of required status check contexts that must pass for commits to be accepted to matching branches. - requiredStatusCheckContexts: - - "dependencies (8)" - - "dependencies (11)" - - "linkage-monitor" - - "lint" - - "clirr" - - "units (7)" - - "units (8)" - - "units (11)" - - "Kokoro - Test: Integration" - - "cla/google" -# List of explicit permissions to add (additive only) + - pattern: master + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - pattern: java7 + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (7) + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google permissionRules: -- team: yoshi-admins - permission: admin -- team: yoshi-java-admins - permission: admin -- team: yoshi-java - permission: push \ No newline at end of file + - team: yoshi-admins + permission: admin + - team: yoshi-java-admins + permission: admin + - team: yoshi-java + permission: push diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0195b32f..65ae6ecd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [7, 8, 11] + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh index 5cf7ba49..46edbf7f 100755 --- a/.kokoro/coerce_logs.sh +++ b/.kokoro/coerce_logs.sh @@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME}) echo "coercing sponge logs..." for xml in `find . -name *-sponge_log.xml` do - echo "processing ${xml}" class=$(basename ${xml} | cut -d- -f2) dir=$(dirname ${xml})/${job}/${class} text=$(dirname ${xml})/${class}-sponge_log.txt diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 59d2aafc..9030ba8f 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -14,6 +14,7 @@ # limitations under the License. set -eo pipefail +shopt -s nullglob ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) @@ -46,7 +47,7 @@ function completenessCheck() { # This is stripped from the output as it is not present in the flattened pom. # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt + mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." @@ -70,7 +71,7 @@ function completenessCheck() { set +e error_count=0 -for path in $(find -name ".flattened-pom.xml") +for path in **/.flattened-pom.xml do # Check flattened pom in each dir that contains it for completeness dir=$(dirname "$path") diff --git a/CHANGELOG.md b/CHANGELOG.md index ccf108e3..82272a7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [2.0.0](https://www.github.com/googleapis/java-websecurityscanner/compare/v1.2.2...v2.0.0) (2021-08-10) + + +### ⚠ BREAKING CHANGES + +* release gapic-generator-java v2.0.0 (#509) + +### Features + +* release gapic-generator-java v2.0.0 ([#509](https://www.github.com/googleapis/java-websecurityscanner/issues/509)) ([cd8382f](https://www.github.com/googleapis/java-websecurityscanner/commit/cd8382f48f35385030d98f07bea51cce4979b593)) + + +### Bug Fixes + +* Add shopt -s nullglob to dependencies script ([#491](https://www.github.com/googleapis/java-websecurityscanner/issues/491)) ([2aa4c15](https://www.github.com/googleapis/java-websecurityscanner/commit/2aa4c15293126fb501fdcb4c1e646003a7797fcb)) +* Update dependencies.sh to not break on mac ([#480](https://www.github.com/googleapis/java-websecurityscanner/issues/480)) ([2cfa1f1](https://www.github.com/googleapis/java-websecurityscanner/commit/2cfa1f10a600081095b493ce6d3b1c584c5e20d2)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2 ([#510](https://www.github.com/googleapis/java-websecurityscanner/issues/510)) ([55de604](https://www.github.com/googleapis/java-websecurityscanner/commit/55de604d1daa41d07796c0880d73b59c59b8bc6b)) + ### [1.2.2](https://www.github.com/googleapis/java-websecurityscanner/compare/v1.2.1...v1.2.2) (2021-07-01) diff --git a/README.md b/README.md index 8b22c27f..54e337e7 100644 --- a/README.md +++ b/README.md @@ -8,16 +8,18 @@ Java idiomatic client for [Cloud Security Scanner][product-docs]. - [Product Documentation][product-docs] - [Client Library Documentation][javadocs] + ## Quickstart If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file + ```xml com.google.cloud libraries-bom - 20.7.0 + 20.9.0 pom import @@ -34,35 +36,43 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file If you are using Maven without BOM, add this to your dependencies: + ```xml com.google.cloud google-cloud-websecurityscanner - 1.2.1 + 1.2.2 ``` If you are using Gradle 5.x or later, add this to your dependencies + ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.7.0') +implementation platform('com.google.cloud:libraries-bom:20.9.0') compile 'com.google.cloud:google-cloud-websecurityscanner' ``` If you are using Gradle without BOM, add this to your dependencies + ```Groovy -compile 'com.google.cloud:google-cloud-websecurityscanner:1.2.1' +compile 'com.google.cloud:google-cloud-websecurityscanner:1.2.2' ``` If you are using SBT, add this to your dependencies + ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "1.2.1" +libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "1.2.2" ``` ## Authentication See the [Authentication][authentication] section in the base directory's README. +## Authorization + +The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired Cloud Security Scanner APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the Cloud Security Scanner API calls. + ## Getting Started ### Prerequisites @@ -99,16 +109,57 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr Cloud Security Scanner uses gRPC for the transport layer. -## Java Versions +## Supported Java Versions Java 7 or above is required for using this client. +Google's Java client libraries, +[Google Cloud Client Libraries][cloudlibs] +and +[Google Cloud API Libraries][apilibs], +follow the +[Oracle Java SE support roadmap][oracle] +(see the Oracle Java SE Product Releases section). + +### For new development + +In general, new feature development occurs with support for the lowest Java +LTS version covered by Oracle's Premier Support (which typically lasts 5 years +from initial General Availability). If the minimum required JVM for a given +library is changed, it is accompanied by a [semver][semver] major release. + +Java 11 and (in September 2021) Java 17 are the best choices for new +development. + +### Keeping production systems current + +Google tests its client libraries with all current LTS versions covered by +Oracle's Extended Support (which typically lasts 8 years from initial +General Availability). + +#### Legacy support + +Google's client libraries support legacy versions of Java runtimes with long +term stable libraries that don't receive feature updates on a best efforts basis +as it may not be possible to backport all patches. + +Google provides updates on a best efforts basis to apps that continue to use +Java 7, though apps might need to upgrade to current versions of the library +that supports their JVM. + +#### Where to find specific information + +The latest versions and the supported Java versions are identified on +the individual GitHub repository `github.com/GoogleAPIs/java-SERVICENAME` +and on [google-cloud-java][g-c-j]. + ## Versioning This library follows [Semantic Versioning](http://semver.org/). + ## Contributing @@ -120,6 +171,7 @@ Please note that this project is released with a Contributor Code of Conduct. By this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. + ## License Apache 2.0 - See [LICENSE][license] for more information. @@ -152,6 +204,9 @@ Java is a registered trademark of Oracle and/or its affiliates. [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-websecurityscanner.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-websecurityscanner&core=gav [authentication]: https://github.com/googleapis/google-cloud-java#authentication +[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes +[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles +[iam-policy]: https://cloud.google.com/iam/docs/overview#cloud-iam-policy [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/ @@ -163,3 +218,9 @@ Java is a registered trademark of Oracle and/or its affiliates. [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=websecurityscanner.googleapis.com [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png + +[semver]: https://semver.org/ +[cloudlibs]: https://cloud.google.com/apis/docs/client-libraries-explained +[apilibs]: https://cloud.google.com/apis/docs/client-libraries-explained#google_api_client_libraries +[oracle]: https://www.oracle.com/java/technologies/java-se-support-roadmap.html +[g-c-j]: http://github.com/googleapis/google-cloud-java diff --git a/google-cloud-websecurityscanner-bom/pom.xml b/google-cloud-websecurityscanner-bom/pom.xml index f3339496..63d6ce4e 100644 --- a/google-cloud-websecurityscanner-bom/pom.xml +++ b/google-cloud-websecurityscanner-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-websecurityscanner-bom - 1.2.2 + 2.0.0 pom com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 Google Cloud websecurityscanner BOM @@ -39,17 +39,6 @@ https://github.com/googleapis/java-websecurityscanner - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - The Apache Software License, Version 2.0 @@ -64,37 +53,37 @@ com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.86.2 + 0.87.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.86.2 + 0.87.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1 - 1.2.2 + 2.0.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.86.2 + 0.87.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.86.2 + 0.87.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1 - 1.2.2 + 2.0.0 com.google.cloud google-cloud-websecurityscanner - 1.2.2 + 2.0.0 diff --git a/google-cloud-websecurityscanner/pom.xml b/google-cloud-websecurityscanner/pom.xml index 5d1cced2..7d9fc1ce 100644 --- a/google-cloud-websecurityscanner/pom.xml +++ b/google-cloud-websecurityscanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-websecurityscanner - 1.2.2 + 2.0.0 jar Google Cloud Web Security Scanner https://github.com/googleapis/java-websecurityscanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-websecurityscanner-parent - 1.2.2 + 2.0.0 google-cloud-websecurityscanner diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClient.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClient.java index b3f40443..218debdc 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClient.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClient.java @@ -16,7 +16,6 @@ package com.google.cloud.websecurityscanner.v1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -946,12 +945,7 @@ public static ApiFuture createAsync( ListScanConfigsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListScanConfigsPagedResponse apply(ListScanConfigsPage input) { - return new ListScanConfigsPagedResponse(input); - } - }, + input -> new ListScanConfigsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1028,12 +1022,7 @@ public static ApiFuture createAsync( ListScanRunsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListScanRunsPagedResponse apply(ListScanRunsPage input) { - return new ListScanRunsPagedResponse(input); - } - }, + input -> new ListScanRunsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1108,12 +1097,7 @@ public static ApiFuture createAsync( ListCrawledUrlsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCrawledUrlsPagedResponse apply(ListCrawledUrlsPage input) { - return new ListCrawledUrlsPagedResponse(input); - } - }, + input -> new ListCrawledUrlsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1190,12 +1174,7 @@ public static ApiFuture createAsync( ListFindingsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListFindingsPagedResponse apply(ListFindingsPage input) { - return new ListFindingsPagedResponse(input); - } - }, + input -> new ListFindingsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerSettings.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerSettings.java index eb6e02f5..52066014 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerSettings.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerSettings.java @@ -232,14 +232,13 @@ public WebSecurityScannerStubSettings.Builder getStubSettingsBuilder() { return ((WebSecurityScannerStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/stub/GrpcWebSecurityScannerStub.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/stub/GrpcWebSecurityScannerStub.java index ad85c445..82c75ce0 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/stub/GrpcWebSecurityScannerStub.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/stub/GrpcWebSecurityScannerStub.java @@ -26,7 +26,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.websecurityscanner.v1.CreateScanConfigRequest; import com.google.cloud.websecurityscanner.v1.DeleteScanConfigRequest; @@ -55,7 +54,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -274,39 +272,30 @@ protected GrpcWebSecurityScannerStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteScanConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings getScanConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -314,79 +303,60 @@ public Map extract(GetScanConfigRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listScanConfigsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListScanConfigsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings updateScanConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "scan_config.name", String.valueOf(request.getScanConfig().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("scan_config.name", String.valueOf(request.getScanConfig().getName())); + return params.build(); }) .build(); GrpcCallSettings startScanRunTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(startScanRunMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(StartScanRunRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings getScanRunTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getScanRunMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetScanRunRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings listScanRunsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listScanRunsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListScanRunsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings stopScanRunTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(stopScanRunMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(StopScanRunRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -394,39 +364,30 @@ public Map extract(StopScanRunRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listCrawledUrlsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCrawledUrlsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getFindingTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getFindingMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetFindingRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings listFindingsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listFindingsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFindingsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -434,13 +395,10 @@ public Map extract(ListFindingsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listFindingTypeStatsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFindingTypeStatsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); @@ -596,7 +554,13 @@ public UnaryCallable listFinding @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/stub/WebSecurityScannerStubSettings.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/stub/WebSecurityScannerStubSettings.java index 4ab6fe0b..145c7555 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/stub/WebSecurityScannerStubSettings.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/stub/WebSecurityScannerStubSettings.java @@ -745,14 +745,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java index 3622d72f..3aa26f8b 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java @@ -16,7 +16,6 @@ package com.google.cloud.websecurityscanner.v1alpha; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -1604,12 +1603,7 @@ public static ApiFuture createAsync( ListScanConfigsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListScanConfigsPagedResponse apply(ListScanConfigsPage input) { - return new ListScanConfigsPagedResponse(input); - } - }, + input -> new ListScanConfigsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1686,12 +1680,7 @@ public static ApiFuture createAsync( ListScanRunsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListScanRunsPagedResponse apply(ListScanRunsPage input) { - return new ListScanRunsPagedResponse(input); - } - }, + input -> new ListScanRunsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1766,12 +1755,7 @@ public static ApiFuture createAsync( ListCrawledUrlsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCrawledUrlsPagedResponse apply(ListCrawledUrlsPage input) { - return new ListCrawledUrlsPagedResponse(input); - } - }, + input -> new ListCrawledUrlsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1848,12 +1832,7 @@ public static ApiFuture createAsync( ListFindingsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListFindingsPagedResponse apply(ListFindingsPage input) { - return new ListFindingsPagedResponse(input); - } - }, + input -> new ListFindingsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerSettings.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerSettings.java index b8f64482..b4134c14 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerSettings.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerSettings.java @@ -233,14 +233,13 @@ public WebSecurityScannerStubSettings.Builder getStubSettingsBuilder() { return ((WebSecurityScannerStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerStub.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerStub.java index 6e5ddfd2..332a5e47 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerStub.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerStub.java @@ -27,7 +27,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest; import com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest; @@ -56,7 +55,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -280,39 +278,30 @@ protected GrpcWebSecurityScannerStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteScanConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings getScanConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -320,79 +309,60 @@ public Map extract(GetScanConfigRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listScanConfigsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListScanConfigsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings updateScanConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "scan_config.name", String.valueOf(request.getScanConfig().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("scan_config.name", String.valueOf(request.getScanConfig().getName())); + return params.build(); }) .build(); GrpcCallSettings startScanRunTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(startScanRunMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(StartScanRunRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings getScanRunTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getScanRunMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetScanRunRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings listScanRunsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listScanRunsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListScanRunsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings stopScanRunTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(stopScanRunMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(StopScanRunRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -400,39 +370,30 @@ public Map extract(StopScanRunRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listCrawledUrlsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCrawledUrlsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getFindingTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getFindingMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetFindingRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings listFindingsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listFindingsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFindingsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -440,13 +401,10 @@ public Map extract(ListFindingsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listFindingTypeStatsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFindingTypeStatsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); @@ -602,7 +560,13 @@ public UnaryCallable listFinding @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStubSettings.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStubSettings.java index 9437e1ed..1d4cee56 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStubSettings.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStubSettings.java @@ -746,14 +746,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerClient.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerClient.java index 549c8c09..185cbc0e 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerClient.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerClient.java @@ -16,7 +16,6 @@ package com.google.cloud.websecurityscanner.v1beta; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -1604,12 +1603,7 @@ public static ApiFuture createAsync( ListScanConfigsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListScanConfigsPagedResponse apply(ListScanConfigsPage input) { - return new ListScanConfigsPagedResponse(input); - } - }, + input -> new ListScanConfigsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1686,12 +1680,7 @@ public static ApiFuture createAsync( ListScanRunsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListScanRunsPagedResponse apply(ListScanRunsPage input) { - return new ListScanRunsPagedResponse(input); - } - }, + input -> new ListScanRunsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1766,12 +1755,7 @@ public static ApiFuture createAsync( ListCrawledUrlsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCrawledUrlsPagedResponse apply(ListCrawledUrlsPage input) { - return new ListCrawledUrlsPagedResponse(input); - } - }, + input -> new ListCrawledUrlsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1848,12 +1832,7 @@ public static ApiFuture createAsync( ListFindingsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListFindingsPagedResponse apply(ListFindingsPage input) { - return new ListFindingsPagedResponse(input); - } - }, + input -> new ListFindingsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerSettings.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerSettings.java index 616f3ca9..5a18b680 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerSettings.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerSettings.java @@ -233,14 +233,13 @@ public WebSecurityScannerStubSettings.Builder getStubSettingsBuilder() { return ((WebSecurityScannerStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/stub/GrpcWebSecurityScannerStub.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/stub/GrpcWebSecurityScannerStub.java index aacd632c..d044bedb 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/stub/GrpcWebSecurityScannerStub.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/stub/GrpcWebSecurityScannerStub.java @@ -27,7 +27,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest; import com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest; @@ -56,7 +55,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -278,39 +276,30 @@ protected GrpcWebSecurityScannerStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteScanConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings getScanConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -318,79 +307,60 @@ public Map extract(GetScanConfigRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listScanConfigsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListScanConfigsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings updateScanConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateScanConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateScanConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "scan_config.name", String.valueOf(request.getScanConfig().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("scan_config.name", String.valueOf(request.getScanConfig().getName())); + return params.build(); }) .build(); GrpcCallSettings startScanRunTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(startScanRunMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(StartScanRunRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings getScanRunTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getScanRunMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetScanRunRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings listScanRunsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listScanRunsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListScanRunsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings stopScanRunTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(stopScanRunMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(StopScanRunRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -398,39 +368,30 @@ public Map extract(StopScanRunRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listCrawledUrlsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCrawledUrlsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getFindingTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getFindingMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetFindingRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings listFindingsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listFindingsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFindingsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -438,13 +399,10 @@ public Map extract(ListFindingsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listFindingTypeStatsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFindingTypeStatsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); @@ -600,7 +558,13 @@ public UnaryCallable listFinding @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/stub/WebSecurityScannerStubSettings.java b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/stub/WebSecurityScannerStubSettings.java index 05542cc1..7caf02c4 100644 --- a/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/stub/WebSecurityScannerStubSettings.java +++ b/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1beta/stub/WebSecurityScannerStubSettings.java @@ -746,14 +746,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClientTest.java b/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClientTest.java index 9174aa28..4c7fdd5b 100644 --- a/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClientTest.java +++ b/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClientTest.java @@ -588,8 +588,7 @@ public void listCrawledUrlsExceptionTest() throws Exception { public void getFindingTest() throws Exception { Finding expectedResponse = Finding.newBuilder() - .setName( - FindingName.of("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]").toString()) + .setName("name3373707") .setFindingType("findingType1116910179") .setHttpMethod("httpMethod751124361") .setFuzzedUrl("fuzzedUrl-1730986655") diff --git a/grpc-google-cloud-websecurityscanner-v1/pom.xml b/grpc-google-cloud-websecurityscanner-v1/pom.xml index 49674a49..abcb7e58 100644 --- a/grpc-google-cloud-websecurityscanner-v1/pom.xml +++ b/grpc-google-cloud-websecurityscanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1 - 1.2.2 + 2.0.0 grpc-google-cloud-websecurityscanner-v1 GRPC library for grpc-google-cloud-websecurityscanner-v1 com.google.cloud google-cloud-websecurityscanner-parent - 1.2.2 + 2.0.0 diff --git a/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml index 1a577d33..db8d4ca6 100644 --- a/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml +++ b/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.86.2 + 0.87.0 grpc-google-cloud-websecurityscanner-v1alpha GRPC library for grpc-google-cloud-websecurityscanner-v1alpha com.google.cloud google-cloud-websecurityscanner-parent - 1.2.2 + 2.0.0 diff --git a/grpc-google-cloud-websecurityscanner-v1beta/pom.xml b/grpc-google-cloud-websecurityscanner-v1beta/pom.xml index 33eee055..5cbf58c6 100644 --- a/grpc-google-cloud-websecurityscanner-v1beta/pom.xml +++ b/grpc-google-cloud-websecurityscanner-v1beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.86.2 + 0.87.0 grpc-google-cloud-websecurityscanner-v1beta GRPC library for grpc-google-cloud-websecurityscanner-v1beta com.google.cloud google-cloud-websecurityscanner-parent - 1.2.2 + 2.0.0 diff --git a/java.header b/java.header index 3a9b503a..d0970ba7 100644 --- a/java.header +++ b/java.header @@ -1,5 +1,5 @@ ^/\*$ -^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|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/pom.xml b/pom.xml index e234f741..e696af71 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-websecurityscanner-parent pom - 1.2.2 + 2.0.0 Google Cloud Web Security Scanner Parent https://github.com/googleapis/java-websecurityscanner @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 @@ -41,16 +41,7 @@ https://github.com/googleapis/java-websecurityscanner/issues GitHub Issues - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + Apache-2.0 @@ -70,43 +61,43 @@ com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.86.2 + 0.87.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.86.2 + 0.87.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1 - 1.2.2 + 2.0.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.86.2 + 0.87.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.86.2 + 0.87.0 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1 - 1.2.2 + 2.0.0 com.google.cloud google-cloud-websecurityscanner - 1.2.2 + 2.0.0 com.google.cloud google-cloud-shared-dependencies - 1.4.0 + 2.0.0 pom import diff --git a/proto-google-cloud-websecurityscanner-v1/clirr-ignored-differences.xml b/proto-google-cloud-websecurityscanner-v1/clirr-ignored-differences.xml new file mode 100644 index 00000000..88b790e3 --- /dev/null +++ b/proto-google-cloud-websecurityscanner-v1/clirr-ignored-differences.xml @@ -0,0 +1,12 @@ + + + + + 8001 + com/google/cloud/websecurityscanner/v1/FindingName + + + 8001 + com/google/cloud/websecurityscanner/v1/FindingName$Builder + + diff --git a/proto-google-cloud-websecurityscanner-v1/pom.xml b/proto-google-cloud-websecurityscanner-v1/pom.xml index 87b03132..19716ad0 100644 --- a/proto-google-cloud-websecurityscanner-v1/pom.xml +++ b/proto-google-cloud-websecurityscanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1 - 1.2.2 + 2.0.0 proto-google-cloud-websecurityscanner-v1 PROTO library for proto-google-cloud-websecurityscanner-v1 com.google.cloud google-cloud-websecurityscanner-parent - 1.2.2 + 2.0.0 @@ -21,14 +21,6 @@ com.google.api.grpc proto-google-common-protos - - com.google.api - api-common - - - com.google.guava - guava - diff --git a/proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/FindingName.java b/proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/FindingName.java deleted file mode 100644 index 2ddb7272..00000000 --- a/proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/FindingName.java +++ /dev/null @@ -1,260 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.websecurityscanner.v1; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class FindingName implements ResourceName { - private static final PathTemplate PROJECT_SCAN_CONFIG_SCAN_RUN_FINDING = - PathTemplate.createWithoutUrlEncoding( - "projects/{project}/scanConfigs/{scan_config}/scanRuns/{scan_run}/findings/{finding}"); - private volatile Map fieldValuesMap; - private final String project; - private final String scanConfig; - private final String scanRun; - private final String finding; - - @Deprecated - protected FindingName() { - project = null; - scanConfig = null; - scanRun = null; - finding = null; - } - - private FindingName(Builder builder) { - project = Preconditions.checkNotNull(builder.getProject()); - scanConfig = Preconditions.checkNotNull(builder.getScanConfig()); - scanRun = Preconditions.checkNotNull(builder.getScanRun()); - finding = Preconditions.checkNotNull(builder.getFinding()); - } - - public String getProject() { - return project; - } - - public String getScanConfig() { - return scanConfig; - } - - public String getScanRun() { - return scanRun; - } - - public String getFinding() { - return finding; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static FindingName of(String project, String scanConfig, String scanRun, String finding) { - return newBuilder() - .setProject(project) - .setScanConfig(scanConfig) - .setScanRun(scanRun) - .setFinding(finding) - .build(); - } - - public static String format(String project, String scanConfig, String scanRun, String finding) { - return newBuilder() - .setProject(project) - .setScanConfig(scanConfig) - .setScanRun(scanRun) - .setFinding(finding) - .build() - .toString(); - } - - public static FindingName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - PROJECT_SCAN_CONFIG_SCAN_RUN_FINDING.validatedMatch( - formattedString, "FindingName.parse: formattedString not in valid format"); - return of( - matchMap.get("project"), - matchMap.get("scan_config"), - matchMap.get("scan_run"), - matchMap.get("finding")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (FindingName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return PROJECT_SCAN_CONFIG_SCAN_RUN_FINDING.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (project != null) { - fieldMapBuilder.put("project", project); - } - if (scanConfig != null) { - fieldMapBuilder.put("scan_config", scanConfig); - } - if (scanRun != null) { - fieldMapBuilder.put("scan_run", scanRun); - } - if (finding != null) { - fieldMapBuilder.put("finding", finding); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return PROJECT_SCAN_CONFIG_SCAN_RUN_FINDING.instantiate( - "project", project, "scan_config", scanConfig, "scan_run", scanRun, "finding", finding); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - FindingName that = ((FindingName) o); - return Objects.equals(this.project, that.project) - && Objects.equals(this.scanConfig, that.scanConfig) - && Objects.equals(this.scanRun, that.scanRun) - && Objects.equals(this.finding, that.finding); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(project); - h *= 1000003; - h ^= Objects.hashCode(scanConfig); - h *= 1000003; - h ^= Objects.hashCode(scanRun); - h *= 1000003; - h ^= Objects.hashCode(finding); - return h; - } - - /** - * Builder for - * projects/{project}/scanConfigs/{scan_config}/scanRuns/{scan_run}/findings/{finding}. - */ - public static class Builder { - private String project; - private String scanConfig; - private String scanRun; - private String finding; - - protected Builder() {} - - public String getProject() { - return project; - } - - public String getScanConfig() { - return scanConfig; - } - - public String getScanRun() { - return scanRun; - } - - public String getFinding() { - return finding; - } - - public Builder setProject(String project) { - this.project = project; - return this; - } - - public Builder setScanConfig(String scanConfig) { - this.scanConfig = scanConfig; - return this; - } - - public Builder setScanRun(String scanRun) { - this.scanRun = scanRun; - return this; - } - - public Builder setFinding(String finding) { - this.finding = finding; - return this; - } - - private Builder(FindingName findingName) { - this.project = findingName.project; - this.scanConfig = findingName.scanConfig; - this.scanRun = findingName.scanRun; - this.finding = findingName.finding; - } - - public FindingName build() { - return new FindingName(this); - } - } -} diff --git a/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/proto-google-cloud-websecurityscanner-v1alpha/pom.xml index c5ba9a2d..e85a3efb 100644 --- a/proto-google-cloud-websecurityscanner-v1alpha/pom.xml +++ b/proto-google-cloud-websecurityscanner-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.86.2 + 0.87.0 proto-google-cloud-websecurityscanner-v1alpha PROTO library for proto-google-cloud-websecurityscanner-v1alpha com.google.cloud google-cloud-websecurityscanner-parent - 1.2.2 + 2.0.0 diff --git a/proto-google-cloud-websecurityscanner-v1beta/pom.xml b/proto-google-cloud-websecurityscanner-v1beta/pom.xml index 5121ba0b..af1f4fa6 100644 --- a/proto-google-cloud-websecurityscanner-v1beta/pom.xml +++ b/proto-google-cloud-websecurityscanner-v1beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.86.2 + 0.87.0 proto-google-cloud-websecurityscanner-v1beta PROTO library for proto-google-cloud-websecurityscanner-v1beta com.google.cloud google-cloud-websecurityscanner-parent - 1.2.2 + 2.0.0 diff --git a/renovate.json b/renovate.json index 3bb92a0b..cb20cd00 100644 --- a/renovate.json +++ b/renovate.json @@ -69,5 +69,8 @@ } ], "semanticCommits": true, - "masterIssue": true + "dependencyDashboard": true, + "dependencyDashboardLabels": [ + "type: process" + ] } diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 018ac1a7..d0cf7d42 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-websecurityscanner - 1.2.1 + 1.2.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d3a04015..77ed483d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-websecurityscanner - 1.2.1 + 1.2.2 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index a9250c7b..39854d42 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.7.0 + 20.9.0 pom import diff --git a/synth.metadata b/synth.metadata index 4a85e031..3a1061b8 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,38 +4,38 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-websecurityscanner.git", - "sha": "896281f158c7498fd05f20b18e28d4d356a2bcca" + "sha": "1b20d866b4276627eeb8a3ea63ae7f8d19a73e8a" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "1a2878d6909dd10ca4e3c1b5943d6622e996054e" } } ], @@ -135,6 +135,7 @@ "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", + "SECURITY.md", "codecov.yaml", "google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerClient.java", "google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1/WebSecurityScannerSettings.java", @@ -183,7 +184,6 @@ "proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/DeleteScanConfigRequestOrBuilder.java", "proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/Finding.java", "proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/FindingAddonProto.java", - "proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/FindingName.java", "proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/FindingOrBuilder.java", "proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/FindingProto.java", "proto-google-cloud-websecurityscanner-v1/src/main/java/com/google/cloud/websecurityscanner/v1/FindingTypeStats.java", diff --git a/versions.txt b/versions.txt index c97de28b..d26190a6 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-websecurityscanner-v1alpha:0.86.2:0.86.2 -proto-google-cloud-websecurityscanner-v1beta:0.86.2:0.86.2 -proto-google-cloud-websecurityscanner-v1:1.2.2:1.2.2 -grpc-google-cloud-websecurityscanner-v1alpha:0.86.2:0.86.2 -grpc-google-cloud-websecurityscanner-v1beta:0.86.2:0.86.2 -grpc-google-cloud-websecurityscanner-v1:1.2.2:1.2.2 -google-cloud-websecurityscanner:1.2.2:1.2.2 \ No newline at end of file +proto-google-cloud-websecurityscanner-v1alpha:0.87.0:0.87.0 +proto-google-cloud-websecurityscanner-v1beta:0.87.0:0.87.0 +proto-google-cloud-websecurityscanner-v1:2.0.0:2.0.0 +grpc-google-cloud-websecurityscanner-v1alpha:0.87.0:0.87.0 +grpc-google-cloud-websecurityscanner-v1beta:0.87.0:0.87.0 +grpc-google-cloud-websecurityscanner-v1:2.0.0:2.0.0 +google-cloud-websecurityscanner:2.0.0:2.0.0 \ No newline at end of file