diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index a86dc465..3f7432a5 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:a9b83a276c82987d284b733713fe86a3c8a2cc457933767eeb2688b882e54c6a + digest: sha256:12cbdc4f137152a1a8b83f50ebc1a4098be0d3baff78b46efaec306f7cfafd13 diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index cef3f927..aafe6bdd 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-translate.git", - "sha": "95d44a02af82febc7560c46a4c02d747319dbdf3" + "sha": "227b4bd3d09819b6bc41d06b11768994e9c5a1d3" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "4ed0d49a4c89524ccd5bdc7af08d8dada4a15320" + "sha": "dd05f9d12f134871c9e45282349c9856fbebecdd" } } ] diff --git a/.github/release-please.yml b/.github/release-please.yml index 8ca7f9ca..7bf58076 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,3 +1,8 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi +branches: + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-yoshi + branch: java7 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 6bddd18e..ffd39f6f 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -1,49 +1,44 @@ - -# Whether or not rebase-merging is enabled on this repository. -# Defaults to `true` rebaseMergeAllowed: false - -# Whether or not squash-merging is enabled on this repository. -# Defaults to `true` squashMergeAllowed: true - -# Whether or not PRs are merged with a merge commit on this repository. -# Defaults to `false` mergeCommitAllowed: false - -# Rules for master branch protection branchProtectionRules: -# Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master - # Can admins overwrite branch protection. - # Defaults to `true` - isAdminEnforced: true - # Number of approving reviews required to update matching branches. - # Defaults to `1` - requiredApprovingReviewCount: 1 - # Are reviews from code owners required to update matching branches. - # Defaults to `false` - requiresCodeOwnerReviews: true - # Require up to date branches - requiresStrictStatusChecks: false - # List of required status check contexts that must pass for commits to be accepted to matching branches. - requiredStatusCheckContexts: - - "dependencies (8)" - - "dependencies (11)" - - "linkage-monitor" - - "lint" - - "clirr" - - "units (7)" - - "units (8)" - - "units (11)" - - "Kokoro - Test: Integration" - - "cla/google" -# List of explicit permissions to add (additive only) + - pattern: master + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor + - pattern: java7 + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (7) + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor permissionRules: -- team: yoshi-admins - permission: admin -- team: yoshi-java-admins - permission: admin -- team: yoshi-java - permission: push \ No newline at end of file + - team: yoshi-admins + permission: admin + - team: yoshi-java-admins + permission: admin + - team: yoshi-java + permission: push diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0195b32f..65ae6ecd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [7, 8, 11] + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index c03a7b94..2cb97bbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## [2.0.0](https://www.github.com/googleapis/java-translate/compare/v1.98.5...v2.0.0) (2021-08-10) + + +### ⚠ BREAKING CHANGES + +* release gapic-generator-java v2.0.0 (#719) + +### Features + +* release gapic-generator-java v2.0.0 ([#719](https://www.github.com/googleapis/java-translate/issues/719)) ([984e09c](https://www.github.com/googleapis/java-translate/commit/984e09cc78abfbc96d3270184bb73f5b3a66a95c)) + + +### Bug Fixes + +* owlbot post-processor should generate README ([#1154](https://www.github.com/googleapis/java-translate/issues/1154)) ([#621](https://www.github.com/googleapis/java-translate/issues/621)) ([f22e86d](https://www.github.com/googleapis/java-translate/commit/f22e86daf4e306ea72715bf3b0687c88a052de78)), closes [#1146](https://www.github.com/googleapis/java-translate/issues/1146) [#1147](https://www.github.com/googleapis/java-translate/issues/1147) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-core to v2 ([#718](https://www.github.com/googleapis/java-translate/issues/718)) ([072e27c](https://www.github.com/googleapis/java-translate/commit/072e27c9be099963b84ea4f70b5dbb4cf95d7355)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2 ([#720](https://www.github.com/googleapis/java-translate/issues/720)) ([bfbca10](https://www.github.com/googleapis/java-translate/commit/bfbca10f1381057c1430bbf988551d0c87845e43)) +* update dependency com.google.cloud:google-cloud-storage to v1.118.0 ([#615](https://www.github.com/googleapis/java-translate/issues/615)) ([116981d](https://www.github.com/googleapis/java-translate/commit/116981d87e6f953563e12cbbd3682db381ea56d0)) +* update dependency com.google.cloud:google-cloud-storage to v2 ([#724](https://www.github.com/googleapis/java-translate/issues/724)) ([7f18825](https://www.github.com/googleapis/java-translate/commit/7f188255652468b9c4640d947ed73701ba92d6c3)) + ### [1.98.5](https://www.github.com/googleapis/java-translate/compare/v1.98.4...v1.98.5) (2021-07-05) diff --git a/README.md b/README.md index 44c506d6..4bc6b3d8 100644 --- a/README.md +++ b/README.md @@ -8,16 +8,18 @@ Java idiomatic client for [Cloud Translation][product-docs]. - [Product Documentation][product-docs] - [Client Library Documentation][javadocs] + ## Quickstart If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file + ```xml com.google.cloud libraries-bom - 20.6.0 + 20.9.0 pom import @@ -35,35 +37,43 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file If you are using Maven without BOM, add this to your dependencies: + ```xml com.google.cloud google-cloud-translate - 1.98.4 + 1.98.5 ``` If you are using Gradle 5.x or later, add this to your dependencies + ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.6.0') +implementation platform('com.google.cloud:libraries-bom:20.9.0') compile 'com.google.cloud:google-cloud-translate' ``` If you are using Gradle without BOM, add this to your dependencies + ```Groovy -compile 'com.google.cloud:google-cloud-translate:1.98.4' +compile 'com.google.cloud:google-cloud-translate:1.98.5' ``` If you are using SBT, add this to your dependencies + ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-translate" % "1.98.4" +libraryDependencies += "com.google.cloud" % "google-cloud-translate" % "1.98.5" ``` ## Authentication See the [Authentication][authentication] section in the base directory's README. +## Authorization + +The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired Cloud Translation APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the Cloud Translation API calls. + ## Getting Started ### Prerequisites @@ -170,8 +180,7 @@ Default Credentials or a valid API key are available. ## Samples -Samples are in the [`samples/`](https://github.com/googleapis/java-translate/tree/master/samples) directory. The samples' `README.md` -has instructions for running the samples. +Samples are in the [`samples/`](https://github.com/googleapis/java-translate/tree/master/samples) directory. | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | @@ -202,16 +211,57 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr Cloud Translation uses both gRPC and HTTP/JSON for the transport layer. -## Java Versions +## Supported Java Versions Java 7 or above is required for using this client. +Google's Java client libraries, +[Google Cloud Client Libraries][cloudlibs] +and +[Google Cloud API Libraries][apilibs], +follow the +[Oracle Java SE support roadmap][oracle] +(see the Oracle Java SE Product Releases section). + +### For new development + +In general, new feature development occurs with support for the lowest Java +LTS version covered by Oracle's Premier Support (which typically lasts 5 years +from initial General Availability). If the minimum required JVM for a given +library is changed, it is accompanied by a [semver][semver] major release. + +Java 11 and (in September 2021) Java 17 are the best choices for new +development. + +### Keeping production systems current + +Google tests its client libraries with all current LTS versions covered by +Oracle's Extended Support (which typically lasts 8 years from initial +General Availability). + +#### Legacy support + +Google's client libraries support legacy versions of Java runtimes with long +term stable libraries that don't receive feature updates on a best efforts basis +as it may not be possible to backport all patches. + +Google provides updates on a best efforts basis to apps that continue to use +Java 7, though apps might need to upgrade to current versions of the library +that supports their JVM. + +#### Where to find specific information + +The latest versions and the supported Java versions are identified on +the individual GitHub repository `github.com/GoogleAPIs/java-SERVICENAME` +and on [google-cloud-java][g-c-j]. + ## Versioning This library follows [Semantic Versioning](http://semver.org/). + ## Contributing @@ -223,6 +273,7 @@ Please note that this project is released with a Contributor Code of Conduct. By this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. + ## License Apache 2.0 - See [LICENSE][license] for more information. @@ -255,6 +306,9 @@ Java is a registered trademark of Oracle and/or its affiliates. [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-translate.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-translate&core=gav [authentication]: https://github.com/googleapis/google-cloud-java#authentication +[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes +[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles +[iam-policy]: https://cloud.google.com/iam/docs/overview#cloud-iam-policy [developer-console]: https://console.developers.google.com/ [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects [cloud-sdk]: https://cloud.google.com/sdk/ @@ -266,3 +320,9 @@ Java is a registered trademark of Oracle and/or its affiliates. [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=translation.googleapis.com [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png + +[semver]: https://semver.org/ +[cloudlibs]: https://cloud.google.com/apis/docs/client-libraries-explained +[apilibs]: https://cloud.google.com/apis/docs/client-libraries-explained#google_api_client_libraries +[oracle]: https://www.oracle.com/java/technologies/java-se-support-roadmap.html +[g-c-j]: http://github.com/googleapis/google-cloud-java diff --git a/google-cloud-translate-bom/pom.xml b/google-cloud-translate-bom/pom.xml index c01dee67..6c0c97b4 100644 --- a/google-cloud-translate-bom/pom.xml +++ b/google-cloud-translate-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-translate-bom - 1.98.5 + 2.0.0 pom com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 Google Cloud Translate BOM @@ -39,17 +39,6 @@ https://github.com/googleapis/java-translate - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - The Apache Software License, Version 2.0 @@ -63,27 +52,27 @@ com.google.cloud google-cloud-translate - 1.98.5 + 2.0.0 com.google.api.grpc grpc-google-cloud-translate-v3beta1 - 0.81.5 + 0.82.0 com.google.api.grpc grpc-google-cloud-translate-v3 - 1.4.5 + 2.0.0 com.google.api.grpc proto-google-cloud-translate-v3beta1 - 0.81.5 + 0.82.0 com.google.api.grpc proto-google-cloud-translate-v3 - 1.4.5 + 2.0.0 diff --git a/google-cloud-translate/pom.xml b/google-cloud-translate/pom.xml index 50df0a31..500aaad3 100644 --- a/google-cloud-translate/pom.xml +++ b/google-cloud-translate/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-translate - 1.98.5 + 2.0.0 jar Google Cloud Translate https://github.com/googleapis/java-translate @@ -11,7 +11,7 @@ com.google.cloud google-cloud-translate-parent - 1.98.5 + 2.0.0 google-cloud-translate diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceClient.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceClient.java index d596af7d..bcf8cf95 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceClient.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceClient.java @@ -16,7 +16,6 @@ package com.google.cloud.translate.v3; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -1383,12 +1382,7 @@ public static ApiFuture createAsync( ListGlossariesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListGlossariesPagedResponse apply(ListGlossariesPage input) { - return new ListGlossariesPagedResponse(input); - } - }, + input -> new ListGlossariesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceSettings.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceSettings.java index 95779377..cc16e89b 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceSettings.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceSettings.java @@ -221,14 +221,13 @@ public TranslationServiceStubSettings.Builder getStubSettingsBuilder() { return ((TranslationServiceStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/stub/GrpcTranslationServiceStub.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/stub/GrpcTranslationServiceStub.java index ca675c91..caf3bf31 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/stub/GrpcTranslationServiceStub.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/stub/GrpcTranslationServiceStub.java @@ -24,7 +24,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.translate.v3.BatchTranslateMetadata; import com.google.cloud.translate.v3.BatchTranslateResponse; @@ -50,7 +49,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -213,13 +211,10 @@ protected GrpcTranslationServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(translateTextMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(TranslateTextRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -227,13 +222,10 @@ public Map extract(TranslateTextRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(detectLanguageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DetectLanguageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -241,39 +233,30 @@ public Map extract(DetectLanguageRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getSupportedLanguagesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetSupportedLanguagesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings batchTranslateTextTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(batchTranslateTextMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchTranslateTextRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings createGlossaryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createGlossaryMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateGlossaryRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -281,39 +264,30 @@ public Map extract(CreateGlossaryRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listGlossariesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListGlossariesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getGlossaryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getGlossaryMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetGlossaryRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings deleteGlossaryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteGlossaryMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteGlossaryRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); @@ -443,7 +417,13 @@ public UnaryCallable deleteGlossaryCallable() @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/stub/TranslationServiceStubSettings.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/stub/TranslationServiceStubSettings.java index 19dc60c3..8403450b 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/stub/TranslationServiceStubSettings.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/stub/TranslationServiceStubSettings.java @@ -602,14 +602,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/TranslationServiceClient.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/TranslationServiceClient.java index 578a9ac1..a6c53f8f 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/TranslationServiceClient.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/TranslationServiceClient.java @@ -16,7 +16,6 @@ package com.google.cloud.translate.v3beta1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -1367,12 +1366,7 @@ public static ApiFuture createAsync( ListGlossariesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListGlossariesPagedResponse apply(ListGlossariesPage input) { - return new ListGlossariesPagedResponse(input); - } - }, + input -> new ListGlossariesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/TranslationServiceSettings.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/TranslationServiceSettings.java index a4f77f3a..c3e13657 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/TranslationServiceSettings.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/TranslationServiceSettings.java @@ -244,14 +244,13 @@ public TranslationServiceStubSettings.Builder getStubSettingsBuilder() { return ((TranslationServiceStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/stub/GrpcTranslationServiceStub.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/stub/GrpcTranslationServiceStub.java index 2a7c3f86..4c36595f 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/stub/GrpcTranslationServiceStub.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/stub/GrpcTranslationServiceStub.java @@ -25,7 +25,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.translate.v3beta1.BatchTranslateDocumentMetadata; import com.google.cloud.translate.v3beta1.BatchTranslateDocumentRequest; @@ -56,7 +55,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -257,13 +255,10 @@ protected GrpcTranslationServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(translateTextMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(TranslateTextRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -271,13 +266,10 @@ public Map extract(TranslateTextRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(detectLanguageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DetectLanguageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -285,13 +277,10 @@ public Map extract(DetectLanguageRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getSupportedLanguagesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetSupportedLanguagesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -299,26 +288,20 @@ public Map extract(GetSupportedLanguagesRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(translateDocumentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(TranslateDocumentRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings batchTranslateTextTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(batchTranslateTextMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchTranslateTextRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -326,26 +309,20 @@ public Map extract(BatchTranslateTextRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(batchTranslateDocumentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchTranslateDocumentRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings createGlossaryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createGlossaryMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateGlossaryRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -353,39 +330,30 @@ public Map extract(CreateGlossaryRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listGlossariesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListGlossariesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getGlossaryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getGlossaryMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetGlossaryRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings deleteGlossaryTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteGlossaryMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteGlossaryRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); @@ -551,7 +519,13 @@ public UnaryCallable deleteGlossaryCallable() @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/stub/TranslationServiceStubSettings.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/stub/TranslationServiceStubSettings.java index 7408efda..8687b37e 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/stub/TranslationServiceStubSettings.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/v3beta1/stub/TranslationServiceStubSettings.java @@ -698,14 +698,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/grpc-google-cloud-translate-v3/pom.xml b/grpc-google-cloud-translate-v3/pom.xml index 5284940e..e97354a3 100644 --- a/grpc-google-cloud-translate-v3/pom.xml +++ b/grpc-google-cloud-translate-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-translate-v3 - 1.4.5 + 2.0.0 grpc-google-cloud-translate-v3 GRPC library for grpc-google-cloud-translate-v3 com.google.cloud google-cloud-translate-parent - 1.98.5 + 2.0.0 diff --git a/grpc-google-cloud-translate-v3beta1/pom.xml b/grpc-google-cloud-translate-v3beta1/pom.xml index af6ce2e3..6dafefee 100644 --- a/grpc-google-cloud-translate-v3beta1/pom.xml +++ b/grpc-google-cloud-translate-v3beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-translate-v3beta1 - 0.81.5 + 0.82.0 grpc-google-cloud-translate-v3beta1 GRPC library for grpc-google-cloud-translate-v3beta1 com.google.cloud google-cloud-translate-parent - 1.98.5 + 2.0.0 diff --git a/java.header b/java.header index 3a9b503a..d0970ba7 100644 --- a/java.header +++ b/java.header @@ -1,5 +1,5 @@ ^/\*$ -^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$ ^ \*$ ^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$ ^ \* you may not use this file except in compliance with the License\.$ diff --git a/pom.xml b/pom.xml index 0564c974..731b13b4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-translate-parent pom - 1.98.5 + 2.0.0 Google Cloud Translate Parent https://github.com/googleapis/java-translate @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 @@ -41,16 +41,7 @@ https://github.com/googleapis/java-translate/issues GitHub Issues - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + Apache-2.0 @@ -70,33 +61,33 @@ com.google.api.grpc proto-google-cloud-translate-v3beta1 - 0.81.5 + 0.82.0 com.google.api.grpc proto-google-cloud-translate-v3 - 1.4.5 + 2.0.0 com.google.api.grpc grpc-google-cloud-translate-v3beta1 - 0.81.5 + 0.82.0 com.google.api.grpc grpc-google-cloud-translate-v3 - 1.4.5 + 2.0.0 com.google.cloud google-cloud-translate - 1.98.5 + 2.0.0 com.google.cloud google-cloud-shared-dependencies - 1.4.0 + 2.0.0 pom import diff --git a/proto-google-cloud-translate-v3/pom.xml b/proto-google-cloud-translate-v3/pom.xml index 4b1bb148..cf3d35d5 100644 --- a/proto-google-cloud-translate-v3/pom.xml +++ b/proto-google-cloud-translate-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-translate-v3 - 1.4.5 + 2.0.0 proto-google-cloud-translate-v3 PROTO library for proto-google-cloud-translate-v3 com.google.cloud google-cloud-translate-parent - 1.98.5 + 2.0.0 diff --git a/proto-google-cloud-translate-v3beta1/pom.xml b/proto-google-cloud-translate-v3beta1/pom.xml index 5d5777b5..9e2bb8cc 100644 --- a/proto-google-cloud-translate-v3beta1/pom.xml +++ b/proto-google-cloud-translate-v3beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-translate-v3beta1 - 0.81.5 + 0.82.0 proto-google-cloud-translate-v3beta1 PROTO library for proto-google-cloud-translate-v3beta1 com.google.cloud google-cloud-translate-parent - 1.98.5 + 2.0.0 diff --git a/renovate.json b/renovate.json index 5f8cbc21..5f0aec27 100644 --- a/renovate.json +++ b/renovate.json @@ -69,5 +69,8 @@ } ], "semanticCommits": true, - "masterIssue": true + "dependencyDashboard": true, + "dependencyDashboardLabels": [ + "type: process" + ] } diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 523a0241..54a205d9 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,13 +29,13 @@ com.google.cloud google-cloud-translate - 1.98.4 + 1.98.5 com.google.cloud google-cloud-storage - 1.117.1 + 2.0.0 junit @@ -52,7 +52,7 @@ com.google.cloud google-cloud-core - 1.95.4 + 2.0.2 test tests diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 419cd742..a4759e00 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,13 +28,13 @@ com.google.cloud google-cloud-translate - 1.98.5 + 2.0.0 com.google.cloud google-cloud-storage - 1.117.1 + 2.0.0 @@ -52,7 +52,7 @@ com.google.cloud google-cloud-core - 1.95.4 + 2.0.2 test tests diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 0185675d..a6a9d192 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.7.0 + 20.9.0 pom import @@ -62,7 +62,7 @@ com.google.cloud google-cloud-core - 1.95.4 + 2.0.2 test tests diff --git a/versions.txt b/versions.txt index 03dc6eb5..8eb121f0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-translate:1.98.5:1.98.5 -grpc-google-cloud-translate-v3beta1:0.81.5:0.81.5 -grpc-google-cloud-translate-v3:1.4.5:1.4.5 -proto-google-cloud-translate-v3beta1:0.81.5:0.81.5 -proto-google-cloud-translate-v3:1.4.5:1.4.5 +google-cloud-translate:2.0.0:2.0.0 +grpc-google-cloud-translate-v3beta1:0.82.0:0.82.0 +grpc-google-cloud-translate-v3:2.0.0:2.0.0 +proto-google-cloud-translate-v3beta1:0.82.0:0.82.0 +proto-google-cloud-translate-v3:2.0.0:2.0.0