diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0bd0ee06..7e191f97 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1 +1,7 @@ -Fixes # (it's a good idea to open an issue first for context and/or discussion) \ No newline at end of file +Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: +- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-websecurityscanner/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea +- [ ] Ensure the tests and linter pass +- [ ] Code coverage does not decrease (if any source code was changed) +- [ ] Appropriate docs were updated (if necessary) + +Fixes # ☕️ diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml new file mode 100644 index 00000000..f247d5c7 --- /dev/null +++ b/.github/trusted-contribution.yml @@ -0,0 +1,2 @@ +trustedContributors: +- renovate-bot \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f1ae5840..fe29c43a 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -20,36 +20,45 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) ## cd to the parent directory, i.e. the root of the git repo cd ${scriptDir}/.. +# include common functions +source ${scriptDir}/common.sh + # Print out Java version java -version echo ${JOB_TYPE} -mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true \ - -T 1C +# attempt to install 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true \ + -T 1C # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS}) fi +RETURN_CODE=0 +set +e + case ${JOB_TYPE} in test) mvn test -B -Dclirr.skip=true -Denforcer.skip=true - bash ${KOKORO_GFILE_DIR}/codecov.sh - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; lint) mvn \ -Penable-samples \ com.coveo:fmt-maven-plugin:check + RETURN_CODE=$? ;; javadoc) mvn javadoc:javadoc javadoc:test-javadoc + RETURN_CODE=$? ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ @@ -59,21 +68,46 @@ integration) -Denforcer.skip=true \ -fae \ verify - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; samples) - mvn -B \ - -Penable-samples \ - -DtrimStackTrace=false \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -fae \ - verify - bash .kokoro/coerce_logs.sh + if [[ -f samples/pom.xml ]] + then + pushd samples + mvn -B \ + -Penable-samples \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + RETURN_CODE=$? + popd + else + echo "no sample pom.xml found - skipping sample tests" + fi ;; clirr) mvn -B -Denforcer.skip=true clirr:check + RETURN_CODE=$? ;; *) ;; esac + +if [ "${REPORT_COVERAGE}" == "true" ] +then + bash ${KOKORO_GFILE_DIR}/codecov.sh +fi + +# fix output location of logs +bash .kokoro/coerce_logs.sh + +if [[ "${ENABLE_BUILD_COP}" == "true" ]] +then + chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop + ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-websecurityscanner +fi + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} diff --git a/.kokoro/common.sh b/.kokoro/common.sh new file mode 100644 index 00000000..a3bbc5f6 --- /dev/null +++ b/.kokoro/common.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# 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. + +# set -eo pipefail + +function retry_with_backoff { + attempts_left=$1 + sleep_seconds=$2 + shift 2 + command=$@ + + echo "${command}" + ${command} + exit_code=$? + + if [[ $exit_code == 0 ]] + then + return 0 + fi + + # failure + if [[ ${attempts_left} > 0 ]] + then + echo "failure (${exit_code}), sleeping ${sleep_seconds}..." + sleep ${sleep_seconds} + new_attempts=$((${attempts_left} - 1)) + new_sleep=$((${sleep_seconds} * 2)) + retry_with_backoff ${new_attempts} ${new_sleep} ${command} + fi + + return $exit_code +} diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg index 3b017fc8..495cc7ba 100644 --- a/.kokoro/continuous/java8.cfg +++ b/.kokoro/continuous/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 932cfb34..0aade871 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -15,7 +15,13 @@ set -eo pipefail -cd github/java-websecurityscanner/ +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# include common functions +source ${scriptDir}/common.sh # Print out Java java -version @@ -24,8 +30,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # this should run maven enforcer -mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true +retry_with_backoff 3 10 \ + mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh index cc3fe810..759ab4e2 100755 --- a/.kokoro/linkage-monitor.sh +++ b/.kokoro/linkage-monitor.sh @@ -17,18 +17,26 @@ set -eo pipefail # Display commands being run. set -x -cd github/java-websecurityscanner/ +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# include common functions +source ${scriptDir}/common.sh # Print out Java version java -version echo ${JOB_TYPE} -mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true +# attempt to install 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR JAR=linkage-monitor-latest-all-deps.jar diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 3b017fc8..8bf59c02 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -5,3 +5,17 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/nightly/java8.cfg b/.kokoro/nightly/java8.cfg index 3b017fc8..495cc7ba 100644 --- a/.kokoro/nightly/java8.cfg +++ b/.kokoro/nightly/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index 9a910249..b4b051cd 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -2,23 +2,28 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" } env_vars: { - key: "JOB_TYPE" - value: "samples" + key: "JOB_TYPE" + value: "samples" } env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "gcloud-devel" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" } before_action { diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg index 3b017fc8..495cc7ba 100644 --- a/.kokoro/presubmit/java8.cfg +++ b/.kokoro/presubmit/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a351a84..70dd4bd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +### [0.116.3](https://www.github.com/googleapis/java-websecurityscanner/compare/v0.116.2...v0.116.3) (2020-04-06) + + +### Dependencies + +* update core dependencies ([#73](https://www.github.com/googleapis/java-websecurityscanner/issues/73)) ([553bb82](https://www.github.com/googleapis/java-websecurityscanner/commit/553bb82db048ba7d0dbf64265ea8ebf96862b79b)) +* update core dependencies to v1.54.0 ([#70](https://www.github.com/googleapis/java-websecurityscanner/issues/70)) ([30970d8](https://www.github.com/googleapis/java-websecurityscanner/commit/30970d8ded7daf9206196f1ff18b5772d5f4ce5b)) +* update dependency com.google.api:api-common to v1.9.0 ([#90](https://www.github.com/googleapis/java-websecurityscanner/issues/90)) ([64b753a](https://www.github.com/googleapis/java-websecurityscanner/commit/64b753ae1694632be3734f78170c130386266593)) +* update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#89](https://www.github.com/googleapis/java-websecurityscanner/issues/89)) ([9836ad7](https://www.github.com/googleapis/java-websecurityscanner/commit/9836ad7092f2d068fef4222cd5467905eb3a3dbf)) +* update dependency com.google.protobuf:protobuf-java to v3.11.4 ([a46c3a6](https://www.github.com/googleapis/java-websecurityscanner/commit/a46c3a62d98b4a6d17932e36c16757c2918a91e0)) +* update dependency io.grpc:grpc-bom to v1.27.1 ([b6cba28](https://www.github.com/googleapis/java-websecurityscanner/commit/b6cba28f5ed9f047e7b0845a89e2420107d104e4)) +* update dependency io.grpc:grpc-bom to v1.27.2 ([a36651f](https://www.github.com/googleapis/java-websecurityscanner/commit/a36651fbf72861134ccc6b661c035f0314f782c1)) +* update dependency org.threeten:threetenbp to v1.4.3 ([#83](https://www.github.com/googleapis/java-websecurityscanner/issues/83)) ([6d35df9](https://www.github.com/googleapis/java-websecurityscanner/commit/6d35df9eacf874c82b6e765e299c79664bb54eb5)) +* update google-core ([#72](https://www.github.com/googleapis/java-websecurityscanner/issues/72)) ([7c3b17f](https://www.github.com/googleapis/java-websecurityscanner/commit/7c3b17fb1fcbec7b9e664fd94269543febd47165)) + + +### Documentation + +* **regen:** update sample code to set total timeout, add API client header test ([8a15cf6](https://www.github.com/googleapis/java-websecurityscanner/commit/8a15cf639e2cd5e051e772d269828dc6eed043d0)) + ### [0.116.2](https://www.github.com/googleapis/java-websecurityscanner/compare/v0.116.1...v0.116.2) (2020-02-04) diff --git a/README.md b/README.md index 9b9e16dd..a7fdf64b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 3.5.0 + 4.4.0 pom import @@ -32,7 +32,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud google-cloud-websecurityscanner - + ``` [//]: # ({x-version-update-start:google-cloud-websecurityscanner:released}) @@ -43,17 +43,18 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-websecurityscanner - 0.116.2 + 0.116.3 + ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-websecurityscanner:0.116.2' +compile 'com.google.cloud:google-cloud-websecurityscanner:0.116.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "0.116.2" +libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "0.116.3" ``` [//]: # ({x-version-update-end}) @@ -87,6 +88,8 @@ use this Cloud Security Scanner Client Library. + + ## Troubleshooting To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting]. @@ -158,4 +161,5 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] [license]: https://github.com/googleapis/java-websecurityscanner/blob/master/LICENSE [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 \ No newline at end of file +[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 diff --git a/google-cloud-websecurityscanner-bom/pom.xml b/google-cloud-websecurityscanner-bom/pom.xml index 6ee14120..99383c8d 100644 --- a/google-cloud-websecurityscanner-bom/pom.xml +++ b/google-cloud-websecurityscanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-websecurityscanner-bom - 0.116.2 + 0.116.3 pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.81.2 + 0.81.3 com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.81.2 + 0.81.3 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.81.2 + 0.81.3 com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.81.2 + 0.81.3 com.google.cloud google-cloud-websecurityscanner - 0.116.2 + 0.116.3 diff --git a/google-cloud-websecurityscanner/pom.xml b/google-cloud-websecurityscanner/pom.xml index 38508cf3..d60d1d7e 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 - 0.116.2 + 0.116.3 jar Google Cloud Web Security Scanner https://github.com/googleapis/java-websecurityscanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-websecurityscanner-parent - 0.116.2 + 0.116.3 google-cloud-websecurityscanner 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 cff13430..417e237a 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 @@ -59,8 +59,12 @@ * * WebSecurityScannerSettings.Builder webSecurityScannerSettingsBuilder = * WebSecurityScannerSettings.newBuilder(); - * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * webSecurityScannerSettingsBuilder + * .createScanConfigSettings() + * .setRetrySettings( + * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * WebSecurityScannerSettings webSecurityScannerSettings = webSecurityScannerSettingsBuilder.build(); * * 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 173ba13b..76096135 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 @@ -96,8 +96,12 @@ * * WebSecurityScannerStubSettings.Builder webSecurityScannerSettingsBuilder = * WebSecurityScannerStubSettings.newBuilder(); - * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * webSecurityScannerSettingsBuilder + * .createScanConfigSettings() + * .setRetrySettings( + * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * WebSecurityScannerStubSettings webSecurityScannerSettings = webSecurityScannerSettingsBuilder.build(); * * 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 a7e96df8..88829e39 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 @@ -59,8 +59,12 @@ * * WebSecurityScannerSettings.Builder webSecurityScannerSettingsBuilder = * WebSecurityScannerSettings.newBuilder(); - * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * webSecurityScannerSettingsBuilder + * .createScanConfigSettings() + * .setRetrySettings( + * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * WebSecurityScannerSettings webSecurityScannerSettings = webSecurityScannerSettingsBuilder.build(); * * 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 95eb1ca1..0275457f 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 @@ -96,8 +96,12 @@ * * WebSecurityScannerStubSettings.Builder webSecurityScannerSettingsBuilder = * WebSecurityScannerStubSettings.newBuilder(); - * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * webSecurityScannerSettingsBuilder + * .createScanConfigSettings() + * .setRetrySettings( + * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * WebSecurityScannerStubSettings webSecurityScannerSettings = webSecurityScannerSettingsBuilder.build(); * * diff --git a/grpc-google-cloud-websecurityscanner-v1alpha/clirr-ignored-differences.xml b/grpc-google-cloud-websecurityscanner-v1alpha/clirr-ignored-differences.xml new file mode 100644 index 00000000..4fe7b1ab --- /dev/null +++ b/grpc-google-cloud-websecurityscanner-v1alpha/clirr-ignored-differences.xml @@ -0,0 +1,10 @@ + + + + + + 6001 + com/google/cloud/websecurityscanner/v1alpha/*Grpc + METHOD_* + + diff --git a/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml index 09994e51..4d754adc 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.81.2 + 0.81.3 grpc-google-cloud-websecurityscanner-v1alpha GRPC library for grpc-google-cloud-websecurityscanner-v1alpha com.google.cloud google-cloud-websecurityscanner-parent - 0.116.2 + 0.116.3 diff --git a/grpc-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerGrpc.java b/grpc-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerGrpc.java index 446380f5..63518ebd 100644 --- a/grpc-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerGrpc.java +++ b/grpc-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerGrpc.java @@ -32,7 +32,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.10.0)", + value = "by gRPC proto compiler", comments = "Source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto") public final class WebSecurityScannerGrpc { @@ -42,30 +42,20 @@ private WebSecurityScannerGrpc() {} "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner"; // Static method descriptors that strictly reflect the proto. - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getCreateScanConfigMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanConfig> - METHOD_CREATE_SCAN_CONFIG = getCreateScanConfigMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig> getCreateScanConfigMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "CreateScanConfig", + requestType = com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig> getCreateScanConfigMethod() { - return getCreateScanConfigMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanConfig> - getCreateScanConfigMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig> @@ -81,10 +71,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ScanConfig> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "CreateScanConfig")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateScanConfig")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -103,30 +90,20 @@ private WebSecurityScannerGrpc() {} return getCreateScanConfigMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getDeleteScanConfigMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest, - com.google.protobuf.Empty> - METHOD_DELETE_SCAN_CONFIG = getDeleteScanConfigMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest, com.google.protobuf.Empty> getDeleteScanConfigMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "DeleteScanConfig", + requestType = com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.class, + responseType = com.google.protobuf.Empty.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest, com.google.protobuf.Empty> getDeleteScanConfigMethod() { - return getDeleteScanConfigMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest, - com.google.protobuf.Empty> - getDeleteScanConfigMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest, com.google.protobuf.Empty> @@ -142,10 +119,7 @@ private WebSecurityScannerGrpc() {} com.google.protobuf.Empty> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "DeleteScanConfig")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteScanConfig")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -163,30 +137,20 @@ private WebSecurityScannerGrpc() {} return getDeleteScanConfigMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getGetScanConfigMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanConfig> - METHOD_GET_SCAN_CONFIG = getGetScanConfigMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig> getGetScanConfigMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetScanConfig", + requestType = com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig> getGetScanConfigMethod() { - return getGetScanConfigMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanConfig> - getGetScanConfigMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig> @@ -201,10 +165,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ScanConfig> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "GetScanConfig")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetScanConfig")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -223,30 +184,20 @@ private WebSecurityScannerGrpc() {} return getGetScanConfigMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListScanConfigsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse> - METHOD_LIST_SCAN_CONFIGS = getListScanConfigsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest, com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse> getListScanConfigsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListScanConfigs", + requestType = com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest, com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse> getListScanConfigsMethod() { - return getListScanConfigsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse> - getListScanConfigsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest, com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse> @@ -261,10 +212,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "ListScanConfigs")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListScanConfigs")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -283,30 +231,20 @@ private WebSecurityScannerGrpc() {} return getListScanConfigsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getUpdateScanConfigMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanConfig> - METHOD_UPDATE_SCAN_CONFIG = getUpdateScanConfigMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig> getUpdateScanConfigMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "UpdateScanConfig", + requestType = com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig> getUpdateScanConfigMethod() { - return getUpdateScanConfigMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanConfig> - getUpdateScanConfigMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig> @@ -322,10 +260,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ScanConfig> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "UpdateScanConfig")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UpdateScanConfig")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -344,30 +279,20 @@ private WebSecurityScannerGrpc() {} return getUpdateScanConfigMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getStartScanRunMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanRun> - METHOD_START_SCAN_RUN = getStartScanRunMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun> getStartScanRunMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "StartScanRun", + requestType = com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ScanRun.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun> getStartScanRunMethod() { - return getStartScanRunMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanRun> - getStartScanRunMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun> @@ -382,10 +307,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ScanRun> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "StartScanRun")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StartScanRun")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -404,30 +326,20 @@ private WebSecurityScannerGrpc() {} return getStartScanRunMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getGetScanRunMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanRun> - METHOD_GET_SCAN_RUN = getGetScanRunMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun> getGetScanRunMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetScanRun", + requestType = com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ScanRun.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun> getGetScanRunMethod() { - return getGetScanRunMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanRun> - getGetScanRunMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun> @@ -442,10 +354,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ScanRun> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "GetScanRun")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetScanRun")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -464,30 +373,20 @@ private WebSecurityScannerGrpc() {} return getGetScanRunMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListScanRunsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse> - METHOD_LIST_SCAN_RUNS = getListScanRunsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest, com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse> getListScanRunsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListScanRuns", + requestType = com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest, com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse> getListScanRunsMethod() { - return getListScanRunsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse> - getListScanRunsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest, com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse> @@ -502,10 +401,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "ListScanRuns")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListScanRuns")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -524,30 +420,20 @@ private WebSecurityScannerGrpc() {} return getListScanRunsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getStopScanRunMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanRun> - METHOD_STOP_SCAN_RUN = getStopScanRunMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun> getStopScanRunMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "StopScanRun", + requestType = com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ScanRun.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun> getStopScanRunMethod() { - return getStopScanRunMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest, - com.google.cloud.websecurityscanner.v1alpha.ScanRun> - getStopScanRunMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun> @@ -562,10 +448,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ScanRun> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "StopScanRun")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StopScanRun")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -584,30 +467,20 @@ private WebSecurityScannerGrpc() {} return getStopScanRunMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListCrawledUrlsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse> - METHOD_LIST_CRAWLED_URLS = getListCrawledUrlsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest, com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse> getListCrawledUrlsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListCrawledUrls", + requestType = com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest, com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse> getListCrawledUrlsMethod() { - return getListCrawledUrlsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse> - getListCrawledUrlsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest, com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse> @@ -622,10 +495,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "ListCrawledUrls")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListCrawledUrls")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -644,30 +514,20 @@ private WebSecurityScannerGrpc() {} return getListCrawledUrlsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getGetFindingMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest, - com.google.cloud.websecurityscanner.v1alpha.Finding> - METHOD_GET_FINDING = getGetFindingMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest, com.google.cloud.websecurityscanner.v1alpha.Finding> getGetFindingMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetFinding", + requestType = com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.Finding.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest, com.google.cloud.websecurityscanner.v1alpha.Finding> getGetFindingMethod() { - return getGetFindingMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest, - com.google.cloud.websecurityscanner.v1alpha.Finding> - getGetFindingMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest, com.google.cloud.websecurityscanner.v1alpha.Finding> @@ -682,10 +542,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.Finding> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "GetFinding")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetFinding")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -704,30 +561,20 @@ private WebSecurityScannerGrpc() {} return getGetFindingMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListFindingsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse> - METHOD_LIST_FINDINGS = getListFindingsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest, com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse> getListFindingsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListFindings", + requestType = com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest, com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse> getListFindingsMethod() { - return getListFindingsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse> - getListFindingsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest, com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse> @@ -742,10 +589,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "ListFindings")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListFindings")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -764,30 +608,20 @@ private WebSecurityScannerGrpc() {} return getListFindingsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListFindingTypeStatsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse> - METHOD_LIST_FINDING_TYPE_STATS = getListFindingTypeStatsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest, com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse> getListFindingTypeStatsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListFindingTypeStats", + requestType = com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest, com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse> getListFindingTypeStatsMethod() { - return getListFindingTypeStatsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest, - com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse> - getListFindingTypeStatsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest, com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse> @@ -805,9 +639,7 @@ private WebSecurityScannerGrpc() {} newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", - "ListFindingTypeStats")) + generateFullMethodName(SERVICE_NAME, "ListFindingTypeStats")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -828,19 +660,43 @@ private WebSecurityScannerGrpc() {} /** Creates a new async stub that supports all call types for the service */ public static WebSecurityScannerStub newStub(io.grpc.Channel channel) { - return new WebSecurityScannerStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public WebSecurityScannerStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new WebSecurityScannerStub(channel, callOptions); + } + }; + return WebSecurityScannerStub.newStub(factory, channel); } /** * Creates a new blocking-style stub that supports unary and streaming output calls on the service */ public static WebSecurityScannerBlockingStub newBlockingStub(io.grpc.Channel channel) { - return new WebSecurityScannerBlockingStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public WebSecurityScannerBlockingStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new WebSecurityScannerBlockingStub(channel, callOptions); + } + }; + return WebSecurityScannerBlockingStub.newStub(factory, channel); } /** Creates a new ListenableFuture-style stub that supports unary calls on the service */ public static WebSecurityScannerFutureStub newFutureStub(io.grpc.Channel channel) { - return new WebSecurityScannerFutureStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public WebSecurityScannerFutureStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new WebSecurityScannerFutureStub(channel, callOptions); + } + }; + return WebSecurityScannerFutureStub.newStub(factory, channel); } /** @@ -865,7 +721,7 @@ public void createScanConfig( com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getCreateScanConfigMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getCreateScanConfigMethod(), responseObserver); } /** @@ -878,7 +734,7 @@ public void createScanConfig( public void deleteScanConfig( com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getDeleteScanConfigMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getDeleteScanConfigMethod(), responseObserver); } /** @@ -892,7 +748,7 @@ public void getScanConfig( com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getGetScanConfigMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getGetScanConfigMethod(), responseObserver); } /** @@ -907,7 +763,7 @@ public void listScanConfigs( io.grpc.stub.StreamObserver< com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListScanConfigsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListScanConfigsMethod(), responseObserver); } /** @@ -921,7 +777,7 @@ public void updateScanConfig( com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getUpdateScanConfigMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getUpdateScanConfigMethod(), responseObserver); } /** @@ -935,7 +791,7 @@ public void startScanRun( com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getStartScanRunMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getStartScanRunMethod(), responseObserver); } /** @@ -949,7 +805,7 @@ public void getScanRun( com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getGetScanRunMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getGetScanRunMethod(), responseObserver); } /** @@ -965,7 +821,7 @@ public void listScanRuns( io.grpc.stub.StreamObserver< com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListScanRunsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListScanRunsMethod(), responseObserver); } /** @@ -979,7 +835,7 @@ public void stopScanRun( com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getStopScanRunMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getStopScanRunMethod(), responseObserver); } /** @@ -994,7 +850,7 @@ public void listCrawledUrls( io.grpc.stub.StreamObserver< com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListCrawledUrlsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListCrawledUrlsMethod(), responseObserver); } /** @@ -1008,7 +864,7 @@ public void getFinding( com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getGetFindingMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getGetFindingMethod(), responseObserver); } /** @@ -1023,7 +879,7 @@ public void listFindings( io.grpc.stub.StreamObserver< com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListFindingsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListFindingsMethod(), responseObserver); } /** @@ -1038,97 +894,97 @@ public void listFindingTypeStats( io.grpc.stub.StreamObserver< com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListFindingTypeStatsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListFindingTypeStatsMethod(), responseObserver); } @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( - getCreateScanConfigMethodHelper(), + getCreateScanConfigMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig>( this, METHODID_CREATE_SCAN_CONFIG))) .addMethod( - getDeleteScanConfigMethodHelper(), + getDeleteScanConfigMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest, com.google.protobuf.Empty>(this, METHODID_DELETE_SCAN_CONFIG))) .addMethod( - getGetScanConfigMethodHelper(), + getGetScanConfigMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig>( this, METHODID_GET_SCAN_CONFIG))) .addMethod( - getListScanConfigsMethodHelper(), + getListScanConfigsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest, com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse>( this, METHODID_LIST_SCAN_CONFIGS))) .addMethod( - getUpdateScanConfigMethodHelper(), + getUpdateScanConfigMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest, com.google.cloud.websecurityscanner.v1alpha.ScanConfig>( this, METHODID_UPDATE_SCAN_CONFIG))) .addMethod( - getStartScanRunMethodHelper(), + getStartScanRunMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun>( this, METHODID_START_SCAN_RUN))) .addMethod( - getGetScanRunMethodHelper(), + getGetScanRunMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun>( this, METHODID_GET_SCAN_RUN))) .addMethod( - getListScanRunsMethodHelper(), + getListScanRunsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest, com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse>( this, METHODID_LIST_SCAN_RUNS))) .addMethod( - getStopScanRunMethodHelper(), + getStopScanRunMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest, com.google.cloud.websecurityscanner.v1alpha.ScanRun>( this, METHODID_STOP_SCAN_RUN))) .addMethod( - getListCrawledUrlsMethodHelper(), + getListCrawledUrlsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest, com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse>( this, METHODID_LIST_CRAWLED_URLS))) .addMethod( - getGetFindingMethodHelper(), + getGetFindingMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest, com.google.cloud.websecurityscanner.v1alpha.Finding>( this, METHODID_GET_FINDING))) .addMethod( - getListFindingsMethodHelper(), + getListFindingsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest, com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse>( this, METHODID_LIST_FINDINGS))) .addMethod( - getListFindingTypeStatsMethodHelper(), + getListFindingTypeStatsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest, @@ -1148,11 +1004,7 @@ public final io.grpc.ServerServiceDefinition bindService() { * */ public static final class WebSecurityScannerStub - extends io.grpc.stub.AbstractStub { - private WebSecurityScannerStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractAsyncStub { private WebSecurityScannerStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); } @@ -1175,7 +1027,7 @@ public void createScanConfig( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getCreateScanConfigMethodHelper(), getCallOptions()), + getChannel().newCall(getCreateScanConfigMethod(), getCallOptions()), request, responseObserver); } @@ -1191,7 +1043,7 @@ public void deleteScanConfig( com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getDeleteScanConfigMethodHelper(), getCallOptions()), + getChannel().newCall(getDeleteScanConfigMethod(), getCallOptions()), request, responseObserver); } @@ -1208,7 +1060,7 @@ public void getScanConfig( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getGetScanConfigMethodHelper(), getCallOptions()), + getChannel().newCall(getGetScanConfigMethod(), getCallOptions()), request, responseObserver); } @@ -1226,7 +1078,7 @@ public void listScanConfigs( com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListScanConfigsMethodHelper(), getCallOptions()), + getChannel().newCall(getListScanConfigsMethod(), getCallOptions()), request, responseObserver); } @@ -1243,7 +1095,7 @@ public void updateScanConfig( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getUpdateScanConfigMethodHelper(), getCallOptions()), + getChannel().newCall(getUpdateScanConfigMethod(), getCallOptions()), request, responseObserver); } @@ -1260,7 +1112,7 @@ public void startScanRun( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getStartScanRunMethodHelper(), getCallOptions()), + getChannel().newCall(getStartScanRunMethod(), getCallOptions()), request, responseObserver); } @@ -1277,9 +1129,7 @@ public void getScanRun( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getGetScanRunMethodHelper(), getCallOptions()), - request, - responseObserver); + getChannel().newCall(getGetScanRunMethod(), getCallOptions()), request, responseObserver); } /** @@ -1296,7 +1146,7 @@ public void listScanRuns( com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListScanRunsMethodHelper(), getCallOptions()), + getChannel().newCall(getListScanRunsMethod(), getCallOptions()), request, responseObserver); } @@ -1313,7 +1163,7 @@ public void stopScanRun( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getStopScanRunMethodHelper(), getCallOptions()), + getChannel().newCall(getStopScanRunMethod(), getCallOptions()), request, responseObserver); } @@ -1331,7 +1181,7 @@ public void listCrawledUrls( com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListCrawledUrlsMethodHelper(), getCallOptions()), + getChannel().newCall(getListCrawledUrlsMethod(), getCallOptions()), request, responseObserver); } @@ -1348,9 +1198,7 @@ public void getFinding( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getGetFindingMethodHelper(), getCallOptions()), - request, - responseObserver); + getChannel().newCall(getGetFindingMethod(), getCallOptions()), request, responseObserver); } /** @@ -1366,7 +1214,7 @@ public void listFindings( com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListFindingsMethodHelper(), getCallOptions()), + getChannel().newCall(getListFindingsMethod(), getCallOptions()), request, responseObserver); } @@ -1384,7 +1232,7 @@ public void listFindingTypeStats( com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListFindingTypeStatsMethodHelper(), getCallOptions()), + getChannel().newCall(getListFindingTypeStatsMethod(), getCallOptions()), request, responseObserver); } @@ -1400,11 +1248,7 @@ public void listFindingTypeStats( * */ public static final class WebSecurityScannerBlockingStub - extends io.grpc.stub.AbstractStub { - private WebSecurityScannerBlockingStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractBlockingStub { private WebSecurityScannerBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -1426,7 +1270,7 @@ protected WebSecurityScannerBlockingStub build( public com.google.cloud.websecurityscanner.v1alpha.ScanConfig createScanConfig( com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest request) { return blockingUnaryCall( - getChannel(), getCreateScanConfigMethodHelper(), getCallOptions(), request); + getChannel(), getCreateScanConfigMethod(), getCallOptions(), request); } /** @@ -1439,7 +1283,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig createScanConfig( public com.google.protobuf.Empty deleteScanConfig( com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest request) { return blockingUnaryCall( - getChannel(), getDeleteScanConfigMethodHelper(), getCallOptions(), request); + getChannel(), getDeleteScanConfigMethod(), getCallOptions(), request); } /** @@ -1451,8 +1295,7 @@ public com.google.protobuf.Empty deleteScanConfig( */ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfig( com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest request) { - return blockingUnaryCall( - getChannel(), getGetScanConfigMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getGetScanConfigMethod(), getCallOptions(), request); } /** @@ -1464,8 +1307,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfig( */ public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse listScanConfigs( com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest request) { - return blockingUnaryCall( - getChannel(), getListScanConfigsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListScanConfigsMethod(), getCallOptions(), request); } /** @@ -1478,7 +1320,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse listS public com.google.cloud.websecurityscanner.v1alpha.ScanConfig updateScanConfig( com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest request) { return blockingUnaryCall( - getChannel(), getUpdateScanConfigMethodHelper(), getCallOptions(), request); + getChannel(), getUpdateScanConfigMethod(), getCallOptions(), request); } /** @@ -1490,8 +1332,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig updateScanConfig( */ public com.google.cloud.websecurityscanner.v1alpha.ScanRun startScanRun( com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest request) { - return blockingUnaryCall( - getChannel(), getStartScanRunMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getStartScanRunMethod(), getCallOptions(), request); } /** @@ -1503,8 +1344,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanRun startScanRun( */ public com.google.cloud.websecurityscanner.v1alpha.ScanRun getScanRun( com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest request) { - return blockingUnaryCall( - getChannel(), getGetScanRunMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getGetScanRunMethod(), getCallOptions(), request); } /** @@ -1517,8 +1357,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanRun getScanRun( */ public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse listScanRuns( com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest request) { - return blockingUnaryCall( - getChannel(), getListScanRunsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListScanRunsMethod(), getCallOptions(), request); } /** @@ -1530,8 +1369,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse listScan */ public com.google.cloud.websecurityscanner.v1alpha.ScanRun stopScanRun( com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest request) { - return blockingUnaryCall( - getChannel(), getStopScanRunMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getStopScanRunMethod(), getCallOptions(), request); } /** @@ -1543,8 +1381,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanRun stopScanRun( */ public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse listCrawledUrls( com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest request) { - return blockingUnaryCall( - getChannel(), getListCrawledUrlsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListCrawledUrlsMethod(), getCallOptions(), request); } /** @@ -1556,8 +1393,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse listC */ public com.google.cloud.websecurityscanner.v1alpha.Finding getFinding( com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest request) { - return blockingUnaryCall( - getChannel(), getGetFindingMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getGetFindingMethod(), getCallOptions(), request); } /** @@ -1569,8 +1405,7 @@ public com.google.cloud.websecurityscanner.v1alpha.Finding getFinding( */ public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse listFindings( com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest request) { - return blockingUnaryCall( - getChannel(), getListFindingsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListFindingsMethod(), getCallOptions(), request); } /** @@ -1584,7 +1419,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse listFind listFindingTypeStats( com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest request) { return blockingUnaryCall( - getChannel(), getListFindingTypeStatsMethodHelper(), getCallOptions(), request); + getChannel(), getListFindingTypeStatsMethod(), getCallOptions(), request); } } @@ -1598,11 +1433,7 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse listFind * */ public static final class WebSecurityScannerFutureStub - extends io.grpc.stub.AbstractStub { - private WebSecurityScannerFutureStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractFutureStub { private WebSecurityScannerFutureStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); } @@ -1625,7 +1456,7 @@ protected WebSecurityScannerFutureStub build( createScanConfig( com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest request) { return futureUnaryCall( - getChannel().newCall(getCreateScanConfigMethodHelper(), getCallOptions()), request); + getChannel().newCall(getCreateScanConfigMethod(), getCallOptions()), request); } /** @@ -1639,7 +1470,7 @@ protected WebSecurityScannerFutureStub build( deleteScanConfig( com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest request) { return futureUnaryCall( - getChannel().newCall(getDeleteScanConfigMethodHelper(), getCallOptions()), request); + getChannel().newCall(getDeleteScanConfigMethod(), getCallOptions()), request); } /** @@ -1653,7 +1484,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1alpha.ScanConfig> getScanConfig(com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest request) { return futureUnaryCall( - getChannel().newCall(getGetScanConfigMethodHelper(), getCallOptions()), request); + getChannel().newCall(getGetScanConfigMethod(), getCallOptions()), request); } /** @@ -1668,7 +1499,7 @@ protected WebSecurityScannerFutureStub build( listScanConfigs( com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest request) { return futureUnaryCall( - getChannel().newCall(getListScanConfigsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListScanConfigsMethod(), getCallOptions()), request); } /** @@ -1683,7 +1514,7 @@ protected WebSecurityScannerFutureStub build( updateScanConfig( com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest request) { return futureUnaryCall( - getChannel().newCall(getUpdateScanConfigMethodHelper(), getCallOptions()), request); + getChannel().newCall(getUpdateScanConfigMethod(), getCallOptions()), request); } /** @@ -1697,7 +1528,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1alpha.ScanRun> startScanRun(com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest request) { return futureUnaryCall( - getChannel().newCall(getStartScanRunMethodHelper(), getCallOptions()), request); + getChannel().newCall(getStartScanRunMethod(), getCallOptions()), request); } /** @@ -1711,7 +1542,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1alpha.ScanRun> getScanRun(com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest request) { return futureUnaryCall( - getChannel().newCall(getGetScanRunMethodHelper(), getCallOptions()), request); + getChannel().newCall(getGetScanRunMethod(), getCallOptions()), request); } /** @@ -1726,7 +1557,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse> listScanRuns(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest request) { return futureUnaryCall( - getChannel().newCall(getListScanRunsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListScanRunsMethod(), getCallOptions()), request); } /** @@ -1740,7 +1571,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1alpha.ScanRun> stopScanRun(com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest request) { return futureUnaryCall( - getChannel().newCall(getStopScanRunMethodHelper(), getCallOptions()), request); + getChannel().newCall(getStopScanRunMethod(), getCallOptions()), request); } /** @@ -1755,7 +1586,7 @@ protected WebSecurityScannerFutureStub build( listCrawledUrls( com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest request) { return futureUnaryCall( - getChannel().newCall(getListCrawledUrlsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListCrawledUrlsMethod(), getCallOptions()), request); } /** @@ -1769,7 +1600,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1alpha.Finding> getFinding(com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest request) { return futureUnaryCall( - getChannel().newCall(getGetFindingMethodHelper(), getCallOptions()), request); + getChannel().newCall(getGetFindingMethod(), getCallOptions()), request); } /** @@ -1783,7 +1614,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse> listFindings(com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest request) { return futureUnaryCall( - getChannel().newCall(getListFindingsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListFindingsMethod(), getCallOptions()), request); } /** @@ -1798,7 +1629,7 @@ protected WebSecurityScannerFutureStub build( listFindingTypeStats( com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest request) { return futureUnaryCall( - getChannel().newCall(getListFindingTypeStatsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListFindingTypeStatsMethod(), getCallOptions()), request); } } @@ -1979,19 +1810,19 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() { result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) .setSchemaDescriptor(new WebSecurityScannerFileDescriptorSupplier()) - .addMethod(getCreateScanConfigMethodHelper()) - .addMethod(getDeleteScanConfigMethodHelper()) - .addMethod(getGetScanConfigMethodHelper()) - .addMethod(getListScanConfigsMethodHelper()) - .addMethod(getUpdateScanConfigMethodHelper()) - .addMethod(getStartScanRunMethodHelper()) - .addMethod(getGetScanRunMethodHelper()) - .addMethod(getListScanRunsMethodHelper()) - .addMethod(getStopScanRunMethodHelper()) - .addMethod(getListCrawledUrlsMethodHelper()) - .addMethod(getGetFindingMethodHelper()) - .addMethod(getListFindingsMethodHelper()) - .addMethod(getListFindingTypeStatsMethodHelper()) + .addMethod(getCreateScanConfigMethod()) + .addMethod(getDeleteScanConfigMethod()) + .addMethod(getGetScanConfigMethod()) + .addMethod(getListScanConfigsMethod()) + .addMethod(getUpdateScanConfigMethod()) + .addMethod(getStartScanRunMethod()) + .addMethod(getGetScanRunMethod()) + .addMethod(getListScanRunsMethod()) + .addMethod(getStopScanRunMethod()) + .addMethod(getListCrawledUrlsMethod()) + .addMethod(getGetFindingMethod()) + .addMethod(getListFindingsMethod()) + .addMethod(getListFindingTypeStatsMethod()) .build(); } } diff --git a/grpc-google-cloud-websecurityscanner-v1beta/clirr-ignored-differences.xml b/grpc-google-cloud-websecurityscanner-v1beta/clirr-ignored-differences.xml new file mode 100644 index 00000000..ddfc60b0 --- /dev/null +++ b/grpc-google-cloud-websecurityscanner-v1beta/clirr-ignored-differences.xml @@ -0,0 +1,10 @@ + + + + + + 6001 + com/google/cloud/websecurityscanner/v1beta/*Grpc + METHOD_* + + diff --git a/grpc-google-cloud-websecurityscanner-v1beta/pom.xml b/grpc-google-cloud-websecurityscanner-v1beta/pom.xml index 97330f62..039e35e3 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.81.2 + 0.81.3 grpc-google-cloud-websecurityscanner-v1beta GRPC library for grpc-google-cloud-websecurityscanner-v1beta com.google.cloud google-cloud-websecurityscanner-parent - 0.116.2 + 0.116.3 diff --git a/grpc-google-cloud-websecurityscanner-v1beta/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerGrpc.java b/grpc-google-cloud-websecurityscanner-v1beta/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerGrpc.java index 6e78afb4..d66f633e 100644 --- a/grpc-google-cloud-websecurityscanner-v1beta/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerGrpc.java +++ b/grpc-google-cloud-websecurityscanner-v1beta/src/main/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerGrpc.java @@ -32,7 +32,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.10.0)", + value = "by gRPC proto compiler", comments = "Source: google/cloud/websecurityscanner/v1beta/web_security_scanner.proto") public final class WebSecurityScannerGrpc { @@ -42,30 +42,20 @@ private WebSecurityScannerGrpc() {} "google.cloud.websecurityscanner.v1beta.WebSecurityScanner"; // Static method descriptors that strictly reflect the proto. - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getCreateScanConfigMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest, - com.google.cloud.websecurityscanner.v1beta.ScanConfig> - METHOD_CREATE_SCAN_CONFIG = getCreateScanConfigMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig> getCreateScanConfigMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "CreateScanConfig", + requestType = com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ScanConfig.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig> getCreateScanConfigMethod() { - return getCreateScanConfigMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest, - com.google.cloud.websecurityscanner.v1beta.ScanConfig> - getCreateScanConfigMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig> @@ -81,10 +71,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ScanConfig> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "CreateScanConfig")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateScanConfig")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -103,30 +90,20 @@ private WebSecurityScannerGrpc() {} return getCreateScanConfigMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getDeleteScanConfigMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest, - com.google.protobuf.Empty> - METHOD_DELETE_SCAN_CONFIG = getDeleteScanConfigMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest, com.google.protobuf.Empty> getDeleteScanConfigMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "DeleteScanConfig", + requestType = com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest.class, + responseType = com.google.protobuf.Empty.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest, com.google.protobuf.Empty> getDeleteScanConfigMethod() { - return getDeleteScanConfigMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest, - com.google.protobuf.Empty> - getDeleteScanConfigMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest, com.google.protobuf.Empty> @@ -142,10 +119,7 @@ private WebSecurityScannerGrpc() {} com.google.protobuf.Empty> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "DeleteScanConfig")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteScanConfig")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -163,30 +137,20 @@ private WebSecurityScannerGrpc() {} return getDeleteScanConfigMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getGetScanConfigMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest, - com.google.cloud.websecurityscanner.v1beta.ScanConfig> - METHOD_GET_SCAN_CONFIG = getGetScanConfigMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig> getGetScanConfigMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetScanConfig", + requestType = com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ScanConfig.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig> getGetScanConfigMethod() { - return getGetScanConfigMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest, - com.google.cloud.websecurityscanner.v1beta.ScanConfig> - getGetScanConfigMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig> @@ -201,10 +165,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ScanConfig> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "GetScanConfig")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetScanConfig")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -223,30 +184,20 @@ private WebSecurityScannerGrpc() {} return getGetScanConfigMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListScanConfigsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListScanConfigsRequest, - com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse> - METHOD_LIST_SCAN_CONFIGS = getListScanConfigsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListScanConfigsRequest, com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse> getListScanConfigsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListScanConfigs", + requestType = com.google.cloud.websecurityscanner.v1beta.ListScanConfigsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListScanConfigsRequest, com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse> getListScanConfigsMethod() { - return getListScanConfigsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListScanConfigsRequest, - com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse> - getListScanConfigsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListScanConfigsRequest, com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse> @@ -261,10 +212,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "ListScanConfigs")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListScanConfigs")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -283,30 +231,20 @@ private WebSecurityScannerGrpc() {} return getListScanConfigsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getUpdateScanConfigMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest, - com.google.cloud.websecurityscanner.v1beta.ScanConfig> - METHOD_UPDATE_SCAN_CONFIG = getUpdateScanConfigMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig> getUpdateScanConfigMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "UpdateScanConfig", + requestType = com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ScanConfig.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig> getUpdateScanConfigMethod() { - return getUpdateScanConfigMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest, - com.google.cloud.websecurityscanner.v1beta.ScanConfig> - getUpdateScanConfigMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig> @@ -322,10 +260,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ScanConfig> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "UpdateScanConfig")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UpdateScanConfig")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -344,30 +279,20 @@ private WebSecurityScannerGrpc() {} return getUpdateScanConfigMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getStartScanRunMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest, - com.google.cloud.websecurityscanner.v1beta.ScanRun> - METHOD_START_SCAN_RUN = getStartScanRunMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun> getStartScanRunMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "StartScanRun", + requestType = com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ScanRun.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun> getStartScanRunMethod() { - return getStartScanRunMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest, - com.google.cloud.websecurityscanner.v1beta.ScanRun> - getStartScanRunMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun> @@ -382,10 +307,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ScanRun> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "StartScanRun")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StartScanRun")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -404,30 +326,20 @@ private WebSecurityScannerGrpc() {} return getStartScanRunMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getGetScanRunMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest, - com.google.cloud.websecurityscanner.v1beta.ScanRun> - METHOD_GET_SCAN_RUN = getGetScanRunMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun> getGetScanRunMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetScanRun", + requestType = com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ScanRun.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun> getGetScanRunMethod() { - return getGetScanRunMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest, - com.google.cloud.websecurityscanner.v1beta.ScanRun> - getGetScanRunMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun> @@ -442,10 +354,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ScanRun> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "GetScanRun")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetScanRun")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -464,30 +373,20 @@ private WebSecurityScannerGrpc() {} return getGetScanRunMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListScanRunsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest, - com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse> - METHOD_LIST_SCAN_RUNS = getListScanRunsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest, com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse> getListScanRunsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListScanRuns", + requestType = com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest, com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse> getListScanRunsMethod() { - return getListScanRunsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest, - com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse> - getListScanRunsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest, com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse> @@ -502,10 +401,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "ListScanRuns")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListScanRuns")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -524,30 +420,20 @@ private WebSecurityScannerGrpc() {} return getListScanRunsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getStopScanRunMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest, - com.google.cloud.websecurityscanner.v1beta.ScanRun> - METHOD_STOP_SCAN_RUN = getStopScanRunMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun> getStopScanRunMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "StopScanRun", + requestType = com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ScanRun.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun> getStopScanRunMethod() { - return getStopScanRunMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest, - com.google.cloud.websecurityscanner.v1beta.ScanRun> - getStopScanRunMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun> @@ -562,10 +448,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ScanRun> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "StopScanRun")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "StopScanRun")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -584,30 +467,20 @@ private WebSecurityScannerGrpc() {} return getStopScanRunMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListCrawledUrlsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsRequest, - com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse> - METHOD_LIST_CRAWLED_URLS = getListCrawledUrlsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsRequest, com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse> getListCrawledUrlsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListCrawledUrls", + requestType = com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsRequest, com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse> getListCrawledUrlsMethod() { - return getListCrawledUrlsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsRequest, - com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse> - getListCrawledUrlsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsRequest, com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse> @@ -622,10 +495,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "ListCrawledUrls")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListCrawledUrls")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -644,30 +514,20 @@ private WebSecurityScannerGrpc() {} return getListCrawledUrlsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getGetFindingMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.GetFindingRequest, - com.google.cloud.websecurityscanner.v1beta.Finding> - METHOD_GET_FINDING = getGetFindingMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.GetFindingRequest, com.google.cloud.websecurityscanner.v1beta.Finding> getGetFindingMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetFinding", + requestType = com.google.cloud.websecurityscanner.v1beta.GetFindingRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.Finding.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.GetFindingRequest, com.google.cloud.websecurityscanner.v1beta.Finding> getGetFindingMethod() { - return getGetFindingMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.GetFindingRequest, - com.google.cloud.websecurityscanner.v1beta.Finding> - getGetFindingMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.GetFindingRequest, com.google.cloud.websecurityscanner.v1beta.Finding> @@ -682,10 +542,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.Finding> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "GetFinding")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetFinding")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -704,30 +561,20 @@ private WebSecurityScannerGrpc() {} return getGetFindingMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListFindingsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest, - com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse> - METHOD_LIST_FINDINGS = getListFindingsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest, com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse> getListFindingsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListFindings", + requestType = com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest, com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse> getListFindingsMethod() { - return getListFindingsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest, - com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse> - getListFindingsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest, com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse> @@ -742,10 +589,7 @@ private WebSecurityScannerGrpc() {} com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "ListFindings")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListFindings")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -764,30 +608,20 @@ private WebSecurityScannerGrpc() {} return getListFindingsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListFindingTypeStatsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsRequest, - com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsResponse> - METHOD_LIST_FINDING_TYPE_STATS = getListFindingTypeStatsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsRequest, com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsResponse> getListFindingTypeStatsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListFindingTypeStats", + requestType = com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsRequest.class, + responseType = com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsRequest, com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsResponse> getListFindingTypeStatsMethod() { - return getListFindingTypeStatsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsRequest, - com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsResponse> - getListFindingTypeStatsMethodHelper() { io.grpc.MethodDescriptor< com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsRequest, com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsResponse> @@ -805,9 +639,7 @@ private WebSecurityScannerGrpc() {} newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName( - generateFullMethodName( - "google.cloud.websecurityscanner.v1beta.WebSecurityScanner", - "ListFindingTypeStats")) + generateFullMethodName(SERVICE_NAME, "ListFindingTypeStats")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -828,19 +660,43 @@ private WebSecurityScannerGrpc() {} /** Creates a new async stub that supports all call types for the service */ public static WebSecurityScannerStub newStub(io.grpc.Channel channel) { - return new WebSecurityScannerStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public WebSecurityScannerStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new WebSecurityScannerStub(channel, callOptions); + } + }; + return WebSecurityScannerStub.newStub(factory, channel); } /** * Creates a new blocking-style stub that supports unary and streaming output calls on the service */ public static WebSecurityScannerBlockingStub newBlockingStub(io.grpc.Channel channel) { - return new WebSecurityScannerBlockingStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public WebSecurityScannerBlockingStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new WebSecurityScannerBlockingStub(channel, callOptions); + } + }; + return WebSecurityScannerBlockingStub.newStub(factory, channel); } /** Creates a new ListenableFuture-style stub that supports unary calls on the service */ public static WebSecurityScannerFutureStub newFutureStub(io.grpc.Channel channel) { - return new WebSecurityScannerFutureStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public WebSecurityScannerFutureStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new WebSecurityScannerFutureStub(channel, callOptions); + } + }; + return WebSecurityScannerFutureStub.newStub(factory, channel); } /** @@ -865,7 +721,7 @@ public void createScanConfig( com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getCreateScanConfigMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getCreateScanConfigMethod(), responseObserver); } /** @@ -878,7 +734,7 @@ public void createScanConfig( public void deleteScanConfig( com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getDeleteScanConfigMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getDeleteScanConfigMethod(), responseObserver); } /** @@ -892,7 +748,7 @@ public void getScanConfig( com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getGetScanConfigMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getGetScanConfigMethod(), responseObserver); } /** @@ -907,7 +763,7 @@ public void listScanConfigs( io.grpc.stub.StreamObserver< com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListScanConfigsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListScanConfigsMethod(), responseObserver); } /** @@ -921,7 +777,7 @@ public void updateScanConfig( com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getUpdateScanConfigMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getUpdateScanConfigMethod(), responseObserver); } /** @@ -935,7 +791,7 @@ public void startScanRun( com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getStartScanRunMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getStartScanRunMethod(), responseObserver); } /** @@ -949,7 +805,7 @@ public void getScanRun( com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getGetScanRunMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getGetScanRunMethod(), responseObserver); } /** @@ -964,7 +820,7 @@ public void listScanRuns( com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getListScanRunsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListScanRunsMethod(), responseObserver); } /** @@ -978,7 +834,7 @@ public void stopScanRun( com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getStopScanRunMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getStopScanRunMethod(), responseObserver); } /** @@ -993,7 +849,7 @@ public void listCrawledUrls( io.grpc.stub.StreamObserver< com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListCrawledUrlsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListCrawledUrlsMethod(), responseObserver); } /** @@ -1007,7 +863,7 @@ public void getFinding( com.google.cloud.websecurityscanner.v1beta.GetFindingRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getGetFindingMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getGetFindingMethod(), responseObserver); } /** @@ -1021,7 +877,7 @@ public void listFindings( com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getListFindingsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListFindingsMethod(), responseObserver); } /** @@ -1036,97 +892,97 @@ public void listFindingTypeStats( io.grpc.stub.StreamObserver< com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListFindingTypeStatsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListFindingTypeStatsMethod(), responseObserver); } @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( - getCreateScanConfigMethodHelper(), + getCreateScanConfigMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig>( this, METHODID_CREATE_SCAN_CONFIG))) .addMethod( - getDeleteScanConfigMethodHelper(), + getDeleteScanConfigMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest, com.google.protobuf.Empty>(this, METHODID_DELETE_SCAN_CONFIG))) .addMethod( - getGetScanConfigMethodHelper(), + getGetScanConfigMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig>( this, METHODID_GET_SCAN_CONFIG))) .addMethod( - getListScanConfigsMethodHelper(), + getListScanConfigsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.ListScanConfigsRequest, com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse>( this, METHODID_LIST_SCAN_CONFIGS))) .addMethod( - getUpdateScanConfigMethodHelper(), + getUpdateScanConfigMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest, com.google.cloud.websecurityscanner.v1beta.ScanConfig>( this, METHODID_UPDATE_SCAN_CONFIG))) .addMethod( - getStartScanRunMethodHelper(), + getStartScanRunMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun>( this, METHODID_START_SCAN_RUN))) .addMethod( - getGetScanRunMethodHelper(), + getGetScanRunMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun>( this, METHODID_GET_SCAN_RUN))) .addMethod( - getListScanRunsMethodHelper(), + getListScanRunsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest, com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse>( this, METHODID_LIST_SCAN_RUNS))) .addMethod( - getStopScanRunMethodHelper(), + getStopScanRunMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest, com.google.cloud.websecurityscanner.v1beta.ScanRun>( this, METHODID_STOP_SCAN_RUN))) .addMethod( - getListCrawledUrlsMethodHelper(), + getListCrawledUrlsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsRequest, com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse>( this, METHODID_LIST_CRAWLED_URLS))) .addMethod( - getGetFindingMethodHelper(), + getGetFindingMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.GetFindingRequest, com.google.cloud.websecurityscanner.v1beta.Finding>( this, METHODID_GET_FINDING))) .addMethod( - getListFindingsMethodHelper(), + getListFindingsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest, com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse>( this, METHODID_LIST_FINDINGS))) .addMethod( - getListFindingTypeStatsMethodHelper(), + getListFindingTypeStatsMethod(), asyncUnaryCall( new MethodHandlers< com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsRequest, @@ -1146,11 +1002,7 @@ public final io.grpc.ServerServiceDefinition bindService() { * */ public static final class WebSecurityScannerStub - extends io.grpc.stub.AbstractStub { - private WebSecurityScannerStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractAsyncStub { private WebSecurityScannerStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); } @@ -1173,7 +1025,7 @@ public void createScanConfig( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getCreateScanConfigMethodHelper(), getCallOptions()), + getChannel().newCall(getCreateScanConfigMethod(), getCallOptions()), request, responseObserver); } @@ -1189,7 +1041,7 @@ public void deleteScanConfig( com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getDeleteScanConfigMethodHelper(), getCallOptions()), + getChannel().newCall(getDeleteScanConfigMethod(), getCallOptions()), request, responseObserver); } @@ -1206,7 +1058,7 @@ public void getScanConfig( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getGetScanConfigMethodHelper(), getCallOptions()), + getChannel().newCall(getGetScanConfigMethod(), getCallOptions()), request, responseObserver); } @@ -1224,7 +1076,7 @@ public void listScanConfigs( com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListScanConfigsMethodHelper(), getCallOptions()), + getChannel().newCall(getListScanConfigsMethod(), getCallOptions()), request, responseObserver); } @@ -1241,7 +1093,7 @@ public void updateScanConfig( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getUpdateScanConfigMethodHelper(), getCallOptions()), + getChannel().newCall(getUpdateScanConfigMethod(), getCallOptions()), request, responseObserver); } @@ -1258,7 +1110,7 @@ public void startScanRun( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getStartScanRunMethodHelper(), getCallOptions()), + getChannel().newCall(getStartScanRunMethod(), getCallOptions()), request, responseObserver); } @@ -1275,9 +1127,7 @@ public void getScanRun( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getGetScanRunMethodHelper(), getCallOptions()), - request, - responseObserver); + getChannel().newCall(getGetScanRunMethod(), getCallOptions()), request, responseObserver); } /** @@ -1293,7 +1143,7 @@ public void listScanRuns( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getListScanRunsMethodHelper(), getCallOptions()), + getChannel().newCall(getListScanRunsMethod(), getCallOptions()), request, responseObserver); } @@ -1310,7 +1160,7 @@ public void stopScanRun( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getStopScanRunMethodHelper(), getCallOptions()), + getChannel().newCall(getStopScanRunMethod(), getCallOptions()), request, responseObserver); } @@ -1328,7 +1178,7 @@ public void listCrawledUrls( com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListCrawledUrlsMethodHelper(), getCallOptions()), + getChannel().newCall(getListCrawledUrlsMethod(), getCallOptions()), request, responseObserver); } @@ -1345,9 +1195,7 @@ public void getFinding( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getGetFindingMethodHelper(), getCallOptions()), - request, - responseObserver); + getChannel().newCall(getGetFindingMethod(), getCallOptions()), request, responseObserver); } /** @@ -1362,7 +1210,7 @@ public void listFindings( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getListFindingsMethodHelper(), getCallOptions()), + getChannel().newCall(getListFindingsMethod(), getCallOptions()), request, responseObserver); } @@ -1380,7 +1228,7 @@ public void listFindingTypeStats( com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListFindingTypeStatsMethodHelper(), getCallOptions()), + getChannel().newCall(getListFindingTypeStatsMethod(), getCallOptions()), request, responseObserver); } @@ -1396,11 +1244,7 @@ public void listFindingTypeStats( * */ public static final class WebSecurityScannerBlockingStub - extends io.grpc.stub.AbstractStub { - private WebSecurityScannerBlockingStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractBlockingStub { private WebSecurityScannerBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -1422,7 +1266,7 @@ protected WebSecurityScannerBlockingStub build( public com.google.cloud.websecurityscanner.v1beta.ScanConfig createScanConfig( com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest request) { return blockingUnaryCall( - getChannel(), getCreateScanConfigMethodHelper(), getCallOptions(), request); + getChannel(), getCreateScanConfigMethod(), getCallOptions(), request); } /** @@ -1435,7 +1279,7 @@ public com.google.cloud.websecurityscanner.v1beta.ScanConfig createScanConfig( public com.google.protobuf.Empty deleteScanConfig( com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest request) { return blockingUnaryCall( - getChannel(), getDeleteScanConfigMethodHelper(), getCallOptions(), request); + getChannel(), getDeleteScanConfigMethod(), getCallOptions(), request); } /** @@ -1447,8 +1291,7 @@ public com.google.protobuf.Empty deleteScanConfig( */ public com.google.cloud.websecurityscanner.v1beta.ScanConfig getScanConfig( com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest request) { - return blockingUnaryCall( - getChannel(), getGetScanConfigMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getGetScanConfigMethod(), getCallOptions(), request); } /** @@ -1460,8 +1303,7 @@ public com.google.cloud.websecurityscanner.v1beta.ScanConfig getScanConfig( */ public com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse listScanConfigs( com.google.cloud.websecurityscanner.v1beta.ListScanConfigsRequest request) { - return blockingUnaryCall( - getChannel(), getListScanConfigsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListScanConfigsMethod(), getCallOptions(), request); } /** @@ -1474,7 +1316,7 @@ public com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse listSc public com.google.cloud.websecurityscanner.v1beta.ScanConfig updateScanConfig( com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest request) { return blockingUnaryCall( - getChannel(), getUpdateScanConfigMethodHelper(), getCallOptions(), request); + getChannel(), getUpdateScanConfigMethod(), getCallOptions(), request); } /** @@ -1486,8 +1328,7 @@ public com.google.cloud.websecurityscanner.v1beta.ScanConfig updateScanConfig( */ public com.google.cloud.websecurityscanner.v1beta.ScanRun startScanRun( com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest request) { - return blockingUnaryCall( - getChannel(), getStartScanRunMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getStartScanRunMethod(), getCallOptions(), request); } /** @@ -1499,8 +1340,7 @@ public com.google.cloud.websecurityscanner.v1beta.ScanRun startScanRun( */ public com.google.cloud.websecurityscanner.v1beta.ScanRun getScanRun( com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest request) { - return blockingUnaryCall( - getChannel(), getGetScanRunMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getGetScanRunMethod(), getCallOptions(), request); } /** @@ -1513,8 +1353,7 @@ public com.google.cloud.websecurityscanner.v1beta.ScanRun getScanRun( */ public com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse listScanRuns( com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest request) { - return blockingUnaryCall( - getChannel(), getListScanRunsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListScanRunsMethod(), getCallOptions(), request); } /** @@ -1526,8 +1365,7 @@ public com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse listScanR */ public com.google.cloud.websecurityscanner.v1beta.ScanRun stopScanRun( com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest request) { - return blockingUnaryCall( - getChannel(), getStopScanRunMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getStopScanRunMethod(), getCallOptions(), request); } /** @@ -1539,8 +1377,7 @@ public com.google.cloud.websecurityscanner.v1beta.ScanRun stopScanRun( */ public com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse listCrawledUrls( com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsRequest request) { - return blockingUnaryCall( - getChannel(), getListCrawledUrlsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListCrawledUrlsMethod(), getCallOptions(), request); } /** @@ -1552,8 +1389,7 @@ public com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse listCr */ public com.google.cloud.websecurityscanner.v1beta.Finding getFinding( com.google.cloud.websecurityscanner.v1beta.GetFindingRequest request) { - return blockingUnaryCall( - getChannel(), getGetFindingMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getGetFindingMethod(), getCallOptions(), request); } /** @@ -1565,8 +1401,7 @@ public com.google.cloud.websecurityscanner.v1beta.Finding getFinding( */ public com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse listFindings( com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest request) { - return blockingUnaryCall( - getChannel(), getListFindingsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListFindingsMethod(), getCallOptions(), request); } /** @@ -1580,7 +1415,7 @@ public com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse listFindi listFindingTypeStats( com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsRequest request) { return blockingUnaryCall( - getChannel(), getListFindingTypeStatsMethodHelper(), getCallOptions(), request); + getChannel(), getListFindingTypeStatsMethod(), getCallOptions(), request); } } @@ -1594,11 +1429,7 @@ public com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse listFindi * */ public static final class WebSecurityScannerFutureStub - extends io.grpc.stub.AbstractStub { - private WebSecurityScannerFutureStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractFutureStub { private WebSecurityScannerFutureStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); } @@ -1621,7 +1452,7 @@ protected WebSecurityScannerFutureStub build( createScanConfig( com.google.cloud.websecurityscanner.v1beta.CreateScanConfigRequest request) { return futureUnaryCall( - getChannel().newCall(getCreateScanConfigMethodHelper(), getCallOptions()), request); + getChannel().newCall(getCreateScanConfigMethod(), getCallOptions()), request); } /** @@ -1635,7 +1466,7 @@ protected WebSecurityScannerFutureStub build( deleteScanConfig( com.google.cloud.websecurityscanner.v1beta.DeleteScanConfigRequest request) { return futureUnaryCall( - getChannel().newCall(getDeleteScanConfigMethodHelper(), getCallOptions()), request); + getChannel().newCall(getDeleteScanConfigMethod(), getCallOptions()), request); } /** @@ -1649,7 +1480,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1beta.ScanConfig> getScanConfig(com.google.cloud.websecurityscanner.v1beta.GetScanConfigRequest request) { return futureUnaryCall( - getChannel().newCall(getGetScanConfigMethodHelper(), getCallOptions()), request); + getChannel().newCall(getGetScanConfigMethod(), getCallOptions()), request); } /** @@ -1663,7 +1494,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1beta.ListScanConfigsResponse> listScanConfigs(com.google.cloud.websecurityscanner.v1beta.ListScanConfigsRequest request) { return futureUnaryCall( - getChannel().newCall(getListScanConfigsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListScanConfigsMethod(), getCallOptions()), request); } /** @@ -1678,7 +1509,7 @@ protected WebSecurityScannerFutureStub build( updateScanConfig( com.google.cloud.websecurityscanner.v1beta.UpdateScanConfigRequest request) { return futureUnaryCall( - getChannel().newCall(getUpdateScanConfigMethodHelper(), getCallOptions()), request); + getChannel().newCall(getUpdateScanConfigMethod(), getCallOptions()), request); } /** @@ -1692,7 +1523,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1beta.ScanRun> startScanRun(com.google.cloud.websecurityscanner.v1beta.StartScanRunRequest request) { return futureUnaryCall( - getChannel().newCall(getStartScanRunMethodHelper(), getCallOptions()), request); + getChannel().newCall(getStartScanRunMethod(), getCallOptions()), request); } /** @@ -1706,7 +1537,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1beta.ScanRun> getScanRun(com.google.cloud.websecurityscanner.v1beta.GetScanRunRequest request) { return futureUnaryCall( - getChannel().newCall(getGetScanRunMethodHelper(), getCallOptions()), request); + getChannel().newCall(getGetScanRunMethod(), getCallOptions()), request); } /** @@ -1721,7 +1552,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1beta.ListScanRunsResponse> listScanRuns(com.google.cloud.websecurityscanner.v1beta.ListScanRunsRequest request) { return futureUnaryCall( - getChannel().newCall(getListScanRunsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListScanRunsMethod(), getCallOptions()), request); } /** @@ -1735,7 +1566,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1beta.ScanRun> stopScanRun(com.google.cloud.websecurityscanner.v1beta.StopScanRunRequest request) { return futureUnaryCall( - getChannel().newCall(getStopScanRunMethodHelper(), getCallOptions()), request); + getChannel().newCall(getStopScanRunMethod(), getCallOptions()), request); } /** @@ -1749,7 +1580,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsResponse> listCrawledUrls(com.google.cloud.websecurityscanner.v1beta.ListCrawledUrlsRequest request) { return futureUnaryCall( - getChannel().newCall(getListCrawledUrlsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListCrawledUrlsMethod(), getCallOptions()), request); } /** @@ -1763,7 +1594,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1beta.Finding> getFinding(com.google.cloud.websecurityscanner.v1beta.GetFindingRequest request) { return futureUnaryCall( - getChannel().newCall(getGetFindingMethodHelper(), getCallOptions()), request); + getChannel().newCall(getGetFindingMethod(), getCallOptions()), request); } /** @@ -1777,7 +1608,7 @@ protected WebSecurityScannerFutureStub build( com.google.cloud.websecurityscanner.v1beta.ListFindingsResponse> listFindings(com.google.cloud.websecurityscanner.v1beta.ListFindingsRequest request) { return futureUnaryCall( - getChannel().newCall(getListFindingsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListFindingsMethod(), getCallOptions()), request); } /** @@ -1792,7 +1623,7 @@ protected WebSecurityScannerFutureStub build( listFindingTypeStats( com.google.cloud.websecurityscanner.v1beta.ListFindingTypeStatsRequest request) { return futureUnaryCall( - getChannel().newCall(getListFindingTypeStatsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListFindingTypeStatsMethod(), getCallOptions()), request); } } @@ -1973,19 +1804,19 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() { result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) .setSchemaDescriptor(new WebSecurityScannerFileDescriptorSupplier()) - .addMethod(getCreateScanConfigMethodHelper()) - .addMethod(getDeleteScanConfigMethodHelper()) - .addMethod(getGetScanConfigMethodHelper()) - .addMethod(getListScanConfigsMethodHelper()) - .addMethod(getUpdateScanConfigMethodHelper()) - .addMethod(getStartScanRunMethodHelper()) - .addMethod(getGetScanRunMethodHelper()) - .addMethod(getListScanRunsMethodHelper()) - .addMethod(getStopScanRunMethodHelper()) - .addMethod(getListCrawledUrlsMethodHelper()) - .addMethod(getGetFindingMethodHelper()) - .addMethod(getListFindingsMethodHelper()) - .addMethod(getListFindingTypeStatsMethodHelper()) + .addMethod(getCreateScanConfigMethod()) + .addMethod(getDeleteScanConfigMethod()) + .addMethod(getGetScanConfigMethod()) + .addMethod(getListScanConfigsMethod()) + .addMethod(getUpdateScanConfigMethod()) + .addMethod(getStartScanRunMethod()) + .addMethod(getGetScanRunMethod()) + .addMethod(getListScanRunsMethod()) + .addMethod(getStopScanRunMethod()) + .addMethod(getListCrawledUrlsMethod()) + .addMethod(getGetFindingMethod()) + .addMethod(getListFindingsMethod()) + .addMethod(getListFindingTypeStatsMethod()) .build(); } } diff --git a/pom.xml b/pom.xml index 2e3c8d87..8f6471fe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-websecurityscanner-parent pom - 0.116.2 + 0.116.3 Google Cloud Web Security Scanner Parent https://github.com/googleapis/java-websecurityscanner @@ -63,16 +63,16 @@ UTF-8 github google-cloud-websecurityscanner-parent - 1.91.1 - 1.8.1 + 1.93.0 + 1.9.0 1.17.0 0.20.0 - 1.53.1 - 1.27.0 - 3.11.3 + 1.56.0 + 1.28.1 + 3.11.4 4.13 28.2-android - 1.4.1 + 1.4.3 1.3.2 1.18 2.10.5 @@ -83,27 +83,27 @@ com.google.api.grpc proto-google-cloud-websecurityscanner-v1beta - 0.81.2 + 0.81.3 com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.81.2 + 0.81.3 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.81.2 + 0.81.3 com.google.api.grpc grpc-google-cloud-websecurityscanner-v1beta - 0.81.2 + 0.81.3 com.google.cloud google-cloud-websecurityscanner - 0.116.2 + 0.116.3 @@ -243,7 +243,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 html @@ -280,4 +280,4 @@ - \ No newline at end of file + diff --git a/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/proto-google-cloud-websecurityscanner-v1alpha/pom.xml index 88b3b410..3b7cb2a3 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.81.2 + 0.81.3 proto-google-cloud-websecurityscanner-v1alpha PROTO library for proto-google-cloud-websecurityscanner-v1alpha com.google.cloud google-cloud-websecurityscanner-parent - 0.116.2 + 0.116.3 diff --git a/proto-google-cloud-websecurityscanner-v1beta/pom.xml b/proto-google-cloud-websecurityscanner-v1beta/pom.xml index d06d515c..afbdd436 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.81.2 + 0.81.3 proto-google-cloud-websecurityscanner-v1beta PROTO library for proto-google-cloud-websecurityscanner-v1beta com.google.cloud google-cloud-websecurityscanner-parent - 0.116.2 + 0.116.3 diff --git a/renovate.json b/renovate.json index 268a4669..e8b06d81 100644 --- a/renovate.json +++ b/renovate.json @@ -54,6 +54,15 @@ "semanticCommitType": "build", "semanticCommitScope": "deps" }, + { + "packagePatterns": [ + "^com.google.cloud:google-cloud-websecurityscanner", + "^com.google.cloud:libraries-bom", + "^com.google.cloud.samples:shared-configuration" + ], + "semanticCommitType": "chore", + "semanticCommitScope": "deps" + }, { "packagePatterns": [ "^com.google.cloud:google-cloud-" @@ -68,4 +77,4 @@ } ], "semanticCommits": true -} +} \ No newline at end of file diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml new file mode 100644 index 00000000..9f4c0b74 --- /dev/null +++ b/samples/install-without-bom/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + com.google.cloud + websecurityscanner-install-without-bom + jar + Google Cloud Security Scanner Install Without Bom + https://github.com/googleapis/java-websecurityscanner + + + + com.google.cloud.samples + shared-configuration + 1.0.15 + + + + 1.8 + 1.8 + UTF-8 + + + + + + + com.google.cloud + google-cloud-websecurityscanner + 0.116.2 + + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.1.0 + + + add-snippets-source + + add-source + + + + ../snippets/src/main/java + + + + + add-snippets-tests + + add-test-source + + + + ../snippets/src/test/java + + + + + + + + diff --git a/samples/pom.xml b/samples/pom.xml new file mode 100644 index 00000000..f1e6993b --- /dev/null +++ b/samples/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + com.google.cloud + google-cloud-websecurityscanner-samples + 0.0.1-SNAPSHOT + pom + Google Cloud Security Scanner Samples Parent + https://github.com/googleapis/java-websecurityscanner + + Java idiomatic client for Google Cloud Platform services. + + + + + com.google.cloud.samples + shared-configuration + 1.0.15 + + + + 1.8 + 1.8 + UTF-8 + + + + install-without-bom + snapshot + snippets + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + + diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml new file mode 100644 index 00000000..0acd3d21 --- /dev/null +++ b/samples/snapshot/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + com.google.cloud + websecurityscanner-snapshot + jar + Google Cloud Security Scanner Snapshot Samples + https://github.com/googleapis/java-websecurityscanner + + + + com.google.cloud.samples + shared-configuration + 1.0.15 + + + + 1.8 + 1.8 + UTF-8 + + + + + + com.google.cloud + google-cloud-websecurityscanner + 0.116.2 + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.1.0 + + + add-snippets-source + + add-source + + + + ../snippets/src/main/java + + + + + add-snippets-tests + + add-test-source + + + + ../snippets/src/test/java + + + + + + + + \ No newline at end of file diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml new file mode 100644 index 00000000..4a6ef71d --- /dev/null +++ b/samples/snippets/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + com.google.cloud + websecurityscanner-snippets + jar + Google Cloud Security Scanner Snippets + https://github.com/googleapis/java-websecurityscanner + + + + com.google.cloud.samples + shared-configuration + 1.0.15 + + + + 1.8 + 1.8 + UTF-8 + + + + + + + + com.google.cloud + libraries-bom + 4.4.1 + pom + import + + + + + + + com.google.cloud + google-cloud-websecurityscanner + + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + diff --git a/synth.metadata b/synth.metadata index 538b9389..d5070d6a 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,27 +1,27 @@ { - "updateTime": "2020-02-03T23:47:44.573170Z", + "updateTime": "2020-04-02T01:35:10.529789Z", "sources": [ { - "generator": { - "name": "artman", - "version": "0.44.4", - "dockerImage": "googleapis/artman@sha256:19e945954fc960a4bdfee6cb34695898ab21a8cf0bac063ee39b91f00a1faec8" + "git": { + "name": "googleapis", + "remote": "https://github.com/googleapis/googleapis.git", + "sha": "0341fa3fc2f4073a1b1f260d37b2ce620799f545", + "internalRef": "302980301" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "29d40b78e3dc1579b0b209463fbcb76e5767f72a", - "internalRef": "292979741", - "log": "29d40b78e3dc1579b0b209463fbcb76e5767f72a\nExpose managedidentities/v1beta1/ API for client library usage.\n\nPiperOrigin-RevId: 292979741\n\na22129a1fb6e18056d576dfb7717aef74b63734a\nExpose managedidentities/v1/ API for client library usage.\n\nPiperOrigin-RevId: 292968186\n\n" + "sha": "0341fa3fc2f4073a1b1f260d37b2ce620799f545", + "internalRef": "302980301" } }, { - "template": { - "name": "java_library", - "origin": "synthtool.gcp", - "version": "2019.10.17" + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8" } } ], @@ -32,8 +32,7 @@ "apiName": "websecurityscanner", "apiVersion": "v1alpha", "language": "java", - "generator": "gapic", - "config": "google/cloud/websecurityscanner/artman_websecurityscanner_v1alpha.yaml" + "generator": "bazel" } }, { @@ -42,8 +41,7 @@ "apiName": "websecurityscanner", "apiVersion": "v1beta", "language": "java", - "generator": "gapic", - "config": "google/cloud/websecurityscanner/artman_websecurityscanner_v1beta.yaml" + "generator": "bazel" } } ] diff --git a/synth.py b/synth.py index 31b50762..d41b0c25 100644 --- a/synth.py +++ b/synth.py @@ -14,22 +14,18 @@ """This script is used to synthesize generated parts of this library.""" -import synthtool as s -import synthtool.gcp as gcp import synthtool.languages.java as java -gapic = gcp.GAPICGenerator() +AUTOSYNTH_MULTIPLE_COMMITS = True service = 'websecurityscanner' versions = ['v1alpha', 'v1beta'] -config_pattern = '/google/cloud/websecurityscanner/artman_websecurityscanner_{version}.yaml' for version in versions: - java.gapic_library( - service=service, - version=version, - config_pattern=config_pattern, - gapic=gapic, + library = java.bazel_library( + service=service, + version=version, + bazel_target=f'//google/cloud/{service}/{version}:google-cloud-{service}-{version}-java', ) java.common_templates() diff --git a/versions.txt b/versions.txt index 4273ce67..4fb1b7fd 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-websecurityscanner-v1beta:0.81.2:0.81.2 -proto-google-cloud-websecurityscanner-v1alpha:0.81.2:0.81.2 -grpc-google-cloud-websecurityscanner-v1alpha:0.81.2:0.81.2 -grpc-google-cloud-websecurityscanner-v1beta:0.81.2:0.81.2 -google-cloud-websecurityscanner:0.116.2:0.116.2 \ No newline at end of file +proto-google-cloud-websecurityscanner-v1beta:0.81.3:0.81.3 +proto-google-cloud-websecurityscanner-v1alpha:0.81.3:0.81.3 +grpc-google-cloud-websecurityscanner-v1alpha:0.81.3:0.81.3 +grpc-google-cloud-websecurityscanner-v1beta:0.81.3:0.81.3 +google-cloud-websecurityscanner:0.116.3:0.116.3 \ No newline at end of file