diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0bd0ee06..00bdf116 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-errorreporting/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..8fe80267 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-errorreporting +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 50e47dae..0aade871 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -15,7 +15,13 @@ set -eo pipefail -cd github/java-errorreporting/ +## 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 f991f070..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-errorreporting/ +## 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 08f507f5..387c51b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +### [0.119.2](https://www.github.com/googleapis/java-errorreporting/compare/v0.119.1...v0.119.2) (2020-04-07) + + +### Dependencies + +* update core dependencies ([#78](https://www.github.com/googleapis/java-errorreporting/issues/78)) ([34a7c5a](https://www.github.com/googleapis/java-errorreporting/commit/34a7c5a426d3ee3cb67557c21ed9d7948135e8c6)) +* update core deps ([#76](https://www.github.com/googleapis/java-errorreporting/issues/76)) ([0378e83](https://www.github.com/googleapis/java-errorreporting/commit/0378e8327118eeec40a6cefbdda36f8327844aee)) +* update dependency com.google.api:api-common to v1.9.0 ([#98](https://www.github.com/googleapis/java-errorreporting/issues/98)) ([32c5dc2](https://www.github.com/googleapis/java-errorreporting/commit/32c5dc20b4126aeb1debd5b285b278fddb063e2d)) +* update dependency com.google.cloud:google-cloud-core to v1.92.5 ([ab1947a](https://www.github.com/googleapis/java-errorreporting/commit/ab1947a3d0d4accaa9e54b4be55e758be0734812)) +* update dependency com.google.cloud:google-cloud-core to v1.93.1 ([#77](https://www.github.com/googleapis/java-errorreporting/issues/77)) ([fd0f6c0](https://www.github.com/googleapis/java-errorreporting/commit/fd0f6c05efbea57862d67b1d47c4eef6555398f0)) +* update dependency com.google.cloud:google-cloud-core to v1.93.4 ([#105](https://www.github.com/googleapis/java-errorreporting/issues/105)) ([fefb2f3](https://www.github.com/googleapis/java-errorreporting/commit/fefb2f3b4ccb28e9e751bd740c148e250efcd01d)) +* update dependency com.google.protobuf:protobuf-java to v3.11.4 ([ddf45ec](https://www.github.com/googleapis/java-errorreporting/commit/ddf45ecc9e2918fb26d6e0ccee97eb4b972b68c9)) +* update dependency io.grpc:grpc-bom to v1.27.1 ([6e1c13b](https://www.github.com/googleapis/java-errorreporting/commit/6e1c13ba72dc626dcb3bdd93192bba6116e255f0)) +* update dependency org.threeten:threetenbp to v1.4.3 ([#88](https://www.github.com/googleapis/java-errorreporting/issues/88)) ([d3181de](https://www.github.com/googleapis/java-errorreporting/commit/d3181de3168f0de639b285a3c1b1c0314282e2e5)) + + +### Documentation + +* **regen:** update sample code to set total timeout, add API client header test ([a59054f](https://www.github.com/googleapis/java-errorreporting/commit/a59054f653cf7a22f9c9c104aa774fbaa30ad504)) + ### [0.119.1](https://www.github.com/googleapis/java-errorreporting/compare/v0.119.0...v0.119.1) (2020-02-04) diff --git a/README.md b/README.md index 7d9edd4a..3d2b08fe 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.1 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-errorreporting - + ``` [//]: # ({x-version-update-start:google-cloud-errorreporting:released}) @@ -43,17 +43,18 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-errorreporting - 0.119.1-beta + 0.119.2-beta + ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-errorreporting:0.119.1-beta' +compile 'com.google.cloud:google-cloud-errorreporting:0.119.2-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.119.1-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.119.2-beta" ``` [//]: # ({x-version-update-end}) @@ -87,6 +88,8 @@ use this Stackdriver Error Reporting 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-errorreporting/blob/master/LICENSE [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=clouderrorreporting.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-errorreporting-bom/pom.xml b/google-cloud-errorreporting-bom/pom.xml index b43d6368..b707cd3e 100644 --- a/google-cloud-errorreporting-bom/pom.xml +++ b/google-cloud-errorreporting-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-errorreporting-bom - 0.119.1-beta + 0.119.2-beta pom com.google.cloud @@ -63,17 +63,17 @@ com.google.cloud google-cloud-errorreporting - 0.119.1-beta + 0.119.2-beta com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.85.1 + 0.85.2 com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.85.1 + 0.85.2 diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index c880a56f..2794b5fc 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-errorreporting - 0.119.1-beta + 0.119.2-beta jar Google Cloud Error Reporting https://github.com/googleapis/java-errorreporting @@ -11,7 +11,7 @@ com.google.cloud google-cloud-errorreporting-parent - 0.119.1-beta + 0.119.2-beta google-cloud-errorreporting diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java index 98b626de..e96fabb4 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java @@ -55,8 +55,12 @@ * * ErrorGroupServiceSettings.Builder errorGroupServiceSettingsBuilder = * ErrorGroupServiceSettings.newBuilder(); - * errorGroupServiceSettingsBuilder.getGroupSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * errorGroupServiceSettingsBuilder + * .getGroupSettings() + * .setRetrySettings( + * errorGroupServiceSettingsBuilder.getGroupSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ErrorGroupServiceSettings errorGroupServiceSettings = errorGroupServiceSettingsBuilder.build(); * * diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java index 5d39abd5..873ee200 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java @@ -62,8 +62,12 @@ * * ErrorStatsServiceSettings.Builder errorStatsServiceSettingsBuilder = * ErrorStatsServiceSettings.newBuilder(); - * errorStatsServiceSettingsBuilder.deleteEventsSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * errorStatsServiceSettingsBuilder + * .deleteEventsSettings() + * .setRetrySettings( + * errorStatsServiceSettingsBuilder.deleteEventsSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ErrorStatsServiceSettings errorStatsServiceSettings = errorStatsServiceSettingsBuilder.build(); * * diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java index 46708938..ec73a29a 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java @@ -54,8 +54,12 @@ * * ReportErrorsServiceSettings.Builder reportErrorsServiceSettingsBuilder = * ReportErrorsServiceSettings.newBuilder(); - * reportErrorsServiceSettingsBuilder.reportErrorEventSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * reportErrorsServiceSettingsBuilder + * .reportErrorEventSettings() + * .setRetrySettings( + * reportErrorsServiceSettingsBuilder.reportErrorEventSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ReportErrorsServiceSettings reportErrorsServiceSettings = reportErrorsServiceSettingsBuilder.build(); * * diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java index a8721430..4ecf6f6d 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java @@ -19,33 +19,33 @@ * *

The interfaces provided are listed below, along with usage samples. * - *

======================= ErrorStatsServiceClient ======================= + *

======================= ErrorGroupServiceClient ======================= * - *

Service Description: An API for retrieving and managing error statistics as well as data for - * individual events. + *

Service Description: Service for retrieving and updating individual error groups. * - *

Sample for ErrorStatsServiceClient: + *

Sample for ErrorGroupServiceClient: * * 

  * 
- * try (ErrorStatsServiceClient errorStatsServiceClient = ErrorStatsServiceClient.create()) {
- *   ProjectName projectName = ProjectName.of("[PROJECT]");
- *   DeleteEventsResponse response = errorStatsServiceClient.deleteEvents(projectName);
+ * try (ErrorGroupServiceClient errorGroupServiceClient = ErrorGroupServiceClient.create()) {
+ *   ErrorGroupName groupName = ErrorGroupName.of("[PROJECT]", "[GROUP]");
+ *   ErrorGroup response = errorGroupServiceClient.getGroup(groupName);
  * }
  * 
  *
* - * ======================= ErrorGroupServiceClient ======================= + * ======================= ErrorStatsServiceClient ======================= * - *

Service Description: Service for retrieving and updating individual error groups. + *

Service Description: An API for retrieving and managing error statistics as well as data for + * individual events. * - *

Sample for ErrorGroupServiceClient: + *

Sample for ErrorStatsServiceClient: * * 

  * 
- * try (ErrorGroupServiceClient errorGroupServiceClient = ErrorGroupServiceClient.create()) {
- *   ErrorGroupName groupName = ErrorGroupName.of("[PROJECT]", "[GROUP]");
- *   ErrorGroup response = errorGroupServiceClient.getGroup(groupName);
+ * try (ErrorStatsServiceClient errorStatsServiceClient = ErrorStatsServiceClient.create()) {
+ *   ProjectName projectName = ProjectName.of("[PROJECT]");
+ *   DeleteEventsResponse response = errorStatsServiceClient.deleteEvents(projectName);
  * }
  * 
  *
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java index 501251e0..3fe2073f 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java @@ -64,8 +64,12 @@ * * ErrorGroupServiceStubSettings.Builder errorGroupServiceSettingsBuilder = * ErrorGroupServiceStubSettings.newBuilder(); - * errorGroupServiceSettingsBuilder.getGroupSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * errorGroupServiceSettingsBuilder + * .getGroupSettings() + * .setRetrySettings( + * errorGroupServiceSettingsBuilder.getGroupSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ErrorGroupServiceStubSettings errorGroupServiceSettings = errorGroupServiceSettingsBuilder.build(); * * diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java index ea4493ab..0f86c048 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java @@ -79,8 +79,12 @@ * * ErrorStatsServiceStubSettings.Builder errorStatsServiceSettingsBuilder = * ErrorStatsServiceStubSettings.newBuilder(); - * errorStatsServiceSettingsBuilder.deleteEventsSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * errorStatsServiceSettingsBuilder + * .deleteEventsSettings() + * .setRetrySettings( + * errorStatsServiceSettingsBuilder.deleteEventsSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ErrorStatsServiceStubSettings errorStatsServiceSettings = errorStatsServiceSettingsBuilder.build(); * * diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStubSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStubSettings.java index dd5de9fe..314bb2ca 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStubSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStubSettings.java @@ -63,8 +63,12 @@ * * ReportErrorsServiceStubSettings.Builder reportErrorsServiceSettingsBuilder = * ReportErrorsServiceStubSettings.newBuilder(); - * reportErrorsServiceSettingsBuilder.reportErrorEventSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * reportErrorsServiceSettingsBuilder + * .reportErrorEventSettings() + * .setRetrySettings( + * reportErrorsServiceSettingsBuilder.reportErrorEventSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ReportErrorsServiceStubSettings reportErrorsServiceSettings = reportErrorsServiceSettingsBuilder.build(); * * diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java index 57fd4ad8..8d428358 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java @@ -42,8 +42,8 @@ @javax.annotation.Generated("by GAPIC") public class ErrorGroupServiceClientTest { - private static MockErrorStatsService mockErrorStatsService; private static MockErrorGroupService mockErrorGroupService; + private static MockErrorStatsService mockErrorStatsService; private static MockReportErrorsService mockReportErrorsService; private static MockServiceHelper serviceHelper; private ErrorGroupServiceClient client; @@ -51,14 +51,14 @@ public class ErrorGroupServiceClientTest { @BeforeClass public static void startStaticServer() { - mockErrorStatsService = new MockErrorStatsService(); mockErrorGroupService = new MockErrorGroupService(); + mockErrorStatsService = new MockErrorStatsService(); mockReportErrorsService = new MockReportErrorsService(); serviceHelper = new MockServiceHelper( UUID.randomUUID().toString(), Arrays.asList( - mockErrorStatsService, mockErrorGroupService, mockReportErrorsService)); + mockErrorGroupService, mockErrorStatsService, mockReportErrorsService)); serviceHelper.start(); } diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java index de1cd58a..03299904 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java @@ -52,8 +52,8 @@ @javax.annotation.Generated("by GAPIC") public class ErrorStatsServiceClientTest { - private static MockErrorStatsService mockErrorStatsService; private static MockErrorGroupService mockErrorGroupService; + private static MockErrorStatsService mockErrorStatsService; private static MockReportErrorsService mockReportErrorsService; private static MockServiceHelper serviceHelper; private ErrorStatsServiceClient client; @@ -61,14 +61,14 @@ public class ErrorStatsServiceClientTest { @BeforeClass public static void startStaticServer() { - mockErrorStatsService = new MockErrorStatsService(); mockErrorGroupService = new MockErrorGroupService(); + mockErrorStatsService = new MockErrorStatsService(); mockReportErrorsService = new MockReportErrorsService(); serviceHelper = new MockServiceHelper( UUID.randomUUID().toString(), Arrays.asList( - mockErrorStatsService, mockErrorGroupService, mockReportErrorsService)); + mockErrorGroupService, mockErrorStatsService, mockReportErrorsService)); serviceHelper.start(); } diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java index 94b4bfda..02e7aa23 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java @@ -42,8 +42,8 @@ @javax.annotation.Generated("by GAPIC") public class ReportErrorsServiceClientTest { - private static MockErrorStatsService mockErrorStatsService; private static MockErrorGroupService mockErrorGroupService; + private static MockErrorStatsService mockErrorStatsService; private static MockReportErrorsService mockReportErrorsService; private static MockServiceHelper serviceHelper; private ReportErrorsServiceClient client; @@ -51,14 +51,14 @@ public class ReportErrorsServiceClientTest { @BeforeClass public static void startStaticServer() { - mockErrorStatsService = new MockErrorStatsService(); mockErrorGroupService = new MockErrorGroupService(); + mockErrorStatsService = new MockErrorStatsService(); mockReportErrorsService = new MockReportErrorsService(); serviceHelper = new MockServiceHelper( UUID.randomUUID().toString(), Arrays.asList( - mockErrorStatsService, mockErrorGroupService, mockReportErrorsService)); + mockErrorGroupService, mockErrorStatsService, mockReportErrorsService)); serviceHelper.start(); } diff --git a/grpc-google-cloud-error-reporting-v1beta1/clirr-ignored-differences.xml b/grpc-google-cloud-error-reporting-v1beta1/clirr-ignored-differences.xml new file mode 100644 index 00000000..009f123f --- /dev/null +++ b/grpc-google-cloud-error-reporting-v1beta1/clirr-ignored-differences.xml @@ -0,0 +1,10 @@ + + + + + + 6001 + com/google/devtools/clouderrorreporting/v1beta1/*Grpc + METHOD_* + + diff --git a/grpc-google-cloud-error-reporting-v1beta1/pom.xml b/grpc-google-cloud-error-reporting-v1beta1/pom.xml index 86a5385c..c73fd27b 100644 --- a/grpc-google-cloud-error-reporting-v1beta1/pom.xml +++ b/grpc-google-cloud-error-reporting-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.85.1 + 0.85.2 grpc-google-cloud-error-reporting-v1beta1 GRPC library for grpc-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.119.1-beta + 0.119.2-beta diff --git a/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceGrpc.java b/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceGrpc.java index 7019f10b..87a8e06d 100644 --- a/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceGrpc.java +++ b/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceGrpc.java @@ -30,7 +30,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.10.0)", + value = "by gRPC proto compiler", comments = "Source: google/devtools/clouderrorreporting/v1beta1/error_group_service.proto") public final class ErrorGroupServiceGrpc { @@ -40,30 +40,20 @@ private ErrorGroupServiceGrpc() {} "google.devtools.clouderrorreporting.v1beta1.ErrorGroupService"; // Static method descriptors that strictly reflect the proto. - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getGetGroupMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest, - com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> - METHOD_GET_GROUP = getGetGroupMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest, com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> getGetGroupMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetGroup", + requestType = com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest.class, + responseType = com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest, com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> getGetGroupMethod() { - return getGetGroupMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest, - com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> - getGetGroupMethodHelper() { io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest, com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> @@ -78,10 +68,7 @@ private ErrorGroupServiceGrpc() {} com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.devtools.clouderrorreporting.v1beta1.ErrorGroupService", - "GetGroup")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetGroup")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -100,30 +87,20 @@ private ErrorGroupServiceGrpc() {} return getGetGroupMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getUpdateGroupMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest, - com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> - METHOD_UPDATE_GROUP = getUpdateGroupMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest, com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> getUpdateGroupMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "UpdateGroup", + requestType = com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest.class, + responseType = com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest, com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> getUpdateGroupMethod() { - return getUpdateGroupMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest, - com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> - getUpdateGroupMethodHelper() { io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest, com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> @@ -138,10 +115,7 @@ private ErrorGroupServiceGrpc() {} com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.devtools.clouderrorreporting.v1beta1.ErrorGroupService", - "UpdateGroup")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "UpdateGroup")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -162,19 +136,43 @@ private ErrorGroupServiceGrpc() {} /** Creates a new async stub that supports all call types for the service */ public static ErrorGroupServiceStub newStub(io.grpc.Channel channel) { - return new ErrorGroupServiceStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public ErrorGroupServiceStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new ErrorGroupServiceStub(channel, callOptions); + } + }; + return ErrorGroupServiceStub.newStub(factory, channel); } /** * Creates a new blocking-style stub that supports unary and streaming output calls on the service */ public static ErrorGroupServiceBlockingStub newBlockingStub(io.grpc.Channel channel) { - return new ErrorGroupServiceBlockingStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public ErrorGroupServiceBlockingStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new ErrorGroupServiceBlockingStub(channel, callOptions); + } + }; + return ErrorGroupServiceBlockingStub.newStub(factory, channel); } /** Creates a new ListenableFuture-style stub that supports unary calls on the service */ public static ErrorGroupServiceFutureStub newFutureStub(io.grpc.Channel channel) { - return new ErrorGroupServiceFutureStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public ErrorGroupServiceFutureStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new ErrorGroupServiceFutureStub(channel, callOptions); + } + }; + return ErrorGroupServiceFutureStub.newStub(factory, channel); } /** @@ -197,7 +195,7 @@ public void getGroup( com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getGetGroupMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getGetGroupMethod(), responseObserver); } /** @@ -212,21 +210,21 @@ public void updateGroup( com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getUpdateGroupMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getUpdateGroupMethod(), responseObserver); } @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( - getGetGroupMethodHelper(), + getGetGroupMethod(), asyncUnaryCall( new MethodHandlers< com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest, com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup>( this, METHODID_GET_GROUP))) .addMethod( - getUpdateGroupMethodHelper(), + getUpdateGroupMethod(), asyncUnaryCall( new MethodHandlers< com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest, @@ -244,11 +242,7 @@ public final io.grpc.ServerServiceDefinition bindService() { * */ public static final class ErrorGroupServiceStub - extends io.grpc.stub.AbstractStub { - private ErrorGroupServiceStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractAsyncStub { private ErrorGroupServiceStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); } @@ -271,9 +265,7 @@ public void getGroup( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getGetGroupMethodHelper(), getCallOptions()), - request, - responseObserver); + getChannel().newCall(getGetGroupMethod(), getCallOptions()), request, responseObserver); } /** @@ -289,7 +281,7 @@ public void updateGroup( io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( - getChannel().newCall(getUpdateGroupMethodHelper(), getCallOptions()), + getChannel().newCall(getUpdateGroupMethod(), getCallOptions()), request, responseObserver); } @@ -303,11 +295,7 @@ public void updateGroup( * */ public static final class ErrorGroupServiceBlockingStub - extends io.grpc.stub.AbstractStub { - private ErrorGroupServiceBlockingStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractBlockingStub { private ErrorGroupServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -328,7 +316,7 @@ protected ErrorGroupServiceBlockingStub build( */ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup getGroup( com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest request) { - return blockingUnaryCall(getChannel(), getGetGroupMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getGetGroupMethod(), getCallOptions(), request); } /** @@ -341,8 +329,7 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup getGroup( */ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup updateGroup( com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest request) { - return blockingUnaryCall( - getChannel(), getUpdateGroupMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getUpdateGroupMethod(), getCallOptions(), request); } } @@ -354,11 +341,7 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup updateGroup( * */ public static final class ErrorGroupServiceFutureStub - extends io.grpc.stub.AbstractStub { - private ErrorGroupServiceFutureStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractFutureStub { private ErrorGroupServiceFutureStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); } @@ -379,8 +362,7 @@ protected ErrorGroupServiceFutureStub build( public com.google.common.util.concurrent.ListenableFuture< com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> getGroup(com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest request) { - return futureUnaryCall( - getChannel().newCall(getGetGroupMethodHelper(), getCallOptions()), request); + return futureUnaryCall(getChannel().newCall(getGetGroupMethod(), getCallOptions()), request); } /** @@ -395,7 +377,7 @@ protected ErrorGroupServiceFutureStub build( com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup> updateGroup(com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest request) { return futureUnaryCall( - getChannel().newCall(getUpdateGroupMethodHelper(), getCallOptions()), request); + getChannel().newCall(getUpdateGroupMethod(), getCallOptions()), request); } } @@ -497,8 +479,8 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() { result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) .setSchemaDescriptor(new ErrorGroupServiceFileDescriptorSupplier()) - .addMethod(getGetGroupMethodHelper()) - .addMethod(getUpdateGroupMethodHelper()) + .addMethod(getGetGroupMethod()) + .addMethod(getUpdateGroupMethod()) .build(); } } diff --git a/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceGrpc.java b/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceGrpc.java index ce086f37..09cc34ac 100644 --- a/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceGrpc.java +++ b/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceGrpc.java @@ -31,7 +31,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.10.0)", + value = "by gRPC proto compiler", comments = "Source: google/devtools/clouderrorreporting/v1beta1/error_stats_service.proto") public final class ErrorStatsServiceGrpc { @@ -41,30 +41,20 @@ private ErrorStatsServiceGrpc() {} "google.devtools.clouderrorreporting.v1beta1.ErrorStatsService"; // Static method descriptors that strictly reflect the proto. - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListGroupStatsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest, - com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse> - METHOD_LIST_GROUP_STATS = getListGroupStatsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest, com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse> getListGroupStatsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListGroupStats", + requestType = com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest.class, + responseType = com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest, com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse> getListGroupStatsMethod() { - return getListGroupStatsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest, - com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse> - getListGroupStatsMethodHelper() { io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest, com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse> @@ -79,10 +69,7 @@ private ErrorStatsServiceGrpc() {} com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.devtools.clouderrorreporting.v1beta1.ErrorStatsService", - "ListGroupStats")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListGroupStats")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -101,30 +88,20 @@ private ErrorStatsServiceGrpc() {} return getListGroupStatsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getListEventsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest, - com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse> - METHOD_LIST_EVENTS = getListEventsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest, com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse> getListEventsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ListEvents", + requestType = com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest.class, + responseType = com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest, com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse> getListEventsMethod() { - return getListEventsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest, - com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse> - getListEventsMethodHelper() { io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest, com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse> @@ -139,10 +116,7 @@ private ErrorStatsServiceGrpc() {} com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.devtools.clouderrorreporting.v1beta1.ErrorStatsService", - "ListEvents")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ListEvents")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -161,30 +135,20 @@ private ErrorStatsServiceGrpc() {} return getListEventsMethod; } - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getDeleteEventsMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest, - com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse> - METHOD_DELETE_EVENTS = getDeleteEventsMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest, com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse> getDeleteEventsMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "DeleteEvents", + requestType = com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest.class, + responseType = com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest, com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse> getDeleteEventsMethod() { - return getDeleteEventsMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest, - com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse> - getDeleteEventsMethodHelper() { io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest, com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse> @@ -199,10 +163,7 @@ private ErrorStatsServiceGrpc() {} com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.devtools.clouderrorreporting.v1beta1.ErrorStatsService", - "DeleteEvents")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "DeleteEvents")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -223,19 +184,43 @@ private ErrorStatsServiceGrpc() {} /** Creates a new async stub that supports all call types for the service */ public static ErrorStatsServiceStub newStub(io.grpc.Channel channel) { - return new ErrorStatsServiceStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public ErrorStatsServiceStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new ErrorStatsServiceStub(channel, callOptions); + } + }; + return ErrorStatsServiceStub.newStub(factory, channel); } /** * Creates a new blocking-style stub that supports unary and streaming output calls on the service */ public static ErrorStatsServiceBlockingStub newBlockingStub(io.grpc.Channel channel) { - return new ErrorStatsServiceBlockingStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public ErrorStatsServiceBlockingStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new ErrorStatsServiceBlockingStub(channel, callOptions); + } + }; + return ErrorStatsServiceBlockingStub.newStub(factory, channel); } /** Creates a new ListenableFuture-style stub that supports unary calls on the service */ public static ErrorStatsServiceFutureStub newFutureStub(io.grpc.Channel channel) { - return new ErrorStatsServiceFutureStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public ErrorStatsServiceFutureStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new ErrorStatsServiceFutureStub(channel, callOptions); + } + }; + return ErrorStatsServiceFutureStub.newStub(factory, channel); } /** @@ -260,7 +245,7 @@ public void listGroupStats( io.grpc.stub.StreamObserver< com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListGroupStatsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListGroupStatsMethod(), responseObserver); } /** @@ -275,7 +260,7 @@ public void listEvents( io.grpc.stub.StreamObserver< com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getListEventsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getListEventsMethod(), responseObserver); } /** @@ -290,28 +275,28 @@ public void deleteEvents( io.grpc.stub.StreamObserver< com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse> responseObserver) { - asyncUnimplementedUnaryCall(getDeleteEventsMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getDeleteEventsMethod(), responseObserver); } @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( - getListGroupStatsMethodHelper(), + getListGroupStatsMethod(), asyncUnaryCall( new MethodHandlers< com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest, com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse>( this, METHODID_LIST_GROUP_STATS))) .addMethod( - getListEventsMethodHelper(), + getListEventsMethod(), asyncUnaryCall( new MethodHandlers< com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest, com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse>( this, METHODID_LIST_EVENTS))) .addMethod( - getDeleteEventsMethodHelper(), + getDeleteEventsMethod(), asyncUnaryCall( new MethodHandlers< com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest, @@ -330,11 +315,7 @@ public final io.grpc.ServerServiceDefinition bindService() { * */ public static final class ErrorStatsServiceStub - extends io.grpc.stub.AbstractStub { - private ErrorStatsServiceStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractAsyncStub { private ErrorStatsServiceStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); } @@ -358,7 +339,7 @@ public void listGroupStats( com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListGroupStatsMethodHelper(), getCallOptions()), + getChannel().newCall(getListGroupStatsMethod(), getCallOptions()), request, responseObserver); } @@ -376,9 +357,7 @@ public void listEvents( com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getListEventsMethodHelper(), getCallOptions()), - request, - responseObserver); + getChannel().newCall(getListEventsMethod(), getCallOptions()), request, responseObserver); } /** @@ -394,7 +373,7 @@ public void deleteEvents( com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getDeleteEventsMethodHelper(), getCallOptions()), + getChannel().newCall(getDeleteEventsMethod(), getCallOptions()), request, responseObserver); } @@ -409,11 +388,7 @@ public void deleteEvents( * */ public static final class ErrorStatsServiceBlockingStub - extends io.grpc.stub.AbstractStub { - private ErrorStatsServiceBlockingStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractBlockingStub { private ErrorStatsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -434,8 +409,7 @@ protected ErrorStatsServiceBlockingStub build( */ public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse listGroupStats( com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest request) { - return blockingUnaryCall( - getChannel(), getListGroupStatsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListGroupStatsMethod(), getCallOptions(), request); } /** @@ -447,8 +421,7 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse li */ public com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse listEvents( com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest request) { - return blockingUnaryCall( - getChannel(), getListEventsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getListEventsMethod(), getCallOptions(), request); } /** @@ -460,8 +433,7 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse listEv */ public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse deleteEvents( com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest request) { - return blockingUnaryCall( - getChannel(), getDeleteEventsMethodHelper(), getCallOptions(), request); + return blockingUnaryCall(getChannel(), getDeleteEventsMethod(), getCallOptions(), request); } } @@ -474,11 +446,7 @@ public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse dele * */ public static final class ErrorStatsServiceFutureStub - extends io.grpc.stub.AbstractStub { - private ErrorStatsServiceFutureStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractFutureStub { private ErrorStatsServiceFutureStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); } @@ -501,7 +469,7 @@ protected ErrorStatsServiceFutureStub build( listGroupStats( com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest request) { return futureUnaryCall( - getChannel().newCall(getListGroupStatsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListGroupStatsMethod(), getCallOptions()), request); } /** @@ -515,7 +483,7 @@ protected ErrorStatsServiceFutureStub build( com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse> listEvents(com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest request) { return futureUnaryCall( - getChannel().newCall(getListEventsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getListEventsMethod(), getCallOptions()), request); } /** @@ -529,7 +497,7 @@ protected ErrorStatsServiceFutureStub build( com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse> deleteEvents(com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest request) { return futureUnaryCall( - getChannel().newCall(getDeleteEventsMethodHelper(), getCallOptions()), request); + getChannel().newCall(getDeleteEventsMethod(), getCallOptions()), request); } } @@ -639,9 +607,9 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() { result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) .setSchemaDescriptor(new ErrorStatsServiceFileDescriptorSupplier()) - .addMethod(getListGroupStatsMethodHelper()) - .addMethod(getListEventsMethodHelper()) - .addMethod(getDeleteEventsMethodHelper()) + .addMethod(getListGroupStatsMethod()) + .addMethod(getListEventsMethod()) + .addMethod(getDeleteEventsMethod()) .build(); } } diff --git a/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceGrpc.java b/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceGrpc.java index 439ba457..bf11fedd 100644 --- a/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceGrpc.java +++ b/grpc-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceGrpc.java @@ -30,7 +30,7 @@ * */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.10.0)", + value = "by gRPC proto compiler", comments = "Source: google/devtools/clouderrorreporting/v1beta1/report_errors_service.proto") public final class ReportErrorsServiceGrpc { @@ -40,30 +40,20 @@ private ReportErrorsServiceGrpc() {} "google.devtools.clouderrorreporting.v1beta1.ReportErrorsService"; // Static method descriptors that strictly reflect the proto. - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getReportErrorEventMethod()} instead. - public static final io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest, - com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse> - METHOD_REPORT_ERROR_EVENT = getReportErrorEventMethodHelper(); - private static volatile io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest, com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse> getReportErrorEventMethod; - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "ReportErrorEvent", + requestType = com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest.class, + responseType = com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) public static io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest, com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse> getReportErrorEventMethod() { - return getReportErrorEventMethodHelper(); - } - - private static io.grpc.MethodDescriptor< - com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest, - com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse> - getReportErrorEventMethodHelper() { io.grpc.MethodDescriptor< com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest, com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse> @@ -79,10 +69,7 @@ private ReportErrorsServiceGrpc() {} com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse> newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) - .setFullMethodName( - generateFullMethodName( - "google.devtools.clouderrorreporting.v1beta1.ReportErrorsService", - "ReportErrorEvent")) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ReportErrorEvent")) .setSampledToLocalTracing(true) .setRequestMarshaller( io.grpc.protobuf.ProtoUtils.marshaller( @@ -103,19 +90,43 @@ private ReportErrorsServiceGrpc() {} /** Creates a new async stub that supports all call types for the service */ public static ReportErrorsServiceStub newStub(io.grpc.Channel channel) { - return new ReportErrorsServiceStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public ReportErrorsServiceStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new ReportErrorsServiceStub(channel, callOptions); + } + }; + return ReportErrorsServiceStub.newStub(factory, channel); } /** * Creates a new blocking-style stub that supports unary and streaming output calls on the service */ public static ReportErrorsServiceBlockingStub newBlockingStub(io.grpc.Channel channel) { - return new ReportErrorsServiceBlockingStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public ReportErrorsServiceBlockingStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new ReportErrorsServiceBlockingStub(channel, callOptions); + } + }; + return ReportErrorsServiceBlockingStub.newStub(factory, channel); } /** Creates a new ListenableFuture-style stub that supports unary calls on the service */ public static ReportErrorsServiceFutureStub newFutureStub(io.grpc.Channel channel) { - return new ReportErrorsServiceFutureStub(channel); + io.grpc.stub.AbstractStub.StubFactory factory = + new io.grpc.stub.AbstractStub.StubFactory() { + @java.lang.Override + public ReportErrorsServiceFutureStub newStub( + io.grpc.Channel channel, io.grpc.CallOptions callOptions) { + return new ReportErrorsServiceFutureStub(channel, callOptions); + } + }; + return ReportErrorsServiceFutureStub.newStub(factory, channel); } /** @@ -145,14 +156,14 @@ public void reportErrorEvent( io.grpc.stub.StreamObserver< com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse> responseObserver) { - asyncUnimplementedUnaryCall(getReportErrorEventMethodHelper(), responseObserver); + asyncUnimplementedUnaryCall(getReportErrorEventMethod(), responseObserver); } @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( - getReportErrorEventMethodHelper(), + getReportErrorEventMethod(), asyncUnaryCall( new MethodHandlers< com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest, @@ -170,11 +181,7 @@ public final io.grpc.ServerServiceDefinition bindService() { * */ public static final class ReportErrorsServiceStub - extends io.grpc.stub.AbstractStub { - private ReportErrorsServiceStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractAsyncStub { private ReportErrorsServiceStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); } @@ -204,7 +211,7 @@ public void reportErrorEvent( com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse> responseObserver) { asyncUnaryCall( - getChannel().newCall(getReportErrorEventMethodHelper(), getCallOptions()), + getChannel().newCall(getReportErrorEventMethod(), getCallOptions()), request, responseObserver); } @@ -218,11 +225,7 @@ public void reportErrorEvent( * */ public static final class ReportErrorsServiceBlockingStub - extends io.grpc.stub.AbstractStub { - private ReportErrorsServiceBlockingStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractBlockingStub { private ReportErrorsServiceBlockingStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -251,7 +254,7 @@ protected ReportErrorsServiceBlockingStub build( reportErrorEvent( com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest request) { return blockingUnaryCall( - getChannel(), getReportErrorEventMethodHelper(), getCallOptions(), request); + getChannel(), getReportErrorEventMethod(), getCallOptions(), request); } } @@ -263,11 +266,7 @@ protected ReportErrorsServiceBlockingStub build( * */ public static final class ReportErrorsServiceFutureStub - extends io.grpc.stub.AbstractStub { - private ReportErrorsServiceFutureStub(io.grpc.Channel channel) { - super(channel); - } - + extends io.grpc.stub.AbstractFutureStub { private ReportErrorsServiceFutureStub( io.grpc.Channel channel, io.grpc.CallOptions callOptions) { super(channel, callOptions); @@ -297,7 +296,7 @@ protected ReportErrorsServiceFutureStub build( reportErrorEvent( com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest request) { return futureUnaryCall( - getChannel().newCall(getReportErrorEventMethodHelper(), getCallOptions()), request); + getChannel().newCall(getReportErrorEventMethod(), getCallOptions()), request); } } @@ -392,7 +391,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() { result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME) .setSchemaDescriptor(new ReportErrorsServiceFileDescriptorSupplier()) - .addMethod(getReportErrorEventMethodHelper()) + .addMethod(getReportErrorEventMethod()) .build(); } } diff --git a/pom.xml b/pom.xml index 5b05e684..ba413085 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-errorreporting-parent pom - 0.119.1-beta + 0.119.2-beta Google Cloud Error Reporting Parent https://github.com/googleapis/java-errorreporting @@ -63,15 +63,15 @@ UTF-8 github google-cloud-errorreporting-parent - 1.92.4 - 1.8.1 + 1.93.4 + 1.9.0 1.17.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 @@ -81,7 +81,7 @@ com.google.cloud google-cloud-errorreporting - 0.119.1-beta + 0.119.2-beta @@ -144,12 +144,12 @@ com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.85.1 + 0.85.2 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.85.1 + 0.85.2 @@ -221,7 +221,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 html @@ -258,4 +258,4 @@ - \ No newline at end of file + diff --git a/proto-google-cloud-error-reporting-v1beta1/pom.xml b/proto-google-cloud-error-reporting-v1beta1/pom.xml index e2c08535..583da460 100644 --- a/proto-google-cloud-error-reporting-v1beta1/pom.xml +++ b/proto-google-cloud-error-reporting-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.85.1 + 0.85.2 proto-google-cloud-error-reporting-v1beta1 PROTO library for proto-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.119.1-beta + 0.119.2-beta diff --git a/renovate.json b/renovate.json index 268a4669..f37c629f 100644 --- a/renovate.json +++ b/renovate.json @@ -54,6 +54,15 @@ "semanticCommitType": "build", "semanticCommitScope": "deps" }, + { + "packagePatterns": [ + "^com.google.cloud:google-cloud-errorreporting", + "^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..41e8d139 --- /dev/null +++ b/samples/install-without-bom/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + com.google.cloud + clouderrorreporting-install-without-bom + jar + Google Stackdriver Error Reporting Install Without Bom + https://github.com/googleapis/java-errorreporting + + + + com.google.cloud.samples + shared-configuration + 1.0.15 + + + + 1.8 + 1.8 + UTF-8 + + + + + + + com.google.cloud + google-cloud-errorreporting + 0.119.1-beta + + + + + 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..76cae229 --- /dev/null +++ b/samples/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + com.google.cloud + google-cloud-clouderrorreporting-samples + 0.0.1-SNAPSHOT + pom + Google Stackdriver Error Reporting Samples Parent + https://github.com/googleapis/java-errorreporting + + 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..cd3c1f1f --- /dev/null +++ b/samples/snapshot/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + com.google.cloud + clouderrorreporting-snapshot + jar + Google Stackdriver Error Reporting Snapshot Samples + https://github.com/googleapis/java-errorreporting + + + + com.google.cloud.samples + shared-configuration + 1.0.15 + + + + 1.8 + 1.8 + UTF-8 + + + + + + com.google.cloud + google-cloud-errorreporting + 0.119.1-beta + + + + 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..df2184d6 --- /dev/null +++ b/samples/snippets/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + com.google.cloud + clouderrorreporting-snippets + jar + Google Stackdriver Error Reporting Snippets + https://github.com/googleapis/java-errorreporting + + + + 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-errorreporting + + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + diff --git a/synth.metadata b/synth.metadata index 11711bd7..f8fae411 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,26 +1,19 @@ { - "updateTime": "2020-02-03T22:54:04.136875Z", + "updateTime": "2020-04-06T23:30:06.195417Z", "sources": [ - { - "generator": { - "name": "artman", - "version": "0.44.4", - "dockerImage": "googleapis/artman@sha256:19e945954fc960a4bdfee6cb34695898ab21a8cf0bac063ee39b91f00a1faec8" - } - }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "29d40b78e3dc1579b0b209463fbcb76e5767f72a", - "internalRef": "292979741" + "sha": "fd83ab212176a1042e8d45ea90766b3bf59ac679", + "internalRef": "302913609" } }, { - "template": { - "name": "java_library", - "origin": "synthtool.gcp", - "version": "2019.10.17" + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8" } } ], @@ -28,11 +21,10 @@ { "client": { "source": "googleapis", - "apiName": "error-reporting", + "apiName": "devtools-clouderrorreporting", "apiVersion": "v1beta1", "language": "java", - "generator": "gapic", - "config": "google/devtools/clouderrorreporting/artman_errorreporting.yaml" + "generator": "bazel" } } ] diff --git a/synth.py b/synth.py index a0fa91ff..e6cdad33 100644 --- a/synth.py +++ b/synth.py @@ -18,11 +18,12 @@ import synthtool.gcp as gcp import synthtool.languages.java as java -gapic = gcp.GAPICGenerator() +AUTOSYNTH_MULTIPLE_COMMITS = True -service = 'error-reporting' +gapic = gcp.GAPICBazel() + +service = 'devtools-clouderrorreporting' versions = ['v1beta1'] -config_pattern = '/google/devtools/clouderrorreporting/artman_errorreporting.yaml' ERROR_GROUP_OVERLOAD = """ // Inserted by synthtool to preserve backwards-compatibility @@ -64,30 +65,32 @@ library = gapic.java_library( service=service, version=version, - config_path=config_pattern.format(version=version), - artman_output_name='') + proto_path=f'google/devtools/clouderrorreporting/{version}', + bazel_target=f'//google/devtools/clouderrorreporting/{version}:google-cloud-{service}-{version}-java', + ) + + library = library / f"google-cloud-{service}-{version}-java" - package_name = f'com.google.devtools.clouderrorreporting.{version}' - java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}') - java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}', package_name) + java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}-java') + java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}-java', "") s.replace( - library / f'gapic-google-cloud-{service}-{version}/src/**/ErrorGroupServiceClient.java', + library / f'gapic-google-cloud-{service}-{version}-java/src/**/ErrorGroupServiceClient.java', ERROR_GROUP_OVERLOAD_PREVIOUS_METHOD, "\g<1>\n\n" + ERROR_GROUP_OVERLOAD ) s.replace( - library / f'gapic-google-cloud-{service}-{version}/src/**/ErrorGroupServiceClient.java', + library / f'gapic-google-cloud-{service}-{version}-java/src/**/ErrorGroupServiceClient.java', "import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupName;", "import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupName;\nimport com.google.devtools.clouderrorreporting.v1beta1.GroupName;" ) - s.copy(library / f'gapic-google-cloud-{service}-{version}/src', f'google-cloud-errorreporting/src') - s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'grpc-google-cloud-{service}-{version}/src') - s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src') + s.copy(library / f'gapic-google-cloud-{service}-{version}-java/src', f'google-cloud-errorreporting/src') + s.copy(library / f'grpc-google-cloud-{service}-{version}-java/src', f'grpc-google-cloud-error-reporting-{version}/src') + s.copy(library / f'proto-google-cloud-{service}-{version}-java/src', f'proto-google-cloud-error-reporting-{version}/src') java.format_code(f'google-cloud-errorreporting/src') - java.format_code(f'grpc-google-cloud-{service}-{version}/src') - java.format_code(f'proto-google-cloud-{service}-{version}/src') + java.format_code(f'grpc-google-cloud-error-reporting-{version}/src') + java.format_code(f'proto-google-cloud-error-reporting-{version}/src') java.common_templates() diff --git a/versions.txt b/versions.txt index f0c99944..e7bb46ba 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -grpc-google-cloud-errorreporting-v1beta1:0.85.1:0.85.1 -proto-google-cloud-errorreporting-v1beta1:0.85.1:0.85.1 -google-cloud-errorreporting:0.119.1-beta:0.119.1-beta \ No newline at end of file +grpc-google-cloud-errorreporting-v1beta1:0.85.2:0.85.2 +proto-google-cloud-errorreporting-v1beta1:0.85.2:0.85.2 +google-cloud-errorreporting:0.119.2-beta:0.119.2-beta \ No newline at end of file