diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5f0e5d39..3f7432a5 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:a9b83a276c82987d284b733713fe86a3c8a2cc457933767eeb2688b882e54c6a - image: gcr.io/repo-automation-bots/owlbot-java:latest \ No newline at end of file + image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:12cbdc4f137152a1a8b83f50ebc1a4098be0d3baff78b46efaec306f7cfafd13 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 e100454f..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 + - 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 d8a75986..3609547c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [0.2.0](https://www.github.com/googleapis/java-dataflow/compare/v0.1.0...v0.2.0) (2021-08-06) + + +### ⚠ BREAKING CHANGES + +* release gapic-generator-java v2.0.0 (#30) + +### Features + +* release gapic-generator-java v2.0.0 ([#30](https://www.github.com/googleapis/java-dataflow/issues/30)) ([4f06e96](https://www.github.com/googleapis/java-dataflow/commit/4f06e969ba2fbe2e74d53f85ed59609b85fe4fb2)) + + +### Bug Fixes + +* owlbot post-processor should generate README ([#1154](https://www.github.com/googleapis/java-dataflow/issues/1154)) ([#16](https://www.github.com/googleapis/java-dataflow/issues/16)) ([da2549b](https://www.github.com/googleapis/java-dataflow/commit/da2549b56a1c13e1d33d0c03050e41e9d7797426)), closes [#1146](https://www.github.com/googleapis/java-dataflow/issues/1146) [#1147](https://www.github.com/googleapis/java-dataflow/issues/1147) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2 ([#31](https://www.github.com/googleapis/java-dataflow/issues/31)) ([b50b646](https://www.github.com/googleapis/java-dataflow/commit/b50b646cbbb266ed6421cdbd90820d67fa9b6173)) + ## 0.1.0 (2021-07-08) diff --git a/README.md b/README.md index e2b9928f..fd0614f5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Dataflow Client for Java +# Google Dataflow Client for Java Java idiomatic client for [Dataflow][product-docs]. @@ -11,39 +11,48 @@ Java idiomatic client for [Dataflow][product-docs]. > Note: This client is a work-in-progress, and may occasionally > make backwards-incompatible changes. + ## Quickstart If you are using Maven, add this to your pom.xml file: + ```xml com.google.cloud google-cloud-dataflow - 0.0.0 + 0.1.0 + ``` If you are using Gradle without BOM, add this to your dependencies + ```Groovy -compile 'com.google.cloud:google-cloud-dataflow:0.0.0' +compile 'com.google.cloud:google-cloud-dataflow:0.1.0' ``` If you are using SBT, add this to your dependencies + ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.0.0" +libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.1.0" ``` ## 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 Dataflow APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the Dataflow API calls. + ## Getting Started ### Prerequisites You will need a [Google Cloud Platform Console][developer-console] project with the Dataflow [API enabled][enable-api]. -You will need to [enable billing][enable-billing] to use Dataflow. +You will need to [enable billing][enable-billing] to use Google Dataflow. [Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK][cloud-sdk] and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. @@ -61,6 +70,11 @@ to add `google-cloud-dataflow` as a dependency in your code. See the [Dataflow client library docs][javadocs] to learn how to use this Dataflow Client Library. + + + + + ## Troubleshooting To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting]. @@ -69,10 +83,50 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr Dataflow uses gRPC 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 @@ -82,6 +136,7 @@ This library follows [Semantic Versioning](http://semver.org/). It is currently in major version zero (``0.y.z``), which means that anything may change at any time and the public API should not be considered stable. + ## Contributing @@ -93,6 +148,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. @@ -109,7 +165,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] Java is a registered trademark of Oracle and/or its affiliates. -[product-docs]: https://cloud.google.com/dataflow/docs/ +[product-docs]: https://cloud.google.com/dataflow/docs [javadocs]: https://googleapis.dev/java/google-cloud-dataflow/latest/index.html [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataflow/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataflow/java7.html @@ -125,6 +181,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-dataflow.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-dataflow&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/ @@ -135,4 +194,10 @@ Java is a registered trademark of Oracle and/or its affiliates. [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=dataflow.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 \ No newline at end of file +[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-dataflow-bom/pom.xml b/google-cloud-dataflow-bom/pom.xml index 79d27738..bea1600e 100644 --- a/google-cloud-dataflow-bom/pom.xml +++ b/google-cloud-dataflow-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-dataflow-bom - 0.1.0 + 0.2.0 pom com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 Google Dataflow BOM @@ -56,17 +56,17 @@ com.google.cloud google-cloud-dataflow - 0.1.0 + 0.2.0 com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.1.0 + 0.2.0 com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.1.0 + 0.2.0 diff --git a/google-cloud-dataflow/pom.xml b/google-cloud-dataflow/pom.xml index 7ade7429..85c6c0f7 100644 --- a/google-cloud-dataflow/pom.xml +++ b/google-cloud-dataflow/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dataflow - 0.1.0 + 0.2.0 jar Google Dataflow https://github.com/googleapis/java-dataflow @@ -11,7 +11,7 @@ com.google.cloud google-cloud-dataflow-parent - 0.1.0 + 0.2.0 google-cloud-dataflow diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceSettings.java index d9b5492e..b8c46c3e 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceSettings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/FlexTemplatesServiceSettings.java @@ -160,14 +160,13 @@ public FlexTemplatesServiceStubSettings.Builder getStubSettingsBuilder() { return ((FlexTemplatesServiceStubSettings.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-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Client.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Client.java index e3ace372..652c3348 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Client.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Client.java @@ -16,7 +16,6 @@ package com.google.dataflow.v1beta3; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -682,14 +681,7 @@ public static ApiFuture createAsync( ApiFuture futurePage = ListJobsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public ListJobsPagedResponse apply(ListJobsPage input) { - return new ListJobsPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); + futurePage, input -> new ListJobsPagedResponse(input), MoreExecutors.directExecutor()); } private ListJobsPagedResponse(ListJobsPage page) { @@ -757,12 +749,7 @@ public static ApiFuture createAsync( AggregatedListJobsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public AggregatedListJobsPagedResponse apply(AggregatedListJobsPage input) { - return new AggregatedListJobsPagedResponse(input); - } - }, + input -> new AggregatedListJobsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Settings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Settings.java index 0a5468a7..fe1cae76 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Settings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/JobsV1Beta3Settings.java @@ -192,14 +192,13 @@ public JobsV1Beta3StubSettings.Builder getStubSettingsBuilder() { return ((JobsV1Beta3StubSettings.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-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Client.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Client.java index 48fe7cf4..f243b64d 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Client.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Client.java @@ -16,7 +16,6 @@ package com.google.dataflow.v1beta3; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -332,12 +331,7 @@ public static ApiFuture createAsync( ListJobMessagesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListJobMessagesPagedResponse apply(ListJobMessagesPage input) { - return new ListJobMessagesPagedResponse(input); - } - }, + input -> new ListJobMessagesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Settings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Settings.java index c2d4bba0..e09b245b 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Settings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MessagesV1Beta3Settings.java @@ -162,14 +162,13 @@ public MessagesV1Beta3StubSettings.Builder getStubSettingsBuilder() { return ((MessagesV1Beta3StubSettings.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-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Client.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Client.java index 2e4b4615..ba7b80ba 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Client.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Client.java @@ -16,7 +16,6 @@ package com.google.dataflow.v1beta3; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -478,12 +477,7 @@ public static ApiFuture createAsync( GetJobExecutionDetailsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public GetJobExecutionDetailsPagedResponse apply(GetJobExecutionDetailsPage input) { - return new GetJobExecutionDetailsPagedResponse(input); - } - }, + input -> new GetJobExecutionDetailsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -563,12 +557,7 @@ public static ApiFuture createAsync( GetStageExecutionDetailsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public GetStageExecutionDetailsPagedResponse apply(GetStageExecutionDetailsPage input) { - return new GetStageExecutionDetailsPagedResponse(input); - } - }, + input -> new GetStageExecutionDetailsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Settings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Settings.java index cdeb891b..ab8c35d9 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Settings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/MetricsV1Beta3Settings.java @@ -177,14 +177,13 @@ public MetricsV1Beta3StubSettings.Builder getStubSettingsBuilder() { return ((MetricsV1Beta3StubSettings.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-dataflow/src/main/java/com/google/dataflow/v1beta3/SnapshotsV1Beta3Settings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/SnapshotsV1Beta3Settings.java index 084c4456..f37481fd 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/SnapshotsV1Beta3Settings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/SnapshotsV1Beta3Settings.java @@ -167,14 +167,13 @@ public SnapshotsV1Beta3StubSettings.Builder getStubSettingsBuilder() { return ((SnapshotsV1Beta3StubSettings.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-dataflow/src/main/java/com/google/dataflow/v1beta3/TemplatesServiceSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/TemplatesServiceSettings.java index 9a78f8d2..6fc03b7d 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/TemplatesServiceSettings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/TemplatesServiceSettings.java @@ -167,14 +167,13 @@ public TemplatesServiceStubSettings.Builder getStubSettingsBuilder() { return ((TemplatesServiceStubSettings.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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/FlexTemplatesServiceStubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/FlexTemplatesServiceStubSettings.java index 94ce55c9..8f584168 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/FlexTemplatesServiceStubSettings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/FlexTemplatesServiceStubSettings.java @@ -244,14 +244,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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java index 57c494c4..ddea2246 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java @@ -127,7 +127,13 @@ public GrpcOperationsStub getOperationsStub() { @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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java index e1ceba33..e0bc628f 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java @@ -285,7 +285,13 @@ public UnaryCallable snapshotJobCallable() { @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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java index 6fa82831..8d0894f0 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java @@ -137,7 +137,13 @@ public UnaryCallable listJobMes @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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java index 826dbd92..adc3c968 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java @@ -213,7 +213,13 @@ public UnaryCallable getJobMetricsCallable() { @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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java index a739680f..65ec375b 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java @@ -172,7 +172,13 @@ public UnaryCallable listSnapshotsC @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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java index 177ee7bc..1ece4373 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java @@ -175,7 +175,13 @@ public UnaryCallable getTemplateCallabl @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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/JobsV1Beta3StubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/JobsV1Beta3StubSettings.java index 48853613..09070e14 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/JobsV1Beta3StubSettings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/JobsV1Beta3StubSettings.java @@ -486,14 +486,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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MessagesV1Beta3StubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MessagesV1Beta3StubSettings.java index 386cfa46..f813cf37 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MessagesV1Beta3StubSettings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MessagesV1Beta3StubSettings.java @@ -318,14 +318,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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MetricsV1Beta3StubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MetricsV1Beta3StubSettings.java index fba51ff4..72e4c407 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MetricsV1Beta3StubSettings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/MetricsV1Beta3StubSettings.java @@ -448,14 +448,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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/SnapshotsV1Beta3StubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/SnapshotsV1Beta3StubSettings.java index 073a193c..6969ccc8 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/SnapshotsV1Beta3StubSettings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/SnapshotsV1Beta3StubSettings.java @@ -286,14 +286,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-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/TemplatesServiceStubSettings.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/TemplatesServiceStubSettings.java index 64382dd3..8f72d14d 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/TemplatesServiceStubSettings.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/TemplatesServiceStubSettings.java @@ -286,14 +286,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-dataflow-v1beta3/pom.xml b/grpc-google-cloud-dataflow-v1beta3/pom.xml index a9138c58..5569c561 100644 --- a/grpc-google-cloud-dataflow-v1beta3/pom.xml +++ b/grpc-google-cloud-dataflow-v1beta3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.1.0 + 0.2.0 grpc-google-cloud-dataflow-v1beta3 GRPC library for google-cloud-dataflow com.google.cloud google-cloud-dataflow-parent - 0.1.0 + 0.2.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 446f65fe..2b95efdc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dataflow-parent pom - 0.1.0 + 0.2.0 Google Dataflow Parent https://github.com/googleapis/java-dataflow @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 @@ -69,23 +69,23 @@ com.google.cloud google-cloud-dataflow - 0.1.0 + 0.2.0 com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.1.0 + 0.2.0 com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.1.0 + 0.2.0 com.google.cloud google-cloud-shared-dependencies - 1.4.0 + 2.0.0 pom import diff --git a/proto-google-cloud-dataflow-v1beta3/pom.xml b/proto-google-cloud-dataflow-v1beta3/pom.xml index 5f74df19..764570e0 100644 --- a/proto-google-cloud-dataflow-v1beta3/pom.xml +++ b/proto-google-cloud-dataflow-v1beta3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.1.0 + 0.2.0 proto-google-cloud-dataflow-v1beta3 Proto library for google-cloud-dataflow com.google.cloud google-cloud-dataflow-parent - 0.1.0 + 0.2.0 diff --git a/renovate.json b/renovate.json index 32bdc265..6d55cda6 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 3f95dc0e..bfe740e4 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-dataflow - 0.0.0 + 0.1.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 17f1280c..f8e272a6 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-dataflow - 0.0.0 + 0.1.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 7ae62b33..9309fd7e 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-dataflow - 0.0.0 + 0.1.0 diff --git a/versions.txt b/versions.txt index af1ac620..0b430c40 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-dataflow:0.1.0:0.1.0 -grpc-google-cloud-dataflow-v1beta3:0.1.0:0.1.0 -proto-google-cloud-dataflow-v1beta3:0.1.0:0.1.0 +google-cloud-dataflow:0.2.0:0.2.0 +grpc-google-cloud-dataflow-v1beta3:0.2.0:0.2.0 +proto-google-cloud-dataflow-v1beta3:0.2.0:0.2.0