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 dc2d514c..598779ba 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,6 @@ api_key # Python utilities *.pyc artman-genfiles -venv \ No newline at end of file +venv + +.flattened-pom.xml diff --git a/.kokoro/build.bat b/.kokoro/build.bat index f5964e07..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-texttospeech/.kokoro/build.sh +"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/.kokoro/build.sh b/.kokoro/build.sh index a5dc0429..10670770 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/common.sh b/.kokoro/common.sh index a3bbc5f6..a8d0ea04 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -13,18 +13,28 @@ # 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=$@ + + # store current flag state + flags=$- + + # allow a failures to continue + set +e echo "${command}" ${command} exit_code=$? + # restore "e" flag + if [[ ${flags} =~ e ]] + then set -e + else set +e + fi + if [[ $exit_code == 0 ]] then return 0 @@ -42,3 +52,8 @@ function retry_with_backoff { return $exit_code } + +## Helper functionss +function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; } +function msg() { println "$*" >&2; } +function println() { printf '%s\n' "$(now) $*"; } \ No newline at end of file diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0aade871..cf3bb434 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -36,3 +36,51 @@ retry_with_backoff 3 10 \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true + +echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************" +## Run dependency list completeness check +function completenessCheck() { + # Output dep list with compile scope generated using the original pom + msg "Generating dependency list using original pom..." + mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt + + # Output dep list generated using the flattened pom (test scope deps are ommitted) + msg "Generating dependency list using flattened pom..." + mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + + # Compare two dependency lists + msg "Comparing dependency lists..." + diff .org-list.txt .new-list.txt >.diff.txt + if [[ $? == 0 ]] + then + msg "Success. No diff!" + else + msg "Diff found. See below: " + msg "You can also check .diff.txt file located in $1." + cat .diff.txt + return 1 + fi +} + +# Allow failures to continue running the script +set +e + +error_count=0 +for path in $(find -name ".flattened-pom.xml") +do + # Check flattened pom in each dir that contains it for completeness + dir=$(dirname "$path") + pushd "$dir" + completenessCheck "$dir" + error_count=$(($error_count + $?)) + popd +done + +if [[ $error_count == 0 ]] +then + msg "All checks passed." + exit 0 +else + msg "Errors found. See log statements above." + exit 1 +fi diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 8bf59c02..0048c8ec 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -6,16 +6,32 @@ env_vars: { value: "gcr.io/cloud-devrel-kokoro-resources/java8" } +env_vars: { + key: "JOB_TYPE" + value: "integration" +} +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + env_vars: { key: "ENABLE_BUILD_COP" value: "true" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/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 b4b051cd..f2542931 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -11,26 +11,28 @@ env_vars: { value: "samples" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "java-docs-samples-testing" } 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 141f90c1..dded67a9 100644 --- a/.kokoro/presubmit/integration.cfg +++ b/.kokoro/presubmit/integration.cfg @@ -11,21 +11,23 @@ env_vars: { value: "integration" } +# TODO: remove this after we've migrated all tests and scripts 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_CLOUD_PROJECT" + value: "gcloud-devel" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/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 fa7b493d..01e09600 100644 --- a/.kokoro/presubmit/samples.cfg +++ b/.kokoro/presubmit/samples.cfg @@ -11,21 +11,23 @@ env_vars: { value: "samples" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "java-docs-samples-testing" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_CLOUD_PROJECT" + value: "java-docs-samples-testing" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-docs-samples-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 f5249b91..cf71844b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,36 @@ # Changelog +## [1.1.0](https://www.github.com/googleapis/java-texttospeech/compare/v1.0.2...v1.1.0) (2020-06-22) + + +### Features + +* **deps:** adopt flatten plugin and google-cloud-shared-dependencies ([#178](https://www.github.com/googleapis/java-texttospeech/issues/178)) ([093cbc1](https://www.github.com/googleapis/java-texttospeech/commit/093cbc1d475217347e0fc7a5aa92a9222961c6cd)) + + +### Bug Fixes + +* migrate retry settings to grpc_service_config ([#177](https://www.github.com/googleapis/java-texttospeech/issues/177)) ([94644ec](https://www.github.com/googleapis/java-texttospeech/commit/94644ecdced8f730f56bee1ebf6b0e061f222dfe)) +* restore GAPIC v2 retry configs ([#143](https://www.github.com/googleapis/java-texttospeech/issues/143)) ([a500ecb](https://www.github.com/googleapis/java-texttospeech/commit/a500ecbd982b182d81b49b717192a2088e8cdc0b)) + + +### Dependencies + +* update dependency com.google.api:api-common to v1.9.1 ([#150](https://www.github.com/googleapis/java-texttospeech/issues/150)) ([95c6aa9](https://www.github.com/googleapis/java-texttospeech/commit/95c6aa90f66439e554830e5c0e00db101e46e65d)) +* update dependency com.google.api:api-common to v1.9.2 ([#156](https://www.github.com/googleapis/java-texttospeech/issues/156)) ([2a0a811](https://www.github.com/googleapis/java-texttospeech/commit/2a0a811b6663d74029e0f6d5ad1e13debb300b34)) +* update dependency com.google.api.grpc:proto-google-common-protos to v1.18.0 ([#137](https://www.github.com/googleapis/java-texttospeech/issues/137)) ([a3bb294](https://www.github.com/googleapis/java-texttospeech/commit/a3bb294e84eee6429f3046d2777070530447222a)) +* update dependency com.google.guava:guava-bom to v29 ([#114](https://www.github.com/googleapis/java-texttospeech/issues/114)) ([9bd8f9a](https://www.github.com/googleapis/java-texttospeech/commit/9bd8f9a310f0d10c8eb1de18f77ea776a5bc8cf3)) +* update dependency com.google.protobuf:protobuf-java to v3.12.0 ([#141](https://www.github.com/googleapis/java-texttospeech/issues/141)) ([1695b41](https://www.github.com/googleapis/java-texttospeech/commit/1695b41e392adb2418abb481d526797985762313)) +* update dependency com.google.protobuf:protobuf-java to v3.12.2 ([#148](https://www.github.com/googleapis/java-texttospeech/issues/148)) ([7829cc9](https://www.github.com/googleapis/java-texttospeech/commit/7829cc9d3950f76e1c6dda933a6ae2e39af9669d)) +* update dependency io.grpc:grpc-bom to v1.29.0 ([#128](https://www.github.com/googleapis/java-texttospeech/issues/128)) ([8c69682](https://www.github.com/googleapis/java-texttospeech/commit/8c696822b48583fdf2a83de1fe557fbbf72b1e64)) +* update dependency io.grpc:grpc-bom to v1.30.0 ([#160](https://www.github.com/googleapis/java-texttospeech/issues/160)) ([d4c7066](https://www.github.com/googleapis/java-texttospeech/commit/d4c706677e337a5fc0f96d919156dfc4e48440cf)) +* update dependency org.threeten:threetenbp to v1.4.4 ([#133](https://www.github.com/googleapis/java-texttospeech/issues/133)) ([2422613](https://www.github.com/googleapis/java-texttospeech/commit/24226135e45f6e2183d766b526463c39f5b6914d)) + + +### Documentation + +* update relative URLs and regenerate with updated protoc ([#154](https://www.github.com/googleapis/java-texttospeech/issues/154)) ([3e7b0a5](https://www.github.com/googleapis/java-texttospeech/commit/3e7b0a51ec4113dc7f70715151af57a425f5b881)) + ### [1.0.2](https://www.github.com/googleapis/java-texttospeech/compare/v1.0.1...v1.0.2) (2020-04-06) 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 fddbeae1..0c5fe329 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 4.4.0 + 7.0.0 pom import @@ -32,8 +32,6 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file ``` -[//]: # ({x-version-update-start:google-cloud-texttospeech:released}) - If you are using Maven without BOM, add this to your dependencies: ```xml @@ -45,13 +43,15 @@ If you are using Maven without BOM, add this to your dependencies: ``` +[//]: # ({x-version-update-start:google-cloud-texttospeech:released}) + If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-texttospeech:1.0.2' +compile 'com.google.cloud:google-cloud-texttospeech:1.1.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "1.0.2" +libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "1.1.0" ``` [//]: # ({x-version-update-end}) @@ -101,8 +101,8 @@ Java 7 or above is required for using this client. ## Versioning -This library follows [Semantic Versioning](http://semver.org/). +This library follows [Semantic Versioning](http://semver.org/). ## Contributing diff --git a/google-cloud-texttospeech-bom/pom.xml b/google-cloud-texttospeech-bom/pom.xml index a845e61d..a8856d05 100644 --- a/google-cloud-texttospeech-bom/pom.xml +++ b/google-cloud-texttospeech-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-texttospeech-bom - 1.0.2 + 1.1.0 pom com.google.cloud google-cloud-shared-config - 0.4.0 + 0.8.1 Google Cloud texttospeech BOM @@ -64,27 +64,27 @@ com.google.cloud google-cloud-texttospeech - 1.0.2 + 1.1.0 com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - 0.83.2 + 0.84.0 com.google.api.grpc grpc-google-cloud-texttospeech-v1 - 1.0.2 + 1.1.0 com.google.api.grpc proto-google-cloud-texttospeech-v1 - 1.0.2 + 1.1.0 com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - 0.83.2 + 0.84.0 diff --git a/google-cloud-texttospeech/pom.xml b/google-cloud-texttospeech/pom.xml index 15afe776..542a45bc 100644 --- a/google-cloud-texttospeech/pom.xml +++ b/google-cloud-texttospeech/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-texttospeech - 1.0.2 + 1.1.0 jar Google Cloud Text-to-Speech https://github.com/googleapis/java-texttospeech @@ -11,7 +11,7 @@ com.google.cloud google-cloud-texttospeech-parent - 1.0.2 + 1.1.0 google-cloud-texttospeech @@ -107,4 +107,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java b/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java index 33be79f7..c03fde5b 100644 --- a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java +++ b/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java @@ -185,11 +185,11 @@ public static class Builder extends StubSettings.Builder> definitions = ImmutableMap.builder(); definitions.put( - "idempotent", + "retry_policy_1_codes", ImmutableSet.copyOf( Lists.newArrayList( - StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE))); - definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList())); + StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED))); + definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.newArrayList())); RETRYABLE_CODE_DEFINITIONS = definitions.build(); } @@ -203,12 +203,14 @@ public static class Builder extends StubSettings.Builder> definitions = ImmutableMap.builder(); definitions.put( - "idempotent", + "retry_policy_1_codes", ImmutableSet.copyOf( Lists.newArrayList( - StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE))); - definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList())); + StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED))); + definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.newArrayList())); RETRYABLE_CODE_DEFINITIONS = definitions.build(); } @@ -203,12 +203,14 @@ public static class Builder extends StubSettings.Builder4.0.0 com.google.api.grpc grpc-google-cloud-texttospeech-v1 - 1.0.2 + 1.1.0 grpc-google-cloud-texttospeech-v1 GRPC library for grpc-google-cloud-texttospeech-v1 com.google.cloud google-cloud-texttospeech-parent - 1.0.2 + 1.1.0 @@ -53,4 +53,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-texttospeech-v1beta1/pom.xml b/grpc-google-cloud-texttospeech-v1beta1/pom.xml index f5037a6d..dcaf7bfb 100644 --- a/grpc-google-cloud-texttospeech-v1beta1/pom.xml +++ b/grpc-google-cloud-texttospeech-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - 0.83.2 + 0.84.0 grpc-google-cloud-texttospeech-v1beta1 GRPC library for grpc-google-cloud-texttospeech-v1beta1 com.google.cloud google-cloud-texttospeech-parent - 1.0.2 + 1.1.0 @@ -53,4 +53,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index e6be07b9..eb581169 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-texttospeech-parent pom - 1.0.2 + 1.1.0 Google Cloud Text-to-Speech Parent https://github.com/googleapis/java-texttospeech @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.4.0 + 0.8.1 @@ -63,16 +63,6 @@ UTF-8 github google-cloud-texttospeech-parent - 1.9.0 - 1.17.0 - 1.56.0 - 1.28.1 - 3.11.4 - 4.13 - 28.2-android - 1.4.3 - 1.3.2 - 1.18 @@ -80,93 +70,41 @@ com.google.api.grpc proto-google-cloud-texttospeech-v1 - 1.0.2 + 1.1.0 com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - 0.83.2 + 0.84.0 com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - 0.83.2 + 0.84.0 com.google.api.grpc grpc-google-cloud-texttospeech-v1 - 1.0.2 + 1.1.0 com.google.cloud google-cloud-texttospeech - 1.0.2 + 1.1.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} - - - org.threeten - threetenbp - ${threeten.version} - - - javax.annotation - javax.annotation-api - ${javax.annotations.version} - - - org.codehaus.mojo - animal-sniffer-annotations - ${animal-sniffer.version} - - junit junit - ${junit.version} - test - - - com.google.api - gax-grpc - ${gax.version} - testlib + 4.13 test @@ -200,7 +138,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.0 @@ -258,7 +196,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-texttospeech-v1/pom.xml b/proto-google-cloud-texttospeech-v1/pom.xml index 96dcb2ba..8b17ee09 100644 --- a/proto-google-cloud-texttospeech-v1/pom.xml +++ b/proto-google-cloud-texttospeech-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-texttospeech-v1 - 1.0.2 + 1.1.0 proto-google-cloud-texttospeech-v1 PROTO library for proto-google-cloud-texttospeech-v1 com.google.cloud google-cloud-texttospeech-parent - 1.0.2 + 1.1.0 @@ -22,4 +22,13 @@ proto-google-common-protos + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java index ff27b81d..3d06458c 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java @@ -161,6 +161,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The enum numeric value on the wire for audioEncoding. */ + @java.lang.Override public int getAudioEncodingValue() { return audioEncoding_; } @@ -177,6 +178,7 @@ public int getAudioEncodingValue() { * * @return The audioEncoding. */ + @java.lang.Override public com.google.cloud.texttospeech.v1.AudioEncoding getAudioEncoding() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1.AudioEncoding result = @@ -202,6 +204,7 @@ public com.google.cloud.texttospeech.v1.AudioEncoding getAudioEncoding() { * * @return The speakingRate. */ + @java.lang.Override public double getSpeakingRate() { return speakingRate_; } @@ -223,6 +226,7 @@ public double getSpeakingRate() { * * @return The pitch. */ + @java.lang.Override public double getPitch() { return pitch_; } @@ -249,6 +253,7 @@ public double getPitch() { * * @return The volumeGainDb. */ + @java.lang.Override public double getVolumeGainDb() { return volumeGainDb_; } @@ -272,6 +277,7 @@ public double getVolumeGainDb() { * * @return The sampleRateHertz. */ + @java.lang.Override public int getSampleRateHertz() { return sampleRateHertz_; } @@ -803,6 +809,7 @@ public Builder mergeFrom( * * @return The enum numeric value on the wire for audioEncoding. */ + @java.lang.Override public int getAudioEncodingValue() { return audioEncoding_; } @@ -821,6 +828,7 @@ public int getAudioEncodingValue() { * @return This builder for chaining. */ public Builder setAudioEncodingValue(int value) { + audioEncoding_ = value; onChanged(); return this; @@ -838,6 +846,7 @@ public Builder setAudioEncodingValue(int value) { * * @return The audioEncoding. */ + @java.lang.Override public com.google.cloud.texttospeech.v1.AudioEncoding getAudioEncoding() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1.AudioEncoding result = @@ -904,6 +913,7 @@ public Builder clearAudioEncoding() { * * @return The speakingRate. */ + @java.lang.Override public double getSpeakingRate() { return speakingRate_; } @@ -969,6 +979,7 @@ public Builder clearSpeakingRate() { * * @return The pitch. */ + @java.lang.Override public double getPitch() { return pitch_; } @@ -1037,6 +1048,7 @@ public Builder clearPitch() { * * @return The volumeGainDb. */ + @java.lang.Override public double getVolumeGainDb() { return volumeGainDb_; } @@ -1112,6 +1124,7 @@ public Builder clearVolumeGainDb() { * * @return The sampleRateHertz. */ + @java.lang.Override public int getSampleRateHertz() { return sampleRateHertz_; } diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioEncoding.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioEncoding.java index eb4a67ab..11f1f7a4 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioEncoding.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioEncoding.java @@ -170,6 +170,10 @@ public AudioEncoding 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-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java index c89e0f2c..bd0d10d2 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java @@ -131,6 +131,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The languageCode. */ + @java.lang.Override public java.lang.String getLanguageCode() { java.lang.Object ref = languageCode_; if (ref instanceof java.lang.String) { @@ -160,6 +161,7 @@ public java.lang.String getLanguageCode() { * * @return The bytes for languageCode. */ + @java.lang.Override public com.google.protobuf.ByteString getLanguageCodeBytes() { java.lang.Object ref = languageCode_; if (ref instanceof java.lang.String) { diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java index b630cdb5..17e86d99 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java @@ -130,6 +130,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * repeated .google.cloud.texttospeech.v1.Voice voices = 1; */ + @java.lang.Override public java.util.List getVoicesList() { return voices_; } @@ -142,6 +143,7 @@ public java.util.List getVoicesList() { * * repeated .google.cloud.texttospeech.v1.Voice voices = 1; */ + @java.lang.Override public java.util.List getVoicesOrBuilderList() { return voices_; @@ -155,6 +157,7 @@ public java.util.List getVoicesList() { * * repeated .google.cloud.texttospeech.v1.Voice voices = 1; */ + @java.lang.Override public int getVoicesCount() { return voices_.size(); } @@ -167,6 +170,7 @@ public int getVoicesCount() { * * repeated .google.cloud.texttospeech.v1.Voice voices = 1; */ + @java.lang.Override public com.google.cloud.texttospeech.v1.Voice getVoices(int index) { return voices_.get(index); } @@ -179,6 +183,7 @@ public com.google.cloud.texttospeech.v1.Voice getVoices(int index) { * * repeated .google.cloud.texttospeech.v1.Voice voices = 1; */ + @java.lang.Override public com.google.cloud.texttospeech.v1.VoiceOrBuilder getVoicesOrBuilder(int index) { return voices_.get(index); } diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java index 2552c231..1ba3b87a 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java @@ -170,6 +170,10 @@ public SsmlVoiceGender 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-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java index d0b893b7..327249f7 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java @@ -230,7 +230,7 @@ public com.google.protobuf.ByteString getTextBytes() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -260,7 +260,7 @@ public java.lang.String getSsml() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -677,6 +677,7 @@ public Builder clearInputSource() { * * @return The text. */ + @java.lang.Override public java.lang.String getText() { java.lang.Object ref = ""; if (inputSourceCase_ == 1) { @@ -704,6 +705,7 @@ public java.lang.String getText() { * * @return The bytes for text. */ + @java.lang.Override public com.google.protobuf.ByteString getTextBytes() { java.lang.Object ref = ""; if (inputSourceCase_ == 1) { @@ -790,13 +792,14 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; * * @return The ssml. */ + @java.lang.Override public java.lang.String getSsml() { java.lang.Object ref = ""; if (inputSourceCase_ == 2) { @@ -820,13 +823,14 @@ public java.lang.String getSsml() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; * * @return The bytes for ssml. */ + @java.lang.Override public com.google.protobuf.ByteString getSsmlBytes() { java.lang.Object ref = ""; if (inputSourceCase_ == 2) { @@ -850,7 +854,7 @@ public com.google.protobuf.ByteString getSsmlBytes() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -874,7 +878,7 @@ public Builder setSsml(java.lang.String value) { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -896,7 +900,7 @@ public Builder clearSsml() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInputOrBuilder.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInputOrBuilder.java index 1680a445..169d1cb5 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInputOrBuilder.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInputOrBuilder.java @@ -55,7 +55,7 @@ public interface SynthesisInputOrBuilder * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -70,7 +70,7 @@ public interface SynthesisInputOrBuilder * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java index d9dc3a9c..720752a0 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java @@ -166,6 +166,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return Whether the input field is set. */ + @java.lang.Override public boolean hasInput() { return input_ != null; } @@ -182,6 +183,7 @@ public boolean hasInput() { * * @return The input. */ + @java.lang.Override public com.google.cloud.texttospeech.v1.SynthesisInput getInput() { return input_ == null ? com.google.cloud.texttospeech.v1.SynthesisInput.getDefaultInstance() @@ -198,6 +200,7 @@ public com.google.cloud.texttospeech.v1.SynthesisInput getInput() { * .google.cloud.texttospeech.v1.SynthesisInput input = 1 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder getInputOrBuilder() { return getInput(); } @@ -217,6 +220,7 @@ public com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder getInputOrBuilde * * @return Whether the voice field is set. */ + @java.lang.Override public boolean hasVoice() { return voice_ != null; } @@ -233,6 +237,7 @@ public boolean hasVoice() { * * @return The voice. */ + @java.lang.Override public com.google.cloud.texttospeech.v1.VoiceSelectionParams getVoice() { return voice_ == null ? com.google.cloud.texttospeech.v1.VoiceSelectionParams.getDefaultInstance() @@ -249,6 +254,7 @@ public com.google.cloud.texttospeech.v1.VoiceSelectionParams getVoice() { * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder getVoiceOrBuilder() { return getVoice(); } @@ -268,6 +274,7 @@ public com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder getVoiceOr * * @return Whether the audioConfig field is set. */ + @java.lang.Override public boolean hasAudioConfig() { return audioConfig_ != null; } @@ -284,6 +291,7 @@ public boolean hasAudioConfig() { * * @return The audioConfig. */ + @java.lang.Override public com.google.cloud.texttospeech.v1.AudioConfig getAudioConfig() { return audioConfig_ == null ? com.google.cloud.texttospeech.v1.AudioConfig.getDefaultInstance() @@ -300,6 +308,7 @@ public com.google.cloud.texttospeech.v1.AudioConfig getAudioConfig() { * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.cloud.texttospeech.v1.AudioConfigOrBuilder getAudioConfigOrBuilder() { return getAudioConfig(); } diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java index e4d3b6bd..a64b8c9e 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java @@ -126,6 +126,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The audioContent. */ + @java.lang.Override public com.google.protobuf.ByteString getAudioContent() { return audioContent_; } @@ -464,6 +465,7 @@ public Builder mergeFrom( * * @return The audioContent. */ + @java.lang.Override public com.google.protobuf.ByteString getAudioContent() { return audioContent_; } diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java index f5ac2e1e..2d8ecdd1 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java @@ -112,12 +112,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ponse\"9\202\323\344\223\002\030\"\023/v1/text:synthesize:\001*\332A\030" + "input,voice,audio_config\032O\312A\033texttospeec" + "h.googleapis.com\322A.https://www.googleapi" - + "s.com/auth/cloud-platformB\302\001\n com.google" + + "s.com/auth/cloud-platformB\344\001\n com.google" + ".cloud.texttospeech.v1B\021TextToSpeechProt" + "oP\001ZHgoogle.golang.org/genproto/googleap" + "is/cloud/texttospeech/v1;texttospeech\370\001\001" + "\252\002\034Google.Cloud.TextToSpeech.V1\312\002\034Google" - + "\\Cloud\\TextToSpeech\\V1b\006proto3" + + "\\Cloud\\TextToSpeech\\V1\352\002\037Google::Cloud::" + + "TextToSpeech::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java index 0107b98f..675b411e 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java @@ -221,6 +221,7 @@ public com.google.protobuf.ByteString getLanguageCodesBytes(int index) { * * @return The name. */ + @java.lang.Override public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -243,6 +244,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) { @@ -268,6 +270,7 @@ public com.google.protobuf.ByteString getNameBytes() { * * @return The enum numeric value on the wire for ssmlGender. */ + @java.lang.Override public int getSsmlGenderValue() { return ssmlGender_; } @@ -282,6 +285,7 @@ public int getSsmlGenderValue() { * * @return The ssmlGender. */ + @java.lang.Override public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1.SsmlVoiceGender result = @@ -302,6 +306,7 @@ public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() { * * @return The naturalSampleRateHertz. */ + @java.lang.Override public int getNaturalSampleRateHertz() { return naturalSampleRateHertz_; } @@ -995,6 +1000,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * * @return The enum numeric value on the wire for ssmlGender. */ + @java.lang.Override public int getSsmlGenderValue() { return ssmlGender_; } @@ -1011,6 +1017,7 @@ public int getSsmlGenderValue() { * @return This builder for chaining. */ public Builder setSsmlGenderValue(int value) { + ssmlGender_ = value; onChanged(); return this; @@ -1026,6 +1033,7 @@ public Builder setSsmlGenderValue(int value) { * * @return The ssmlGender. */ + @java.lang.Override public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1.SsmlVoiceGender result = @@ -1085,6 +1093,7 @@ public Builder clearSsmlGender() { * * @return The naturalSampleRateHertz. */ + @java.lang.Override public int getNaturalSampleRateHertz() { return naturalSampleRateHertz_; } diff --git a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java index 55c76685..05c580be 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java +++ b/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java @@ -150,6 +150,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The languageCode. */ + @java.lang.Override public java.lang.String getLanguageCode() { java.lang.Object ref = languageCode_; if (ref instanceof java.lang.String) { @@ -182,6 +183,7 @@ public java.lang.String getLanguageCode() { * * @return The bytes for languageCode. */ + @java.lang.Override public com.google.protobuf.ByteString getLanguageCodeBytes() { java.lang.Object ref = languageCode_; if (ref instanceof java.lang.String) { @@ -208,6 +210,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() { * * @return The name. */ + @java.lang.Override public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -231,6 +234,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 +264,7 @@ public com.google.protobuf.ByteString getNameBytes() { * * @return The enum numeric value on the wire for ssmlGender. */ + @java.lang.Override public int getSsmlGenderValue() { return ssmlGender_; } @@ -278,6 +283,7 @@ public int getSsmlGenderValue() { * * @return The ssmlGender. */ + @java.lang.Override public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1.SsmlVoiceGender result = @@ -922,6 +928,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * * @return The enum numeric value on the wire for ssmlGender. */ + @java.lang.Override public int getSsmlGenderValue() { return ssmlGender_; } @@ -942,6 +949,7 @@ public int getSsmlGenderValue() { * @return This builder for chaining. */ public Builder setSsmlGenderValue(int value) { + ssmlGender_ = value; onChanged(); return this; @@ -961,6 +969,7 @@ public Builder setSsmlGenderValue(int value) { * * @return The ssmlGender. */ + @java.lang.Override public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1.SsmlVoiceGender result = diff --git a/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto b/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto index 6263da4a..208964f8 100644 --- a/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto +++ b/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto @@ -28,6 +28,7 @@ option java_multiple_files = true; option java_outer_classname = "TextToSpeechProto"; option java_package = "com.google.cloud.texttospeech.v1"; option php_namespace = "Google\\Cloud\\TextToSpeech\\V1"; +option ruby_package = "Google::Cloud::TextToSpeech::V1"; // Service that implements Google Cloud Text-to-Speech API. service TextToSpeech { @@ -154,7 +155,7 @@ message SynthesisInput { // The SSML document to be synthesized. The SSML document must be valid // and well-formed. Otherwise the RPC will fail and return // [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - // [SSML](/speech/text-to-speech/docs/ssml). + // [SSML](https://cloud.google.com/text-to-speech/docs/ssml). string ssml = 2; } } diff --git a/proto-google-cloud-texttospeech-v1beta1/pom.xml b/proto-google-cloud-texttospeech-v1beta1/pom.xml index 8be3efdd..5a5e8573 100644 --- a/proto-google-cloud-texttospeech-v1beta1/pom.xml +++ b/proto-google-cloud-texttospeech-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - 0.83.2 + 0.84.0 proto-google-cloud-texttospeech-v1beta1 PROTO library for proto-google-cloud-texttospeech-v1beta1 com.google.cloud google-cloud-texttospeech-parent - 1.0.2 + 1.1.0 @@ -22,4 +22,13 @@ proto-google-common-protos + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java index 00588af5..3d057718 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java @@ -161,6 +161,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The enum numeric value on the wire for audioEncoding. */ + @java.lang.Override public int getAudioEncodingValue() { return audioEncoding_; } @@ -177,6 +178,7 @@ public int getAudioEncodingValue() { * * @return The audioEncoding. */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.AudioEncoding getAudioEncoding() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1beta1.AudioEncoding result = @@ -204,6 +206,7 @@ public com.google.cloud.texttospeech.v1beta1.AudioEncoding getAudioEncoding() { * * @return The speakingRate. */ + @java.lang.Override public double getSpeakingRate() { return speakingRate_; } @@ -225,6 +228,7 @@ public double getSpeakingRate() { * * @return The pitch. */ + @java.lang.Override public double getPitch() { return pitch_; } @@ -251,6 +255,7 @@ public double getPitch() { * * @return The volumeGainDb. */ + @java.lang.Override public double getVolumeGainDb() { return volumeGainDb_; } @@ -274,6 +279,7 @@ public double getVolumeGainDb() { * * @return The sampleRateHertz. */ + @java.lang.Override public int getSampleRateHertz() { return sampleRateHertz_; } @@ -809,6 +815,7 @@ public Builder mergeFrom( * * @return The enum numeric value on the wire for audioEncoding. */ + @java.lang.Override public int getAudioEncodingValue() { return audioEncoding_; } @@ -827,6 +834,7 @@ public int getAudioEncodingValue() { * @return This builder for chaining. */ public Builder setAudioEncodingValue(int value) { + audioEncoding_ = value; onChanged(); return this; @@ -844,6 +852,7 @@ public Builder setAudioEncodingValue(int value) { * * @return The audioEncoding. */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.AudioEncoding getAudioEncoding() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1beta1.AudioEncoding result = @@ -912,6 +921,7 @@ public Builder clearAudioEncoding() { * * @return The speakingRate. */ + @java.lang.Override public double getSpeakingRate() { return speakingRate_; } @@ -977,6 +987,7 @@ public Builder clearSpeakingRate() { * * @return The pitch. */ + @java.lang.Override public double getPitch() { return pitch_; } @@ -1045,6 +1056,7 @@ public Builder clearPitch() { * * @return The volumeGainDb. */ + @java.lang.Override public double getVolumeGainDb() { return volumeGainDb_; } @@ -1120,6 +1132,7 @@ public Builder clearVolumeGainDb() { * * @return The sampleRateHertz. */ + @java.lang.Override public int getSampleRateHertz() { return sampleRateHertz_; } diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioEncoding.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioEncoding.java index e6e6ffa1..97b55111 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioEncoding.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioEncoding.java @@ -170,6 +170,10 @@ public AudioEncoding 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-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java index 75c1b16c..96d4b985 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java @@ -131,6 +131,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The languageCode. */ + @java.lang.Override public java.lang.String getLanguageCode() { java.lang.Object ref = languageCode_; if (ref instanceof java.lang.String) { @@ -160,6 +161,7 @@ public java.lang.String getLanguageCode() { * * @return The bytes for languageCode. */ + @java.lang.Override public com.google.protobuf.ByteString getLanguageCodeBytes() { java.lang.Object ref = languageCode_; if (ref instanceof java.lang.String) { diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java index 89cd4a75..6860e3bb 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java @@ -130,6 +130,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * repeated .google.cloud.texttospeech.v1beta1.Voice voices = 1; */ + @java.lang.Override public java.util.List getVoicesList() { return voices_; } @@ -142,6 +143,7 @@ public java.util.List getVoicesList * * repeated .google.cloud.texttospeech.v1beta1.Voice voices = 1; */ + @java.lang.Override public java.util.List getVoicesOrBuilderList() { return voices_; @@ -155,6 +157,7 @@ public java.util.List getVoicesList * * repeated .google.cloud.texttospeech.v1beta1.Voice voices = 1; */ + @java.lang.Override public int getVoicesCount() { return voices_.size(); } @@ -167,6 +170,7 @@ public int getVoicesCount() { * * repeated .google.cloud.texttospeech.v1beta1.Voice voices = 1; */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.Voice getVoices(int index) { return voices_.get(index); } @@ -179,6 +183,7 @@ public com.google.cloud.texttospeech.v1beta1.Voice getVoices(int index) { * * repeated .google.cloud.texttospeech.v1beta1.Voice voices = 1; */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.VoiceOrBuilder getVoicesOrBuilder(int index) { return voices_.get(index); } diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SsmlVoiceGender.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SsmlVoiceGender.java index d2e41af9..807b44ef 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SsmlVoiceGender.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SsmlVoiceGender.java @@ -170,6 +170,10 @@ public SsmlVoiceGender 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-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java index ac1ea8ea..3ab25a4a 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java @@ -230,7 +230,7 @@ public com.google.protobuf.ByteString getTextBytes() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -260,7 +260,7 @@ public java.lang.String getSsml() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -678,6 +678,7 @@ public Builder clearInputSource() { * * @return The text. */ + @java.lang.Override public java.lang.String getText() { java.lang.Object ref = ""; if (inputSourceCase_ == 1) { @@ -705,6 +706,7 @@ public java.lang.String getText() { * * @return The bytes for text. */ + @java.lang.Override public com.google.protobuf.ByteString getTextBytes() { java.lang.Object ref = ""; if (inputSourceCase_ == 1) { @@ -791,13 +793,14 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; * * @return The ssml. */ + @java.lang.Override public java.lang.String getSsml() { java.lang.Object ref = ""; if (inputSourceCase_ == 2) { @@ -821,13 +824,14 @@ public java.lang.String getSsml() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; * * @return The bytes for ssml. */ + @java.lang.Override public com.google.protobuf.ByteString getSsmlBytes() { java.lang.Object ref = ""; if (inputSourceCase_ == 2) { @@ -851,7 +855,7 @@ public com.google.protobuf.ByteString getSsmlBytes() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -875,7 +879,7 @@ public Builder setSsml(java.lang.String value) { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -897,7 +901,7 @@ public Builder clearSsml() { * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInputOrBuilder.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInputOrBuilder.java index 1883ed70..9ed99112 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInputOrBuilder.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInputOrBuilder.java @@ -55,7 +55,7 @@ public interface SynthesisInputOrBuilder * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; @@ -70,7 +70,7 @@ public interface SynthesisInputOrBuilder * The SSML document to be synthesized. The SSML document must be valid * and well-formed. Otherwise the RPC will fail and return * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - * [SSML](/speech/text-to-speech/docs/ssml). + * [SSML](https://cloud.google.com/text-to-speech/docs/ssml). * * * string ssml = 2; diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java index c748e4cb..ad4572b0 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java @@ -168,6 +168,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return Whether the input field is set. */ + @java.lang.Override public boolean hasInput() { return input_ != null; } @@ -184,6 +185,7 @@ public boolean hasInput() { * * @return The input. */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.SynthesisInput getInput() { return input_ == null ? com.google.cloud.texttospeech.v1beta1.SynthesisInput.getDefaultInstance() @@ -200,6 +202,7 @@ public com.google.cloud.texttospeech.v1beta1.SynthesisInput getInput() { * .google.cloud.texttospeech.v1beta1.SynthesisInput input = 1 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.SynthesisInputOrBuilder getInputOrBuilder() { return getInput(); } @@ -219,6 +222,7 @@ public com.google.cloud.texttospeech.v1beta1.SynthesisInputOrBuilder getInputOrB * * @return Whether the voice field is set. */ + @java.lang.Override public boolean hasVoice() { return voice_ != null; } @@ -235,6 +239,7 @@ public boolean hasVoice() { * * @return The voice. */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams getVoice() { return voice_ == null ? com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams.getDefaultInstance() @@ -251,6 +256,7 @@ public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams getVoice() { * .google.cloud.texttospeech.v1beta1.VoiceSelectionParams voice = 2 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParamsOrBuilder getVoiceOrBuilder() { return getVoice(); } @@ -270,6 +276,7 @@ public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParamsOrBuilder getVo * * @return Whether the audioConfig field is set. */ + @java.lang.Override public boolean hasAudioConfig() { return audioConfig_ != null; } @@ -286,6 +293,7 @@ public boolean hasAudioConfig() { * * @return The audioConfig. */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.AudioConfig getAudioConfig() { return audioConfig_ == null ? com.google.cloud.texttospeech.v1beta1.AudioConfig.getDefaultInstance() @@ -302,6 +310,7 @@ public com.google.cloud.texttospeech.v1beta1.AudioConfig getAudioConfig() { * .google.cloud.texttospeech.v1beta1.AudioConfig audio_config = 3 [(.google.api.field_behavior) = REQUIRED]; * */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.AudioConfigOrBuilder getAudioConfigOrBuilder() { return getAudioConfig(); } diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java index 547a42fc..3dd650e7 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java @@ -126,6 +126,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The audioContent. */ + @java.lang.Override public com.google.protobuf.ByteString getAudioContent() { return audioContent_; } @@ -467,6 +468,7 @@ public Builder mergeFrom( * * @return The audioContent. */ + @java.lang.Override public com.google.protobuf.ByteString getAudioContent() { return audioContent_; } diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java index c8656f63..c50b75c9 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java @@ -114,13 +114,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\223\002\035\"\030/v1beta1/text:synthesize:\001*\332A\030input" + ",voice,audio_config\032O\312A\033texttospeech.goo" + "gleapis.com\322A.https://www.googleapis.com" - + "/auth/cloud-platformB\326\001\n%com.google.clou" + + "/auth/cloud-platformB\375\001\n%com.google.clou" + "d.texttospeech.v1beta1B\021TextToSpeechProt" + "oP\001ZMgoogle.golang.org/genproto/googleap" + "is/cloud/texttospeech/v1beta1;texttospee" + "ch\370\001\001\252\002!Google.Cloud.TextToSpeech.V1beta" - + "1\312\002!Google\\Cloud\\TextToSpeech\\V1beta1b\006p" - + "roto3" + + "1\312\002!Google\\Cloud\\TextToSpeech\\V1beta1\352\002$" + + "Google::Cloud::TextToSpeech::V1beta1b\006pr" + + "oto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java index 220be123..da9db336 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java @@ -221,6 +221,7 @@ public com.google.protobuf.ByteString getLanguageCodesBytes(int index) { * * @return The name. */ + @java.lang.Override public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -243,6 +244,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) { @@ -268,6 +270,7 @@ public com.google.protobuf.ByteString getNameBytes() { * * @return The enum numeric value on the wire for ssmlGender. */ + @java.lang.Override public int getSsmlGenderValue() { return ssmlGender_; } @@ -282,6 +285,7 @@ public int getSsmlGenderValue() { * * @return The ssmlGender. */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender getSsmlGender() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender result = @@ -304,6 +308,7 @@ public com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender getSsmlGender() { * * @return The naturalSampleRateHertz. */ + @java.lang.Override public int getNaturalSampleRateHertz() { return naturalSampleRateHertz_; } @@ -998,6 +1003,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * * @return The enum numeric value on the wire for ssmlGender. */ + @java.lang.Override public int getSsmlGenderValue() { return ssmlGender_; } @@ -1014,6 +1020,7 @@ public int getSsmlGenderValue() { * @return This builder for chaining. */ public Builder setSsmlGenderValue(int value) { + ssmlGender_ = value; onChanged(); return this; @@ -1029,6 +1036,7 @@ public Builder setSsmlGenderValue(int value) { * * @return The ssmlGender. */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender getSsmlGender() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender result = @@ -1088,6 +1096,7 @@ public Builder clearSsmlGender() { * * @return The naturalSampleRateHertz. */ + @java.lang.Override public int getNaturalSampleRateHertz() { return naturalSampleRateHertz_; } diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java index 866f4a25..e584a40b 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java @@ -150,6 +150,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * @return The languageCode. */ + @java.lang.Override public java.lang.String getLanguageCode() { java.lang.Object ref = languageCode_; if (ref instanceof java.lang.String) { @@ -182,6 +183,7 @@ public java.lang.String getLanguageCode() { * * @return The bytes for languageCode. */ + @java.lang.Override public com.google.protobuf.ByteString getLanguageCodeBytes() { java.lang.Object ref = languageCode_; if (ref instanceof java.lang.String) { @@ -208,6 +210,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() { * * @return The name. */ + @java.lang.Override public java.lang.String getName() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { @@ -231,6 +234,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 +264,7 @@ public com.google.protobuf.ByteString getNameBytes() { * * @return The enum numeric value on the wire for ssmlGender. */ + @java.lang.Override public int getSsmlGenderValue() { return ssmlGender_; } @@ -278,6 +283,7 @@ public int getSsmlGenderValue() { * * @return The ssmlGender. */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender getSsmlGender() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender result = @@ -924,6 +930,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * * @return The enum numeric value on the wire for ssmlGender. */ + @java.lang.Override public int getSsmlGenderValue() { return ssmlGender_; } @@ -944,6 +951,7 @@ public int getSsmlGenderValue() { * @return This builder for chaining. */ public Builder setSsmlGenderValue(int value) { + ssmlGender_ = value; onChanged(); return this; @@ -963,6 +971,7 @@ public Builder setSsmlGenderValue(int value) { * * @return The ssmlGender. */ + @java.lang.Override public com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender getSsmlGender() { @SuppressWarnings("deprecation") com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender result = diff --git a/proto-google-cloud-texttospeech-v1beta1/src/main/proto/google/cloud/texttospeech/v1beta1/cloud_tts.proto b/proto-google-cloud-texttospeech-v1beta1/src/main/proto/google/cloud/texttospeech/v1beta1/cloud_tts.proto index 443ff6d5..f50a7fbd 100644 --- a/proto-google-cloud-texttospeech-v1beta1/src/main/proto/google/cloud/texttospeech/v1beta1/cloud_tts.proto +++ b/proto-google-cloud-texttospeech-v1beta1/src/main/proto/google/cloud/texttospeech/v1beta1/cloud_tts.proto @@ -28,6 +28,7 @@ option java_multiple_files = true; option java_outer_classname = "TextToSpeechProto"; option java_package = "com.google.cloud.texttospeech.v1beta1"; option php_namespace = "Google\\Cloud\\TextToSpeech\\V1beta1"; +option ruby_package = "Google::Cloud::TextToSpeech::V1beta1"; // Service that implements Google Cloud Text-to-Speech API. service TextToSpeech { @@ -154,7 +155,7 @@ message SynthesisInput { // The SSML document to be synthesized. The SSML document must be valid // and well-formed. Otherwise the RPC will fail and return // [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see - // [SSML](/speech/text-to-speech/docs/ssml). + // [SSML](https://cloud.google.com/text-to-speech/docs/ssml). string ssml = 2; } } diff --git a/renovate.json b/renovate.json index 2da20b3a..eb737df5 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 38ea188c..7eda58c2 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.15 + 1.0.18 @@ -29,7 +29,7 @@ com.google.cloud google-cloud-texttospeech - 1.0.1 + 1.0.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 06a8e55a..22ca0b16 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.15 + 1.0.18 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 01567261..2bce09f4 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.15 + 1.0.18 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-texttospeech - 1.0.1 + 1.0.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 e1a2d5b2..8b0cfcdd 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.15 + 1.0.18 @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 4.4.1 + 7.0.1 pom import diff --git a/synth.metadata b/synth.metadata index ba3662ff..0bc3c1c3 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,27 +1,33 @@ { - "updateTime": "2020-04-02T00:43:37.030585Z", "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-texttospeech.git", + "sha": "7c1548c9d8c545a15589525588fa99125bf5c4d7" + } + }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0341fa3fc2f4073a1b1f260d37b2ce620799f545", - "internalRef": "302980301" + "sha": "bccd840c699996dc3356b537c883a4a09791fdd3", + "internalRef": "317110345" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0341fa3fc2f4073a1b1f260d37b2ce620799f545", - "internalRef": "302980301" + "sha": "bccd840c699996dc3356b537c883a4a09791fdd3", + "internalRef": "317110345" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8" + "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2" } } ], diff --git a/versions.txt b/versions.txt index 87333145..496f311b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-texttospeech-v1:1.0.2:1.0.2 -proto-google-cloud-texttospeech-v1beta1:0.83.2:0.83.2 -grpc-google-cloud-texttospeech-v1beta1:0.83.2:0.83.2 -grpc-google-cloud-texttospeech-v1:1.0.2:1.0.2 -google-cloud-texttospeech:1.0.2:1.0.2 +proto-google-cloud-texttospeech-v1:1.1.0:1.1.0 +proto-google-cloud-texttospeech-v1beta1:0.84.0:0.84.0 +grpc-google-cloud-texttospeech-v1beta1:0.84.0:0.84.0 +grpc-google-cloud-texttospeech-v1:1.1.0:1.1.0 +google-cloud-texttospeech:1.1.0:1.1.0