diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..6137bef2 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,8 @@ +# Code owners file. +# This file controls who is tagged for review for any given pull request. + +# For syntax help see: +# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax + +# The java-samples-reviewers team is the default owner for samples changes +samples/**/*.java @googleapis/java-samples-reviewers diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 00000000..445b4bf8 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,76 @@ +on: + push: + branches: + - master + pull_request: +name: ci +jobs: + units: + runs-on: ubuntu-latest + strategy: + matrix: + java: [7, 8, 11] + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: ${{matrix.java}} + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: test + - name: coverage + uses: codecov/codecov-action@v1 + with: + name: actions ${{matrix.java}} + windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/build.bat + env: + JOB_TYPE: test + dependencies: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/dependencies.sh + linkage-monitor: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/linkage-monitor.sh + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: lint + clirr: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: clirr \ No newline at end of file diff --git a/.gitignore b/.gitignore index fadd6afc..069d08fc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ target/ # python utilities *.pyc __pycache__ + +.flattened-pom.xml diff --git a/.kokoro/build.bat b/.kokoro/build.bat index cfcd1be2..05826ad9 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,3 +1,3 @@ :: See documentation in type-shell-output.bat -"C:\Program Files\Git\bin\bash.exe" github/java-memcache/.kokoro/build.sh +"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 06f34404..5b253d5a 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -39,7 +39,7 @@ retry_with_backoff 3 10 \ # 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}) + export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi RETURN_CODE=0 @@ -51,9 +51,7 @@ test) RETURN_CODE=$? ;; lint) - mvn \ - -Penable-samples \ - com.coveo:fmt-maven-plugin:check + mvn com.coveo:fmt-maven-plugin:check RETURN_CODE=$? ;; javadoc) diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 40c4abb7..0048c8ec 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -28,14 +28,10 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-it-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" } diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index 20aabd55..f2542931 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -24,19 +24,15 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-docs-samples-service-account" } env_vars: { - key: "ENABLE_BUILD_COP" - value: "true" + key: "SECRET_MANAGER_KEYS" + value: "java-docs-samples-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" } diff --git a/.kokoro/populate-secrets.sh b/.kokoro/populate-secrets.sh new file mode 100755 index 00000000..f5251425 --- /dev/null +++ b/.kokoro/populate-secrets.sh @@ -0,0 +1,43 @@ +#!/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 now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;} +function msg { println "$*" >&2 ;} +function println { printf '%s\n' "$(now) $*" ;} + + +# Populates requested secrets set in SECRET_MANAGER_KEYS from service account: +# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com +SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" +msg "Creating folder on disk for secrets: ${SECRET_LOCATION}" +mkdir -p ${SECRET_LOCATION} +for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g") +do + msg "Retrieving secret ${key}" + docker run --entrypoint=gcloud \ + --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \ + gcr.io/google.com/cloudsdktool/cloud-sdk \ + secrets versions access latest \ + --project cloud-devrel-kokoro-resources \ + --secret ${key} > \ + "${SECRET_LOCATION}/${key}" + if [[ $? == 0 ]]; then + msg "Secret written to ${SECRET_LOCATION}/${key}" + else + msg "Error retrieving secret ${key}" + fi +done diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg index 522e5b10..dded67a9 100644 --- a/.kokoro/presubmit/integration.cfg +++ b/.kokoro/presubmit/integration.cfg @@ -24,14 +24,10 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-it-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" } diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg index 1171aead..01e09600 100644 --- a/.kokoro/presubmit/samples.cfg +++ b/.kokoro/presubmit/samples.cfg @@ -24,14 +24,10 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-docs-samples-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } -} +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-docs-samples-service-account" +} \ No newline at end of file diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index ba17ce01..9da0f839 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -21,4 +21,6 @@ function cleanup() { echo "cleanup"; } trap cleanup EXIT + +$(dirname $0)/populate-secrets.sh # Secret Manager secrets. python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" diff --git a/CHANGELOG.md b/CHANGELOG.md index d4d3859e..9d50a3b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,35 @@ # Changelog +## [0.2.0](https://www.github.com/googleapis/java-memcache/compare/v0.1.2...v0.2.0) (2020-06-22) + + +### Features + +* **deps:** adopt flatten plugin and google-cloud-shared-dependencies ([#102](https://www.github.com/googleapis/java-memcache/issues/102)) ([c8f29cf](https://www.github.com/googleapis/java-memcache/commit/c8f29cf5740213869d612e2d54816a56339b8d69)) + + +### Bug Fixes + +* migrate memcache/v1beta2 to grpc_service_config ([#97](https://www.github.com/googleapis/java-memcache/issues/97)) ([b311cec](https://www.github.com/googleapis/java-memcache/commit/b311cec81d8561f6e759edd658af78bac362fb85)) + + +### Dependencies + +* update dependency com.google.api:api-common to v1.9.1 ([#74](https://www.github.com/googleapis/java-memcache/issues/74)) ([5ce0c92](https://www.github.com/googleapis/java-memcache/commit/5ce0c9209c405f895be38c2af8d4f3583db61cb1)) +* update dependency com.google.api:api-common to v1.9.2 ([#85](https://www.github.com/googleapis/java-memcache/issues/85)) ([c64a289](https://www.github.com/googleapis/java-memcache/commit/c64a28915bae2f4188bf515202597cc1191831e5)) +* update dependency com.google.api.grpc:proto-google-common-protos to v1.18.0 ([#63](https://www.github.com/googleapis/java-memcache/issues/63)) ([e9b2486](https://www.github.com/googleapis/java-memcache/commit/e9b248690d27dd1c8e870759279c25f367405dbf)) +* update dependency com.google.cloud:google-cloud-core to v1.93.5 ([#75](https://www.github.com/googleapis/java-memcache/issues/75)) ([eecfe8a](https://www.github.com/googleapis/java-memcache/commit/eecfe8a7446636ebbba8ede7a0d9f17fd67478cc)) +* update dependency com.google.protobuf:protobuf-java to v3.12.0 ([#67](https://www.github.com/googleapis/java-memcache/issues/67)) ([598e994](https://www.github.com/googleapis/java-memcache/commit/598e994e6e3691bb429bb294f0e3a459b9c36a89)) +* update dependency com.google.protobuf:protobuf-java to v3.12.2 ([#72](https://www.github.com/googleapis/java-memcache/issues/72)) ([a7fae5a](https://www.github.com/googleapis/java-memcache/commit/a7fae5a645ec7b0e4f46eb831c41515c0c71cf64)) +* update dependency io.grpc:grpc-bom to v1.29.0 ([#53](https://www.github.com/googleapis/java-memcache/issues/53)) ([73bb1e3](https://www.github.com/googleapis/java-memcache/commit/73bb1e3ac64a02f51be9920783d1a14519478b2a)) +* update dependency io.grpc:grpc-bom to v1.30.0 ([#90](https://www.github.com/googleapis/java-memcache/issues/90)) ([dab0eb6](https://www.github.com/googleapis/java-memcache/commit/dab0eb60ed23f7bd00961cf5e28d79aa2f53f18c)) +* update dependency org.threeten:threetenbp to v1.4.4 ([#59](https://www.github.com/googleapis/java-memcache/issues/59)) ([2a99c8a](https://www.github.com/googleapis/java-memcache/commit/2a99c8aa4097157e7c1959a2f6bc442d261f1b79)) + + +### Documentation + +* Change relative URLs to absolute URLs to fix broken links. ([#94](https://www.github.com/googleapis/java-memcache/issues/94)) ([d807788](https://www.github.com/googleapis/java-memcache/commit/d80778819479c5736a9d704fe86c175ed469768f)) + ### [0.1.2](https://www.github.com/googleapis/java-memcache/compare/v0.1.1...v0.1.2) (2020-04-20) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 085021dd..f2dbdee0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -99,7 +99,16 @@ mvn -Penable-samples clean verify ``` 2. [Activate](#profile-activation) the profile. -3. Define your samples in a normal Maven project in the `samples/` directory +3. Define your samples in a normal Maven project in the `samples/` directory. + +### Code Formatting + +Code in this repo is formatted with +[google-java-format](https://github.com/google/google-java-format). +To run formatting on your project, you can run: +``` +mvn com.coveo:fmt-maven-plugin:format +``` ### Profile Activation diff --git a/README.md b/README.md index 55254a84..3c0ec84a 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 - 5.1.0 + 5.7.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-memcache - 0.1.1 + 0.1.2 ``` @@ -50,11 +50,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-memcache:0.1.2' +compile 'com.google.cloud:google-cloud-memcache:0.2.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-memcache" % "0.1.2" +libraryDependencies += "com.google.cloud" % "google-cloud-memcache" % "0.2.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-memcache-bom/pom.xml b/google-cloud-memcache-bom/pom.xml index 6287625d..da4308db 100644 --- a/google-cloud-memcache-bom/pom.xml +++ b/google-cloud-memcache-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-memcache-bom - 0.1.2 + 0.2.0 pom com.google.cloud google-cloud-shared-config - 0.5.0 + 0.8.1 Google Cloud Memcache BOM @@ -39,6 +39,10 @@ https://github.com/googleapis/java-memcache + + true + + sonatype-nexus-snapshots @@ -63,17 +67,17 @@ com.google.api.grpc proto-google-cloud-memcache-v1beta2 - 0.1.2 + 0.2.0 com.google.api.grpc grpc-google-cloud-memcache-v1beta2 - 0.1.2 + 0.2.0 com.google.cloud google-cloud-memcache - 0.1.2 + 0.2.0 diff --git a/google-cloud-memcache/pom.xml b/google-cloud-memcache/pom.xml index 5d67a9bc..3ff168e6 100644 --- a/google-cloud-memcache/pom.xml +++ b/google-cloud-memcache/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-memcache - 0.1.2 + 0.2.0 jar Google Cloud Memcache https://github.com/googleapis/java-memcache @@ -11,7 +11,7 @@ com.google.cloud google-cloud-memcache-parent - 0.1.2 + 0.2.0 google-cloud-memcache @@ -96,4 +96,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/google-cloud-memcache/src/main/java/com/google/cloud/memcache/v1beta2/stub/CloudMemcacheStubSettings.java b/google-cloud-memcache/src/main/java/com/google/cloud/memcache/v1beta2/stub/CloudMemcacheStubSettings.java index 875a6627..96cfaebb 100644 --- a/google-cloud-memcache/src/main/java/com/google/cloud/memcache/v1beta2/stub/CloudMemcacheStubSettings.java +++ b/google-cloud-memcache/src/main/java/com/google/cloud/memcache/v1beta2/stub/CloudMemcacheStubSettings.java @@ -365,12 +365,9 @@ public static class Builder extends StubSettings.Builder> definitions = ImmutableMap.builder(); + definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.newArrayList())); definitions.put( - "idempotent", - ImmutableSet.copyOf( - Lists.newArrayList( - StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE))); - definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList())); + "no_retry_1_codes", ImmutableSet.copyOf(Lists.newArrayList())); RETRYABLE_CODE_DEFINITIONS = definitions.build(); } @@ -379,17 +376,16 @@ public static class Builder extends StubSettings.Builder definitions = ImmutableMap.builder(); RetrySettings settings = null; + settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build(); + definitions.put("no_retry_params", settings); settings = RetrySettings.newBuilder() - .setInitialRetryDelay(Duration.ofMillis(100L)) - .setRetryDelayMultiplier(1.3) - .setMaxRetryDelay(Duration.ofMillis(60000L)) - .setInitialRpcTimeout(Duration.ofMillis(20000L)) + .setInitialRpcTimeout(Duration.ofMillis(1200000L)) .setRpcTimeoutMultiplier(1.0) - .setMaxRpcTimeout(Duration.ofMillis(20000L)) - .setTotalTimeout(Duration.ofMillis(600000L)) + .setMaxRpcTimeout(Duration.ofMillis(1200000L)) + .setTotalTimeout(Duration.ofMillis(1200000L)) .build(); - definitions.put("default", settings); + definitions.put("no_retry_1_params", settings); RETRY_PARAM_DEFINITIONS = definitions.build(); } @@ -450,45 +446,45 @@ private static Builder initDefaults(Builder builder) { builder .listInstancesSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); builder .getInstanceSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); builder .createInstanceSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); builder .updateInstanceSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); builder .updateParametersSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); builder .deleteInstanceSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); builder .applyParametersSettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")); builder .createInstanceOperationSettings() .setInitialCallSettings( UnaryCallSettings .newUnaryCallSettingsBuilder() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")) + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")) .build()) .setResponseTransformer( ProtoOperationTransformers.ResponseTransformer.create(Instance.class)) @@ -510,8 +506,8 @@ private static Builder initDefaults(Builder builder) { .setInitialCallSettings( UnaryCallSettings .newUnaryCallSettingsBuilder() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")) + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")) .build()) .setResponseTransformer( ProtoOperationTransformers.ResponseTransformer.create(Instance.class)) @@ -533,8 +529,8 @@ private static Builder initDefaults(Builder builder) { .setInitialCallSettings( UnaryCallSettings .newUnaryCallSettingsBuilder() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")) + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")) .build()) .setResponseTransformer( ProtoOperationTransformers.ResponseTransformer.create(Instance.class)) @@ -556,8 +552,8 @@ private static Builder initDefaults(Builder builder) { .setInitialCallSettings( UnaryCallSettings .newUnaryCallSettingsBuilder() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")) + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")) .build()) .setResponseTransformer( ProtoOperationTransformers.ResponseTransformer.create(Empty.class)) @@ -579,8 +575,8 @@ private static Builder initDefaults(Builder builder) { .setInitialCallSettings( UnaryCallSettings .newUnaryCallSettingsBuilder() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")) + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params")) .build()) .setResponseTransformer( ProtoOperationTransformers.ResponseTransformer.create(Instance.class)) diff --git a/grpc-google-cloud-memcache-v1beta2/pom.xml b/grpc-google-cloud-memcache-v1beta2/pom.xml index a3bdcf88..43202f87 100644 --- a/grpc-google-cloud-memcache-v1beta2/pom.xml +++ b/grpc-google-cloud-memcache-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-memcache-v1beta2 - 0.1.2 + 0.2.0 grpc-google-cloud-memcache-v1beta2 GRPC library for grpc-google-cloud-memcache-v1beta2 com.google.cloud google-cloud-memcache-parent - 0.1.2 + 0.2.0 @@ -57,4 +57,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index fe7654cf..bd548d92 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-memcache-parent pom - 0.1.2 + 0.2.0 Google Cloud Memcache Parent https://github.com/googleapis/java-memcache @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.5.0 + 0.8.1 @@ -63,17 +63,6 @@ UTF-8 github google-cloud-memcache-parent - 1.93.4 - 1.9.0 - 1.17.0 - 1.56.0 - 1.28.1 - 3.11.4 - 4.13 - 29.0-android - 1.4.3 - 1.3.2 - 1.18 @@ -81,93 +70,31 @@ com.google.api.grpc proto-google-cloud-memcache-v1beta2 - 0.1.2 + 0.2.0 com.google.api.grpc grpc-google-cloud-memcache-v1beta2 - 0.1.2 + 0.2.0 com.google.cloud google-cloud-memcache - 0.1.2 + 0.2.0 - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - com.google.api - gax-bom - ${gax.version} - pom - import - - - com.google.guava - guava-bom - ${guava.version} + com.google.cloud + google-cloud-shared-dependencies + 0.8.1 pom import - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.api - api-common - ${google.api-common.version} - - - com.google.api.grpc - proto-google-common-protos - ${google.common-protos.version} - - - com.google.cloud - google-cloud-core - ${google.core.version} - - - org.threeten - threetenbp - ${threeten.version} - - - javax.annotation - javax.annotation-api - ${javax.annotations.version} - - - org.codehaus.mojo - animal-sniffer-annotations - ${animal-sniffer.version} - - - com.google.api.grpc - proto-google-iam-v1 - 0.13.0 - - junit junit - ${junit.version} - test - - - com.google.api - gax-grpc - ${gax.version} - testlib + 4.13 test @@ -199,7 +126,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.0 @@ -257,7 +184,7 @@ https://developers.google.com/protocol-buffers/docs/reference/java/ https://googleapis.dev/java/google-auth-library/latest/ https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ + https://googleapis.github.io/api-common-java/ diff --git a/proto-google-cloud-memcache-v1beta2/pom.xml b/proto-google-cloud-memcache-v1beta2/pom.xml index c1715f00..44fdfa6c 100644 --- a/proto-google-cloud-memcache-v1beta2/pom.xml +++ b/proto-google-cloud-memcache-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-memcache-v1beta2 - 0.1.2 + 0.2.0 proto-google-cloud-memcache-v1beta2beta1 PROTO library for proto-google-cloud-memcache-v1beta2 com.google.cloud google-cloud-memcache-parent - 0.1.2 + 0.2.0 @@ -30,4 +30,13 @@ api-common + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ApplyParametersRequest.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ApplyParametersRequest.java index d567c473..86065929 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ApplyParametersRequest.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ApplyParametersRequest.java @@ -147,6 +147,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The name. */ + @java.lang.Override public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -172,6 +173,7 @@ public java.lang.String getName() { * * @return The bytes for name. */ + @java.lang.Override public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -260,6 +262,7 @@ public com.google.protobuf.ByteString getNodeIdsBytes(int index) { * * @return The applyAll. */ + @java.lang.Override public boolean getApplyAll() { return applyAll_; } @@ -937,6 +940,7 @@ public Builder addNodeIdsBytes(com.google.protobuf.ByteString value) { * * @return The applyAll. */ + @java.lang.Override public boolean getApplyAll() { return applyAll_; } diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/CreateInstanceRequest.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/CreateInstanceRequest.java index b2f21a4f..6b918c56 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/CreateInstanceRequest.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/CreateInstanceRequest.java @@ -152,6 +152,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The parent. */ + @java.lang.Override public java.lang.String getParent() { java.lang.Object ref = parent_; if (ref instanceof java.lang.String) { @@ -178,6 +179,7 @@ public java.lang.String getParent() { * * @return The bytes for parent. */ + @java.lang.Override public com.google.protobuf.ByteString getParentBytes() { java.lang.Object ref = parent_; if (ref instanceof java.lang.String) { @@ -209,6 +211,7 @@ public com.google.protobuf.ByteString getParentBytes() { * * @return The instanceId. */ + @java.lang.Override public java.lang.String getInstanceId() { java.lang.Object ref = instanceId_; if (ref instanceof java.lang.String) { @@ -237,6 +240,7 @@ public java.lang.String getInstanceId() { * * @return The bytes for instanceId. */ + @java.lang.Override public com.google.protobuf.ByteString getInstanceIdBytes() { java.lang.Object ref = instanceId_; if (ref instanceof java.lang.String) { @@ -264,6 +268,7 @@ public com.google.protobuf.ByteString getInstanceIdBytes() { * * @return Whether the resource field is set. */ + @java.lang.Override public boolean hasResource() { return resource_ != null; } @@ -280,6 +285,7 @@ public boolean hasResource() { * * @return The resource. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance getResource() { return resource_ == null ? com.google.cloud.memcache.v1beta2.Instance.getDefaultInstance() @@ -296,6 +302,7 @@ public com.google.cloud.memcache.v1beta2.Instance getResource() { * .google.cloud.memcache.v1beta2.Instance resource = 3 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.InstanceOrBuilder getResourceOrBuilder() { return getResource(); } diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/DeleteInstanceRequest.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/DeleteInstanceRequest.java index d1a92c85..a674f670 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/DeleteInstanceRequest.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/DeleteInstanceRequest.java @@ -126,6 +126,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The name. */ + @java.lang.Override public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -150,6 +151,7 @@ public java.lang.String getName() { * * @return The bytes for name. */ + @java.lang.Override public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/GetInstanceRequest.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/GetInstanceRequest.java index 4c3575ba..8fe03e8a 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/GetInstanceRequest.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/GetInstanceRequest.java @@ -128,6 +128,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The name. */ + @java.lang.Override public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -154,6 +155,7 @@ public java.lang.String getName() { * * @return The bytes for name. */ + @java.lang.Override public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/Instance.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/Instance.java index e8e327d7..491a3398 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/Instance.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/Instance.java @@ -459,6 +459,10 @@ public State findValueByNumber(int number) { }; public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } return getDescriptor().getValues().get(ordinal()); } @@ -629,6 +633,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The cpuCount. */ + @java.lang.Override public int getCpuCount() { return cpuCount_; } @@ -646,6 +651,7 @@ public int getCpuCount() { * * @return The memorySizeMb. */ + @java.lang.Override public int getMemorySizeMb() { return memorySizeMb_; } @@ -999,6 +1005,7 @@ public Builder mergeFrom( * * @return The cpuCount. */ + @java.lang.Override public int getCpuCount() { return cpuCount_; } @@ -1050,6 +1057,7 @@ public Builder clearCpuCount() { * * @return The memorySizeMb. */ + @java.lang.Override public int getMemorySizeMb() { return memorySizeMb_; } @@ -1599,6 +1607,10 @@ public State findValueByNumber(int number) { }; public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } return getDescriptor().getValues().get(ordinal()); } @@ -1647,6 +1659,7 @@ private State(int value) { * * @return The nodeId. */ + @java.lang.Override public java.lang.String getNodeId() { java.lang.Object ref = nodeId_; if (ref instanceof java.lang.String) { @@ -1670,6 +1683,7 @@ public java.lang.String getNodeId() { * * @return The bytes for nodeId. */ + @java.lang.Override public com.google.protobuf.ByteString getNodeIdBytes() { java.lang.Object ref = nodeId_; if (ref instanceof java.lang.String) { @@ -1695,6 +1709,7 @@ public com.google.protobuf.ByteString getNodeIdBytes() { * * @return The zone. */ + @java.lang.Override public java.lang.String getZone() { java.lang.Object ref = zone_; if (ref instanceof java.lang.String) { @@ -1717,6 +1732,7 @@ public java.lang.String getZone() { * * @return The bytes for zone. */ + @java.lang.Override public com.google.protobuf.ByteString getZoneBytes() { java.lang.Object ref = zone_; if (ref instanceof java.lang.String) { @@ -1744,6 +1760,7 @@ public com.google.protobuf.ByteString getZoneBytes() { * * @return The enum numeric value on the wire for state. */ + @java.lang.Override public int getStateValue() { return state_; } @@ -1760,6 +1777,7 @@ public int getStateValue() { * * @return The state. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.Node.State getState() { @SuppressWarnings("deprecation") com.google.cloud.memcache.v1beta2.Instance.Node.State result = @@ -1783,6 +1801,7 @@ public com.google.cloud.memcache.v1beta2.Instance.Node.State getState() { * * @return The host. */ + @java.lang.Override public java.lang.String getHost() { java.lang.Object ref = host_; if (ref instanceof java.lang.String) { @@ -1806,6 +1825,7 @@ public java.lang.String getHost() { * * @return The bytes for host. */ + @java.lang.Override public com.google.protobuf.ByteString getHostBytes() { java.lang.Object ref = host_; if (ref instanceof java.lang.String) { @@ -1831,6 +1851,7 @@ public com.google.protobuf.ByteString getHostBytes() { * * @return The port. */ + @java.lang.Override public int getPort() { return port_; } @@ -1848,6 +1869,7 @@ public int getPort() { * * @return Whether the parameters field is set. */ + @java.lang.Override public boolean hasParameters() { return parameters_ != null; } @@ -1862,6 +1884,7 @@ public boolean hasParameters() { * * @return The parameters. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.MemcacheParameters getParameters() { return parameters_ == null ? com.google.cloud.memcache.v1beta2.MemcacheParameters.getDefaultInstance() @@ -1876,6 +1899,7 @@ public com.google.cloud.memcache.v1beta2.MemcacheParameters getParameters() { * * .google.cloud.memcache.v1beta2.MemcacheParameters parameters = 6; */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.MemcacheParametersOrBuilder getParametersOrBuilder() { return getParameters(); } @@ -2517,6 +2541,7 @@ public Builder setZoneBytes(com.google.protobuf.ByteString value) { * * @return The enum numeric value on the wire for state. */ + @java.lang.Override public int getStateValue() { return state_; } @@ -2535,6 +2560,7 @@ public int getStateValue() { * @return This builder for chaining. */ public Builder setStateValue(int value) { + state_ = value; onChanged(); return this; @@ -2552,6 +2578,7 @@ public Builder setStateValue(int value) { * * @return The state. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.Node.State getState() { @SuppressWarnings("deprecation") com.google.cloud.memcache.v1beta2.Instance.Node.State result = @@ -2726,6 +2753,7 @@ public Builder setHostBytes(com.google.protobuf.ByteString value) { * * @return The port. */ + @java.lang.Override public int getPort() { return port_; } @@ -3243,6 +3271,10 @@ public Code findValueByNumber(int number) { }; public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } return getDescriptor().getValues().get(ordinal()); } @@ -3290,6 +3322,7 @@ private Code(int value) { * * @return The enum numeric value on the wire for code. */ + @java.lang.Override public int getCodeValue() { return code_; } @@ -3304,6 +3337,7 @@ public int getCodeValue() { * * @return The code. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.InstanceMessage.Code getCode() { @SuppressWarnings("deprecation") com.google.cloud.memcache.v1beta2.Instance.InstanceMessage.Code result = @@ -3326,6 +3360,7 @@ public com.google.cloud.memcache.v1beta2.Instance.InstanceMessage.Code getCode() * * @return The message. */ + @java.lang.Override public java.lang.String getMessage() { java.lang.Object ref = message_; if (ref instanceof java.lang.String) { @@ -3348,6 +3383,7 @@ public java.lang.String getMessage() { * * @return The bytes for message. */ + @java.lang.Override public com.google.protobuf.ByteString getMessageBytes() { java.lang.Object ref = message_; if (ref instanceof java.lang.String) { @@ -3708,6 +3744,7 @@ public Builder mergeFrom( * * @return The enum numeric value on the wire for code. */ + @java.lang.Override public int getCodeValue() { return code_; } @@ -3724,6 +3761,7 @@ public int getCodeValue() { * @return This builder for chaining. */ public Builder setCodeValue(int value) { + code_ = value; onChanged(); return this; @@ -3739,6 +3777,7 @@ public Builder setCodeValue(int value) { * * @return The code. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.InstanceMessage.Code getCode() { @SuppressWarnings("deprecation") com.google.cloud.memcache.v1beta2.Instance.InstanceMessage.Code result = @@ -3965,6 +4004,7 @@ public com.google.cloud.memcache.v1beta2.Instance.InstanceMessage getDefaultInst * * @return The name. */ + @java.lang.Override public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -3993,6 +4033,7 @@ public java.lang.String getName() { * * @return The bytes for name. */ + @java.lang.Override public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -4019,6 +4060,7 @@ public com.google.protobuf.ByteString getNameBytes() { * * @return The displayName. */ + @java.lang.Override public java.lang.String getDisplayName() { java.lang.Object ref = displayName_; if (ref instanceof java.lang.String) { @@ -4042,6 +4084,7 @@ public java.lang.String getDisplayName() { * * @return The bytes for displayName. */ + @java.lang.Override public com.google.protobuf.ByteString getDisplayNameBytes() { java.lang.Object ref = displayName_; if (ref instanceof java.lang.String) { @@ -4090,6 +4133,7 @@ public int getLabelsCount() { * * map<string, string> labels = 3; */ + @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); @@ -4097,6 +4141,7 @@ public boolean containsLabels(java.lang.String key) { return internalGetLabels().getMap().containsKey(key); } /** Use {@link #getLabelsMap()} instead. */ + @java.lang.Override @java.lang.Deprecated public java.util.Map getLabels() { return getLabelsMap(); @@ -4112,6 +4157,7 @@ public java.util.Map getLabels() { * * map<string, string> labels = 3; */ + @java.lang.Override public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } @@ -4126,6 +4172,7 @@ public java.util.Map getLabelsMap() { * * map<string, string> labels = 3; */ + @java.lang.Override public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) { if (key == null) { throw new java.lang.NullPointerException(); @@ -4144,6 +4191,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin * * map<string, string> labels = 3; */ + @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); @@ -4162,7 +4210,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { * * 
    * Optional. The full name of the Google Compute Engine
-   * [network](/compute/docs/networks-and-firewalls#networks) to which the
+   * [network](https://cloud.google.com/vpc/docs/vpc) to which the
    * instance is connected. If left unspecified, the `default` network
    * will be used.
    *
@@ -4171,6 +4219,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { * * @return The authorizedNetwork. */ + @java.lang.Override public java.lang.String getAuthorizedNetwork() { java.lang.Object ref = authorizedNetwork_; if (ref instanceof java.lang.String) { @@ -4187,7 +4236,7 @@ public java.lang.String getAuthorizedNetwork() { * * 
    * Optional. The full name of the Google Compute Engine
-   * [network](/compute/docs/networks-and-firewalls#networks) to which the
+   * [network](https://cloud.google.com/vpc/docs/vpc) to which the
    * instance is connected. If left unspecified, the `default` network
    * will be used.
    *
@@ -4196,6 +4245,7 @@ public java.lang.String getAuthorizedNetwork() { * * @return The bytes for authorizedNetwork. */ + @java.lang.Override public com.google.protobuf.ByteString getAuthorizedNetworkBytes() { java.lang.Object ref = authorizedNetwork_; if (ref instanceof java.lang.String) { @@ -4294,6 +4344,7 @@ public com.google.protobuf.ByteString getZonesBytes(int index) { * * @return The nodeCount. */ + @java.lang.Override public int getNodeCount() { return nodeCount_; } @@ -4313,6 +4364,7 @@ public int getNodeCount() { * * @return Whether the nodeConfig field is set. */ + @java.lang.Override public boolean hasNodeConfig() { return nodeConfig_ != null; } @@ -4329,6 +4381,7 @@ public boolean hasNodeConfig() { * * @return The nodeConfig. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.NodeConfig getNodeConfig() { return nodeConfig_ == null ? com.google.cloud.memcache.v1beta2.Instance.NodeConfig.getDefaultInstance() @@ -4345,6 +4398,7 @@ public com.google.cloud.memcache.v1beta2.Instance.NodeConfig getNodeConfig() { * .google.cloud.memcache.v1beta2.Instance.NodeConfig node_config = 7 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.NodeConfigOrBuilder getNodeConfigOrBuilder() { return getNodeConfig(); } @@ -4366,6 +4420,7 @@ public com.google.cloud.memcache.v1beta2.Instance.NodeConfigOrBuilder getNodeCon * * @return The enum numeric value on the wire for memcacheVersion. */ + @java.lang.Override public int getMemcacheVersionValue() { return memcacheVersion_; } @@ -4384,6 +4439,7 @@ public int getMemcacheVersionValue() { * * @return The memcacheVersion. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.MemcacheVersion getMemcacheVersion() { @SuppressWarnings("deprecation") com.google.cloud.memcache.v1beta2.MemcacheVersion result = @@ -4405,6 +4461,7 @@ public com.google.cloud.memcache.v1beta2.MemcacheVersion getMemcacheVersion() { * * @return Whether the parameters field is set. */ + @java.lang.Override public boolean hasParameters() { return parameters_ != null; } @@ -4420,6 +4477,7 @@ public boolean hasParameters() { * * @return The parameters. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.MemcacheParameters getParameters() { return parameters_ == null ? com.google.cloud.memcache.v1beta2.MemcacheParameters.getDefaultInstance() @@ -4435,6 +4493,7 @@ public com.google.cloud.memcache.v1beta2.MemcacheParameters getParameters() { * * .google.cloud.memcache.v1beta2.MemcacheParameters parameters = 11; */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.MemcacheParametersOrBuilder getParametersOrBuilder() { return getParameters(); } @@ -4453,6 +4512,7 @@ public com.google.cloud.memcache.v1beta2.MemcacheParametersOrBuilder getParamete * repeated .google.cloud.memcache.v1beta2.Instance.Node memcache_nodes = 12 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public java.util.List getMemcacheNodesList() { return memcacheNodes_; } @@ -4468,6 +4528,7 @@ public java.util.List getMemcac * repeated .google.cloud.memcache.v1beta2.Instance.Node memcache_nodes = 12 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public java.util.List getMemcacheNodesOrBuilderList() { return memcacheNodes_; @@ -4484,6 +4545,7 @@ public java.util.List getMemcac * repeated .google.cloud.memcache.v1beta2.Instance.Node memcache_nodes = 12 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public int getMemcacheNodesCount() { return memcacheNodes_.size(); } @@ -4499,6 +4561,7 @@ public int getMemcacheNodesCount() { * repeated .google.cloud.memcache.v1beta2.Instance.Node memcache_nodes = 12 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.Node getMemcacheNodes(int index) { return memcacheNodes_.get(index); } @@ -4514,6 +4577,7 @@ public com.google.cloud.memcache.v1beta2.Instance.Node getMemcacheNodes(int inde * repeated .google.cloud.memcache.v1beta2.Instance.Node memcache_nodes = 12 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.NodeOrBuilder getMemcacheNodesOrBuilder( int index) { return memcacheNodes_.get(index); @@ -4533,6 +4597,7 @@ public com.google.cloud.memcache.v1beta2.Instance.NodeOrBuilder getMemcacheNodes * * @return Whether the createTime field is set. */ + @java.lang.Override public boolean hasCreateTime() { return createTime_ != null; } @@ -4548,6 +4613,7 @@ public boolean hasCreateTime() { * * @return The createTime. */ + @java.lang.Override public com.google.protobuf.Timestamp getCreateTime() { return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } @@ -4561,6 +4627,7 @@ public com.google.protobuf.Timestamp getCreateTime() { * .google.protobuf.Timestamp create_time = 13 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return getCreateTime(); } @@ -4579,6 +4646,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * * @return Whether the updateTime field is set. */ + @java.lang.Override public boolean hasUpdateTime() { return updateTime_ != null; } @@ -4594,6 +4662,7 @@ public boolean hasUpdateTime() { * * @return The updateTime. */ + @java.lang.Override public com.google.protobuf.Timestamp getUpdateTime() { return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } @@ -4607,6 +4676,7 @@ public com.google.protobuf.Timestamp getUpdateTime() { * .google.protobuf.Timestamp update_time = 14 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { return getUpdateTime(); } @@ -4626,6 +4696,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { * * @return The enum numeric value on the wire for state. */ + @java.lang.Override public int getStateValue() { return state_; } @@ -4642,6 +4713,7 @@ public int getStateValue() { * * @return The state. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.State getState() { @SuppressWarnings("deprecation") com.google.cloud.memcache.v1beta2.Instance.State result = @@ -4665,6 +4737,7 @@ public com.google.cloud.memcache.v1beta2.Instance.State getState() { * * @return The memcacheFullVersion. */ + @java.lang.Override public java.lang.String getMemcacheFullVersion() { java.lang.Object ref = memcacheFullVersion_; if (ref instanceof java.lang.String) { @@ -4690,6 +4763,7 @@ public java.lang.String getMemcacheFullVersion() { * * @return The bytes for memcacheFullVersion. */ + @java.lang.Override public com.google.protobuf.ByteString getMemcacheFullVersionBytes() { java.lang.Object ref = memcacheFullVersion_; if (ref instanceof java.lang.String) { @@ -4715,6 +4789,7 @@ public com.google.protobuf.ByteString getMemcacheFullVersionBytes() { * repeated .google.cloud.memcache.v1beta2.Instance.InstanceMessage instance_messages = 19; * */ + @java.lang.Override public java.util.List getInstanceMessagesList() { return instanceMessages_; @@ -4729,6 +4804,7 @@ public com.google.protobuf.ByteString getMemcacheFullVersionBytes() { * repeated .google.cloud.memcache.v1beta2.Instance.InstanceMessage instance_messages = 19; * */ + @java.lang.Override public java.util.List< ? extends com.google.cloud.memcache.v1beta2.Instance.InstanceMessageOrBuilder> getInstanceMessagesOrBuilderList() { @@ -4744,6 +4820,7 @@ public com.google.protobuf.ByteString getMemcacheFullVersionBytes() { * repeated .google.cloud.memcache.v1beta2.Instance.InstanceMessage instance_messages = 19; * */ + @java.lang.Override public int getInstanceMessagesCount() { return instanceMessages_.size(); } @@ -4757,6 +4834,7 @@ public int getInstanceMessagesCount() { * repeated .google.cloud.memcache.v1beta2.Instance.InstanceMessage instance_messages = 19; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.InstanceMessage getInstanceMessages(int index) { return instanceMessages_.get(index); } @@ -4770,6 +4848,7 @@ public com.google.cloud.memcache.v1beta2.Instance.InstanceMessage getInstanceMes * repeated .google.cloud.memcache.v1beta2.Instance.InstanceMessage instance_messages = 19; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.InstanceMessageOrBuilder getInstanceMessagesOrBuilder(int index) { return instanceMessages_.get(index); @@ -4788,6 +4867,7 @@ public com.google.cloud.memcache.v1beta2.Instance.InstanceMessage getInstanceMes * * @return The discoveryEndpoint. */ + @java.lang.Override public java.lang.String getDiscoveryEndpoint() { java.lang.Object ref = discoveryEndpoint_; if (ref instanceof java.lang.String) { @@ -4810,6 +4890,7 @@ public java.lang.String getDiscoveryEndpoint() { * * @return The bytes for discoveryEndpoint. */ + @java.lang.Override public com.google.protobuf.ByteString getDiscoveryEndpointBytes() { java.lang.Object ref = discoveryEndpoint_; if (ref instanceof java.lang.String) { @@ -5825,6 +5906,7 @@ public int getLabelsCount() { * * map<string, string> labels = 3; */ + @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); @@ -5832,6 +5914,7 @@ public boolean containsLabels(java.lang.String key) { return internalGetLabels().getMap().containsKey(key); } /** Use {@link #getLabelsMap()} instead. */ + @java.lang.Override @java.lang.Deprecated public java.util.Map getLabels() { return getLabelsMap(); @@ -5847,6 +5930,7 @@ public java.util.Map getLabels() { * * map<string, string> labels = 3; */ + @java.lang.Override public java.util.Map getLabelsMap() { return internalGetLabels().getMap(); } @@ -5861,6 +5945,7 @@ public java.util.Map getLabelsMap() { * * map<string, string> labels = 3; */ + @java.lang.Override public java.lang.String getLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { @@ -5880,6 +5965,7 @@ public java.lang.String getLabelsOrDefault( * * map<string, string> labels = 3; */ + @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); @@ -5961,7 +6047,7 @@ public Builder putAllLabels(java.util.Map va * * 
      * Optional. The full name of the Google Compute Engine
-     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * [network](https://cloud.google.com/vpc/docs/vpc) to which the
      * instance is connected. If left unspecified, the `default` network
      * will be used.
      *
@@ -5986,7 +6072,7 @@ public java.lang.String getAuthorizedNetwork() { * * 
      * Optional. The full name of the Google Compute Engine
-     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * [network](https://cloud.google.com/vpc/docs/vpc) to which the
      * instance is connected. If left unspecified, the `default` network
      * will be used.
      *
@@ -6011,7 +6097,7 @@ public com.google.protobuf.ByteString getAuthorizedNetworkBytes() { * * 
      * Optional. The full name of the Google Compute Engine
-     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * [network](https://cloud.google.com/vpc/docs/vpc) to which the
      * instance is connected. If left unspecified, the `default` network
      * will be used.
      *
@@ -6035,7 +6121,7 @@ public Builder setAuthorizedNetwork(java.lang.String value) { * * 
      * Optional. The full name of the Google Compute Engine
-     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * [network](https://cloud.google.com/vpc/docs/vpc) to which the
      * instance is connected. If left unspecified, the `default` network
      * will be used.
      *
@@ -6055,7 +6141,7 @@ public Builder clearAuthorizedNetwork() { * * 
      * Optional. The full name of the Google Compute Engine
-     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * [network](https://cloud.google.com/vpc/docs/vpc) to which the
      * instance is connected. If left unspecified, the `default` network
      * will be used.
      *
@@ -6283,6 +6369,7 @@ public Builder addZonesBytes(com.google.protobuf.ByteString value) { * * @return The nodeCount. */ + @java.lang.Override public int getNodeCount() { return nodeCount_; } @@ -6542,6 +6629,7 @@ public com.google.cloud.memcache.v1beta2.Instance.NodeConfigOrBuilder getNodeCon * * @return The enum numeric value on the wire for memcacheVersion. */ + @java.lang.Override public int getMemcacheVersionValue() { return memcacheVersion_; } @@ -6562,6 +6650,7 @@ public int getMemcacheVersionValue() { * @return This builder for chaining. */ public Builder setMemcacheVersionValue(int value) { + memcacheVersion_ = value; onChanged(); return this; @@ -6581,6 +6670,7 @@ public Builder setMemcacheVersionValue(int value) { * * @return The memcacheVersion. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.MemcacheVersion getMemcacheVersion() { @SuppressWarnings("deprecation") com.google.cloud.memcache.v1beta2.MemcacheVersion result = @@ -7661,6 +7751,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { * * @return The enum numeric value on the wire for state. */ + @java.lang.Override public int getStateValue() { return state_; } @@ -7679,6 +7770,7 @@ public int getStateValue() { * @return This builder for chaining. */ public Builder setStateValue(int value) { + state_ = value; onChanged(); return this; @@ -7696,6 +7788,7 @@ public Builder setStateValue(int value) { * * @return The state. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance.State getState() { @SuppressWarnings("deprecation") com.google.cloud.memcache.v1beta2.Instance.State result = diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/InstanceOrBuilder.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/InstanceOrBuilder.java index 46e483da..37c58a3d 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/InstanceOrBuilder.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/InstanceOrBuilder.java @@ -156,7 +156,7 @@ public interface InstanceOrBuilder * * 
    * Optional. The full name of the Google Compute Engine
-   * [network](/compute/docs/networks-and-firewalls#networks) to which the
+   * [network](https://cloud.google.com/vpc/docs/vpc) to which the
    * instance is connected. If left unspecified, the `default` network
    * will be used.
    *
@@ -171,7 +171,7 @@ public interface InstanceOrBuilder * * 
    * Optional. The full name of the Google Compute Engine
-   * [network](/compute/docs/networks-and-firewalls#networks) to which the
+   * [network](https://cloud.google.com/vpc/docs/vpc) to which the
    * instance is connected. If left unspecified, the `default` network
    * will be used.
    *
diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ListInstancesRequest.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ListInstancesRequest.java index a4cc673a..98489d8e 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ListInstancesRequest.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ListInstancesRequest.java @@ -157,6 +157,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The parent. */ + @java.lang.Override public java.lang.String getParent() { java.lang.Object ref = parent_; if (ref instanceof java.lang.String) { @@ -183,6 +184,7 @@ public java.lang.String getParent() { * * @return The bytes for parent. */ + @java.lang.Override public com.google.protobuf.ByteString getParentBytes() { java.lang.Object ref = parent_; if (ref instanceof java.lang.String) { @@ -213,6 +215,7 @@ public com.google.protobuf.ByteString getParentBytes() { * * @return The pageSize. */ + @java.lang.Override public int getPageSize() { return pageSize_; } @@ -231,6 +234,7 @@ public int getPageSize() { * * @return The pageToken. */ + @java.lang.Override public java.lang.String getPageToken() { java.lang.Object ref = pageToken_; if (ref instanceof java.lang.String) { @@ -254,6 +258,7 @@ public java.lang.String getPageToken() { * * @return The bytes for pageToken. */ + @java.lang.Override public com.google.protobuf.ByteString getPageTokenBytes() { java.lang.Object ref = pageToken_; if (ref instanceof java.lang.String) { @@ -280,6 +285,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() { * * @return The filter. */ + @java.lang.Override public java.lang.String getFilter() { java.lang.Object ref = filter_; if (ref instanceof java.lang.String) { @@ -303,6 +309,7 @@ public java.lang.String getFilter() { * * @return The bytes for filter. */ + @java.lang.Override public com.google.protobuf.ByteString getFilterBytes() { java.lang.Object ref = filter_; if (ref instanceof java.lang.String) { @@ -328,6 +335,7 @@ public com.google.protobuf.ByteString getFilterBytes() { * * @return The orderBy. */ + @java.lang.Override public java.lang.String getOrderBy() { java.lang.Object ref = orderBy_; if (ref instanceof java.lang.String) { @@ -350,6 +358,7 @@ public java.lang.String getOrderBy() { * * @return The bytes for orderBy. */ + @java.lang.Override public com.google.protobuf.ByteString getOrderByBytes() { java.lang.Object ref = orderBy_; if (ref instanceof java.lang.String) { @@ -887,6 +896,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * * @return The pageSize. */ + @java.lang.Override public int getPageSize() { return pageSize_; } diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ListInstancesResponse.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ListInstancesResponse.java index 726000a7..57d90e41 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ListInstancesResponse.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/ListInstancesResponse.java @@ -155,6 +155,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * repeated .google.cloud.memcache.v1beta2.Instance resources = 1; */ + @java.lang.Override public java.util.List getResourcesList() { return resources_; } @@ -170,6 +171,7 @@ public java.util.List getResourcesLi * * repeated .google.cloud.memcache.v1beta2.Instance resources = 1; */ + @java.lang.Override public java.util.List getResourcesOrBuilderList() { return resources_; @@ -186,6 +188,7 @@ public java.util.List getResourcesLi * * repeated .google.cloud.memcache.v1beta2.Instance resources = 1; */ + @java.lang.Override public int getResourcesCount() { return resources_.size(); } @@ -201,6 +204,7 @@ public int getResourcesCount() { * * repeated .google.cloud.memcache.v1beta2.Instance resources = 1; */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance getResources(int index) { return resources_.get(index); } @@ -216,6 +220,7 @@ public com.google.cloud.memcache.v1beta2.Instance getResources(int index) { * * repeated .google.cloud.memcache.v1beta2.Instance resources = 1; */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.InstanceOrBuilder getResourcesOrBuilder(int index) { return resources_.get(index); } @@ -234,6 +239,7 @@ public com.google.cloud.memcache.v1beta2.InstanceOrBuilder getResourcesOrBuilder * * @return The nextPageToken. */ + @java.lang.Override public java.lang.String getNextPageToken() { java.lang.Object ref = nextPageToken_; if (ref instanceof java.lang.String) { @@ -257,6 +263,7 @@ public java.lang.String getNextPageToken() { * * @return The bytes for nextPageToken. */ + @java.lang.Override public com.google.protobuf.ByteString getNextPageTokenBytes() { java.lang.Object ref = nextPageToken_; if (ref instanceof java.lang.String) { diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/LocationMetadata.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/LocationMetadata.java index 25a0a3dd..32a5d05c 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/LocationMetadata.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/LocationMetadata.java @@ -180,6 +180,7 @@ public int getAvailableZonesCount() { * map<string, .google.cloud.memcache.v1beta2.ZoneMetadata> available_zones = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public boolean containsAvailableZones(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); @@ -187,6 +188,7 @@ public boolean containsAvailableZones(java.lang.String key) { return internalGetAvailableZones().getMap().containsKey(key); } /** Use {@link #getAvailableZonesMap()} instead. */ + @java.lang.Override @java.lang.Deprecated public java.util.Map getAvailableZones() { @@ -205,6 +207,7 @@ public boolean containsAvailableZones(java.lang.String key) { * map<string, .google.cloud.memcache.v1beta2.ZoneMetadata> available_zones = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public java.util.Map getAvailableZonesMap() { return internalGetAvailableZones().getMap(); @@ -222,6 +225,7 @@ public boolean containsAvailableZones(java.lang.String key) { * map<string, .google.cloud.memcache.v1beta2.ZoneMetadata> available_zones = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.ZoneMetadata getAvailableZonesOrDefault( java.lang.String key, com.google.cloud.memcache.v1beta2.ZoneMetadata defaultValue) { if (key == null) { @@ -244,6 +248,7 @@ public com.google.cloud.memcache.v1beta2.ZoneMetadata getAvailableZonesOrDefault * map<string, .google.cloud.memcache.v1beta2.ZoneMetadata> available_zones = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.ZoneMetadata getAvailableZonesOrThrow( java.lang.String key) { if (key == null) { @@ -649,6 +654,7 @@ public int getAvailableZonesCount() { * map<string, .google.cloud.memcache.v1beta2.ZoneMetadata> available_zones = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public boolean containsAvailableZones(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); @@ -656,6 +662,7 @@ public boolean containsAvailableZones(java.lang.String key) { return internalGetAvailableZones().getMap().containsKey(key); } /** Use {@link #getAvailableZonesMap()} instead. */ + @java.lang.Override @java.lang.Deprecated public java.util.Map getAvailableZones() { @@ -674,6 +681,7 @@ public boolean containsAvailableZones(java.lang.String key) { * map<string, .google.cloud.memcache.v1beta2.ZoneMetadata> available_zones = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public java.util.Map getAvailableZonesMap() { return internalGetAvailableZones().getMap(); @@ -691,6 +699,7 @@ public boolean containsAvailableZones(java.lang.String key) { * map<string, .google.cloud.memcache.v1beta2.ZoneMetadata> available_zones = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.ZoneMetadata getAvailableZonesOrDefault( java.lang.String key, com.google.cloud.memcache.v1beta2.ZoneMetadata defaultValue) { if (key == null) { @@ -713,6 +722,7 @@ public com.google.cloud.memcache.v1beta2.ZoneMetadata getAvailableZonesOrDefault * map<string, .google.cloud.memcache.v1beta2.ZoneMetadata> available_zones = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.ZoneMetadata getAvailableZonesOrThrow( java.lang.String key) { if (key == null) { diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/MemcacheParameters.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/MemcacheParameters.java index 49eb3b92..8bb9ada6 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/MemcacheParameters.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/MemcacheParameters.java @@ -144,6 +144,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) { * * @return The id. */ + @java.lang.Override public java.lang.String getId() { java.lang.Object ref = id_; if (ref instanceof java.lang.String) { @@ -169,6 +170,7 @@ public java.lang.String getId() { * * @return The bytes for id. */ + @java.lang.Override public com.google.protobuf.ByteString getIdBytes() { java.lang.Object ref = id_; if (ref instanceof java.lang.String) { @@ -215,6 +217,7 @@ public int getParamsCount() { * * map<string, string> params = 3; */ + @java.lang.Override public boolean containsParams(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); @@ -222,6 +225,7 @@ public boolean containsParams(java.lang.String key) { return internalGetParams().getMap().containsKey(key); } /** Use {@link #getParamsMap()} instead. */ + @java.lang.Override @java.lang.Deprecated public java.util.Map getParams() { return getParamsMap(); @@ -235,6 +239,7 @@ public java.util.Map getParams() { * * map<string, string> params = 3; */ + @java.lang.Override public java.util.Map getParamsMap() { return internalGetParams().getMap(); } @@ -247,6 +252,7 @@ public java.util.Map getParamsMap() { * * map<string, string> params = 3; */ + @java.lang.Override public java.lang.String getParamsOrDefault(java.lang.String key, java.lang.String defaultValue) { if (key == null) { throw new java.lang.NullPointerException(); @@ -263,6 +269,7 @@ public java.lang.String getParamsOrDefault(java.lang.String key, java.lang.Strin * * map<string, string> params = 3; */ + @java.lang.Override public java.lang.String getParamsOrThrow(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); @@ -783,6 +790,7 @@ public int getParamsCount() { * * map<string, string> params = 3; */ + @java.lang.Override public boolean containsParams(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); @@ -790,6 +798,7 @@ public boolean containsParams(java.lang.String key) { return internalGetParams().getMap().containsKey(key); } /** Use {@link #getParamsMap()} instead. */ + @java.lang.Override @java.lang.Deprecated public java.util.Map getParams() { return getParamsMap(); @@ -803,6 +812,7 @@ public java.util.Map getParams() { * * map<string, string> params = 3; */ + @java.lang.Override public java.util.Map getParamsMap() { return internalGetParams().getMap(); } @@ -815,6 +825,7 @@ public java.util.Map getParamsMap() { * * map<string, string> params = 3; */ + @java.lang.Override public java.lang.String getParamsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { @@ -832,6 +843,7 @@ public java.lang.String getParamsOrDefault( * * map<string, string> params = 3; */ + @java.lang.Override public java.lang.String getParamsOrThrow(java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/MemcacheVersion.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/MemcacheVersion.java index b8c045e5..db5ab22d 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/MemcacheVersion.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/MemcacheVersion.java @@ -101,6 +101,10 @@ public MemcacheVersion findValueByNumber(int number) { }; public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } return getDescriptor().getValues().get(ordinal()); } diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/OperationMetadata.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/OperationMetadata.java index ab9aa6d3..bf936bb9 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/OperationMetadata.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/OperationMetadata.java @@ -183,6 +183,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return Whether the createTime field is set. */ + @java.lang.Override public boolean hasCreateTime() { return createTime_ != null; } @@ -197,6 +198,7 @@ public boolean hasCreateTime() { * * @return The createTime. */ + @java.lang.Override public com.google.protobuf.Timestamp getCreateTime() { return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } @@ -209,6 +211,7 @@ public com.google.protobuf.Timestamp getCreateTime() { * * .google.protobuf.Timestamp create_time = 1; */ + @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return getCreateTime(); } @@ -226,6 +229,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * * @return Whether the endTime field is set. */ + @java.lang.Override public boolean hasEndTime() { return endTime_ != null; } @@ -240,6 +244,7 @@ public boolean hasEndTime() { * * @return The endTime. */ + @java.lang.Override public com.google.protobuf.Timestamp getEndTime() { return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } @@ -252,6 +257,7 @@ public com.google.protobuf.Timestamp getEndTime() { * * .google.protobuf.Timestamp end_time = 2; */ + @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { return getEndTime(); } @@ -269,6 +275,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { * * @return The target. */ + @java.lang.Override public java.lang.String getTarget() { java.lang.Object ref = target_; if (ref instanceof java.lang.String) { @@ -291,6 +298,7 @@ public java.lang.String getTarget() { * * @return The bytes for target. */ + @java.lang.Override public com.google.protobuf.ByteString getTargetBytes() { java.lang.Object ref = target_; if (ref instanceof java.lang.String) { @@ -316,6 +324,7 @@ public com.google.protobuf.ByteString getTargetBytes() { * * @return The verb. */ + @java.lang.Override public java.lang.String getVerb() { java.lang.Object ref = verb_; if (ref instanceof java.lang.String) { @@ -338,6 +347,7 @@ public java.lang.String getVerb() { * * @return The bytes for verb. */ + @java.lang.Override public com.google.protobuf.ByteString getVerbBytes() { java.lang.Object ref = verb_; if (ref instanceof java.lang.String) { @@ -363,6 +373,7 @@ public com.google.protobuf.ByteString getVerbBytes() { * * @return The statusDetail. */ + @java.lang.Override public java.lang.String getStatusDetail() { java.lang.Object ref = statusDetail_; if (ref instanceof java.lang.String) { @@ -385,6 +396,7 @@ public java.lang.String getStatusDetail() { * * @return The bytes for statusDetail. */ + @java.lang.Override public com.google.protobuf.ByteString getStatusDetailBytes() { java.lang.Object ref = statusDetail_; if (ref instanceof java.lang.String) { @@ -413,6 +425,7 @@ public com.google.protobuf.ByteString getStatusDetailBytes() { * * @return The cancelRequested. */ + @java.lang.Override public boolean getCancelRequested() { return cancelRequested_; } @@ -430,6 +443,7 @@ public boolean getCancelRequested() { * * @return The apiVersion. */ + @java.lang.Override public java.lang.String getApiVersion() { java.lang.Object ref = apiVersion_; if (ref instanceof java.lang.String) { @@ -452,6 +466,7 @@ public java.lang.String getApiVersion() { * * @return The bytes for apiVersion. */ + @java.lang.Override public com.google.protobuf.ByteString getApiVersionBytes() { java.lang.Object ref = apiVersion_; if (ref instanceof java.lang.String) { @@ -1596,6 +1611,7 @@ public Builder setStatusDetailBytes(com.google.protobuf.ByteString value) { * * @return The cancelRequested. */ + @java.lang.Override public boolean getCancelRequested() { return cancelRequested_; } diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/UpdateInstanceRequest.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/UpdateInstanceRequest.java index 980a285b..333c5a64 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/UpdateInstanceRequest.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/UpdateInstanceRequest.java @@ -148,6 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return Whether the updateMask field is set. */ + @java.lang.Override public boolean hasUpdateMask() { return updateMask_ != null; } @@ -164,6 +165,7 @@ public boolean hasUpdateMask() { * * @return The updateMask. */ + @java.lang.Override public com.google.protobuf.FieldMask getUpdateMask() { return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } @@ -178,6 +180,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { * .google.protobuf.FieldMask update_mask = 1 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { return getUpdateMask(); } @@ -198,6 +201,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { * * @return Whether the resource field is set. */ + @java.lang.Override public boolean hasResource() { return resource_ != null; } @@ -215,6 +219,7 @@ public boolean hasResource() { * * @return The resource. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.Instance getResource() { return resource_ == null ? com.google.cloud.memcache.v1beta2.Instance.getDefaultInstance() @@ -232,6 +237,7 @@ public com.google.cloud.memcache.v1beta2.Instance getResource() { * .google.cloud.memcache.v1beta2.Instance resource = 2 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.InstanceOrBuilder getResourceOrBuilder() { return getResource(); } diff --git a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/UpdateParametersRequest.java b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/UpdateParametersRequest.java index 83122d54..6d3bed2b 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/UpdateParametersRequest.java +++ b/proto-google-cloud-memcache-v1beta2/src/main/java/com/google/cloud/memcache/v1beta2/UpdateParametersRequest.java @@ -159,6 +159,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The name. */ + @java.lang.Override public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -184,6 +185,7 @@ public java.lang.String getName() { * * @return The bytes for name. */ + @java.lang.Override public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -210,6 +212,7 @@ public com.google.protobuf.ByteString getNameBytes() { * * @return Whether the updateMask field is set. */ + @java.lang.Override public boolean hasUpdateMask() { return updateMask_ != null; } @@ -225,6 +228,7 @@ public boolean hasUpdateMask() { * * @return The updateMask. */ + @java.lang.Override public com.google.protobuf.FieldMask getUpdateMask() { return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } @@ -238,6 +242,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { * .google.protobuf.FieldMask update_mask = 2 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { return getUpdateMask(); } @@ -255,6 +260,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { * * @return Whether the parameters field is set. */ + @java.lang.Override public boolean hasParameters() { return parameters_ != null; } @@ -269,6 +275,7 @@ public boolean hasParameters() { * * @return The parameters. */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.MemcacheParameters getParameters() { return parameters_ == null ? com.google.cloud.memcache.v1beta2.MemcacheParameters.getDefaultInstance() @@ -283,6 +290,7 @@ public com.google.cloud.memcache.v1beta2.MemcacheParameters getParameters() { * * .google.cloud.memcache.v1beta2.MemcacheParameters parameters = 3; */ + @java.lang.Override public com.google.cloud.memcache.v1beta2.MemcacheParametersOrBuilder getParametersOrBuilder() { return getParameters(); } diff --git a/proto-google-cloud-memcache-v1beta2/src/main/proto/google/cloud/memcache/v1beta2/cloud_memcache.proto b/proto-google-cloud-memcache-v1beta2/src/main/proto/google/cloud/memcache/v1beta2/cloud_memcache.proto index 5d75ae49..56bd2ef7 100644 --- a/proto-google-cloud-memcache-v1beta2/src/main/proto/google/cloud/memcache/v1beta2/cloud_memcache.proto +++ b/proto-google-cloud-memcache-v1beta2/src/main/proto/google/cloud/memcache/v1beta2/cloud_memcache.proto @@ -244,7 +244,7 @@ message Instance { map labels = 3; // Optional. The full name of the Google Compute Engine - // [network](/compute/docs/networks-and-firewalls#networks) to which the + // [network](https://cloud.google.com/vpc/docs/vpc) to which the // instance is connected. If left unspecified, the `default` network // will be used. string authorized_network = 4; diff --git a/renovate.json b/renovate.json index 6f7dc5fa..04db4f71 100644 --- a/renovate.json +++ b/renovate.json @@ -76,5 +76,6 @@ "groupName": "jackson dependencies" } ], - "semanticCommits": true + "semanticCommits": true, + "masterIssue": true } \ No newline at end of file diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 1bd8e7a4..060dc275 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.17 + 1.0.18 @@ -29,7 +29,7 @@ com.google.cloud google-cloud-memcache - 0.1.1 + 0.1.2 @@ -53,7 +53,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/pom.xml b/samples/pom.xml index 71881e9d..b307c003 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.17 + 1.0.18 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 783f482a..c57f7c79 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.17 + 1.0.18 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-memcache - 0.1.1 + 0.1.2 @@ -52,7 +52,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 4a1c1ad7..a5be919b 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.17 + 1.0.18 @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 5.1.0 + 7.0.1 pom import diff --git a/synth.metadata b/synth.metadata index 2ac6714c..e917df42 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-memcache.git", - "sha": "0890c6b665c49b4b6bf05c055db8665e5c795f66" + "sha": "36dbfd3938681b237127e8fba260816114da1382" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "d741cd976975c745d0199987aff0e908b8352992", - "internalRef": "305561906" + "sha": "9ba904b233179c23dc57a836f554135a6d62248e", + "internalRef": "316512618" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f8a9933e5e98202b04ef427f28d1d79221190fa4" + "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2" } } ], diff --git a/versions.txt b/versions.txt index 149a66b4..db1c29d3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -proto-google-cloud-memcache-v1beta2:0.1.2:0.1.2 -grpc-google-cloud-memcache-v1beta2:0.1.2:0.1.2 -google-cloud-memcache:0.1.2:0.1.2 +proto-google-cloud-memcache-v1beta2:0.2.0:0.2.0 +grpc-google-cloud-memcache-v1beta2:0.2.0:0.2.0 +google-cloud-memcache:0.2.0:0.2.0