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..84b918e8 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -1,49 +1,45 @@ - -# 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 (7) + - 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/.repo-metadata.json b/.repo-metadata.json index 99886244..19a618f9 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -1,7 +1,7 @@ { "name": "network-security", "name_pretty": "Network Security API", - "product_documentation": "n/a", + "product_documentation": "https://cloud.google.com/traffic-director/docs/reference/network-security/rest", "api_description": "n/a", "client_documentation": "https://googleapis.dev/java/google-cloud-network-security/latest/index.html", "release_level": "beta", @@ -13,4 +13,4 @@ "api_id": "networksecurity.googleapis.com", "library_type": "GAPIC_AUTO", "requires_billing": true -} \ No newline at end of file +} diff --git a/CHANGELOG.md b/CHANGELOG.md index a472d849..6c8f09f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [0.2.0](https://www.github.com/googleapis/java-network-security/compare/v0.1.0...v0.2.0) (2021-08-10) + + +### ⚠ 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-network-security/issues/30)) ([0616351](https://www.github.com/googleapis/java-network-security/commit/061635185fa0b3416248123990ac7a448305a86a)) + + +### Bug Fixes + +* owlbot post-processor should generate README ([#1154](https://www.github.com/googleapis/java-network-security/issues/1154)) ([#16](https://www.github.com/googleapis/java-network-security/issues/16)) ([c54e4ad](https://www.github.com/googleapis/java-network-security/commit/c54e4ad96a31dfb1816cf76dfe6443e0db11f3d1)), closes [#1146](https://www.github.com/googleapis/java-network-security/issues/1146) [#1147](https://www.github.com/googleapis/java-network-security/issues/1147) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2 ([#31](https://www.github.com/googleapis/java-network-security/issues/31)) ([7c9f533](https://www.github.com/googleapis/java-network-security/commit/7c9f5332e7e1acc50d848d855e9ba8f30f79db61)) + ## 0.1.0 (2021-07-06) diff --git a/README.md b/README.md index e9b47e1b..848e08ba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Network Security API Client for Java +# Google Network Security API Client for Java Java idiomatic client for [Network Security API][product-docs]. @@ -11,39 +11,47 @@ Java idiomatic client for [Network Security API][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-network-security - 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-network-security:0.0.0' +compile 'com.google.cloud:google-cloud-network-security:0.1.0' ``` If you are using SBT, add this to your dependencies + ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-network-security" % "0.0.0" +libraryDependencies += "com.google.cloud" % "google-cloud-network-security" % "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 Network Security API APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the Network Security API API calls. + ## Getting Started ### Prerequisites You will need a [Google Cloud Platform Console][developer-console] project with the Network Security API [API enabled][enable-api]. -You will need to [enable billing][enable-billing] to use Network Security API. +You will need to [enable billing][enable-billing] to use Google Network Security API. [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]`. @@ -56,11 +64,16 @@ to add `google-cloud-network-security` as a dependency in your code. ## About Network Security API -n/a +[Network Security API][product-docs] n/a See the [Network Security API client library docs][javadocs] to learn how to use this Network Security API Client Library. + + + + + ## Troubleshooting To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting]. @@ -69,10 +82,50 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr Network Security API 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 +135,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 +147,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 +164,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/network-security/docs/ +[product-docs]: https://cloud.google.com/traffic-director/docs/reference/network-security/rest [javadocs]: https://googleapis.dev/java/google-cloud-network-security/latest/index.html [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-network-security/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-network-security/java7.html @@ -125,6 +180,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-network-security.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-network-security&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/ @@ -133,6 +191,12 @@ Java is a registered trademark of Oracle and/or its affiliates. [code-of-conduct]: https://github.com/googleapis/java-network-security/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct [license]: https://github.com/googleapis/java-network-security/blob/master/LICENSE [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing -[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=network-security.googleapis.com +[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=networksecurity.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-network-security-bom/pom.xml b/google-cloud-network-security-bom/pom.xml index 5b8d4bc7..e13f514f 100644 --- a/google-cloud-network-security-bom/pom.xml +++ b/google-cloud-network-security-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-network-security-bom - 0.1.0 + 0.2.0 pom com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 Google Network Security API BOM @@ -56,17 +56,17 @@ com.google.cloud google-cloud-network-security - 0.1.0 + 0.2.0 com.google.api.grpc grpc-google-cloud-network-security-v1beta1 - 0.1.0 + 0.2.0 com.google.api.grpc proto-google-cloud-network-security-v1beta1 - 0.1.0 + 0.2.0 diff --git a/google-cloud-network-security/pom.xml b/google-cloud-network-security/pom.xml index fb2934e8..d4c96c4d 100644 --- a/google-cloud-network-security/pom.xml +++ b/google-cloud-network-security/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-network-security - 0.1.0 + 0.2.0 jar Google Network Security API https://github.com/googleapis/java-network-security @@ -11,7 +11,7 @@ com.google.cloud google-cloud-network-security-parent - 0.1.0 + 0.2.0 google-cloud-network-security diff --git a/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/NetworkSecurityClient.java b/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/NetworkSecurityClient.java index 81752f45..cc48fc1a 100644 --- a/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/NetworkSecurityClient.java +++ b/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/NetworkSecurityClient.java @@ -16,7 +16,6 @@ package com.google.cloud.networksecurity.v1beta1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -2162,13 +2161,7 @@ public static ApiFuture createAsync( ListAuthorizationPoliciesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListAuthorizationPoliciesPagedResponse apply( - ListAuthorizationPoliciesPage input) { - return new ListAuthorizationPoliciesPagedResponse(input); - } - }, + input -> new ListAuthorizationPoliciesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -2261,12 +2254,7 @@ public static ApiFuture createAsync( ListServerTlsPoliciesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListServerTlsPoliciesPagedResponse apply(ListServerTlsPoliciesPage input) { - return new ListServerTlsPoliciesPagedResponse(input); - } - }, + input -> new ListServerTlsPoliciesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -2350,12 +2338,7 @@ public static ApiFuture createAsync( ListClientTlsPoliciesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListClientTlsPoliciesPagedResponse apply(ListClientTlsPoliciesPage input) { - return new ListClientTlsPoliciesPagedResponse(input); - } - }, + input -> new ListClientTlsPoliciesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/NetworkSecuritySettings.java b/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/NetworkSecuritySettings.java index 848c2a3d..bae12eb6 100644 --- a/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/NetworkSecuritySettings.java +++ b/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/NetworkSecuritySettings.java @@ -325,14 +325,13 @@ public NetworkSecurityStubSettings.Builder getStubSettingsBuilder() { return ((NetworkSecurityStubSettings.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-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/stub/GrpcNetworkSecurityStub.java b/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/stub/GrpcNetworkSecurityStub.java index 2ea4fc6f..eddc1394 100644 --- a/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/stub/GrpcNetworkSecurityStub.java +++ b/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/stub/GrpcNetworkSecurityStub.java @@ -27,7 +27,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.networksecurity.v1beta1.AuthorizationPolicy; import com.google.cloud.networksecurity.v1beta1.ClientTlsPolicy; @@ -58,7 +57,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; @@ -350,13 +348,10 @@ protected GrpcNetworkSecurityStub( .newBuilder() .setMethodDescriptor(listAuthorizationPoliciesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListAuthorizationPoliciesRequest 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 @@ -364,13 +359,10 @@ public Map extract(ListAuthorizationPoliciesRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getAuthorizationPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetAuthorizationPolicyRequest 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 @@ -378,13 +370,10 @@ public Map extract(GetAuthorizationPolicyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createAuthorizationPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateAuthorizationPolicyRequest 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 @@ -392,15 +381,12 @@ public Map extract(CreateAuthorizationPolicyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateAuthorizationPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateAuthorizationPolicyRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "authorization_policy.name", - String.valueOf(request.getAuthorizationPolicy().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "authorization_policy.name", + String.valueOf(request.getAuthorizationPolicy().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -408,13 +394,10 @@ public Map extract(UpdateAuthorizationPolicyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteAuthorizationPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteAuthorizationPolicyRequest 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 @@ -423,13 +406,10 @@ public Map extract(DeleteAuthorizationPolicyRequest request) { .newBuilder() .setMethodDescriptor(listServerTlsPoliciesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListServerTlsPoliciesRequest 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 @@ -437,13 +417,10 @@ public Map extract(ListServerTlsPoliciesRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getServerTlsPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetServerTlsPolicyRequest 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 @@ -451,13 +428,10 @@ public Map extract(GetServerTlsPolicyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createServerTlsPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateServerTlsPolicyRequest 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 @@ -465,15 +439,12 @@ public Map extract(CreateServerTlsPolicyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateServerTlsPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateServerTlsPolicyRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "server_tls_policy.name", - String.valueOf(request.getServerTlsPolicy().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "server_tls_policy.name", + String.valueOf(request.getServerTlsPolicy().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -481,13 +452,10 @@ public Map extract(UpdateServerTlsPolicyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteServerTlsPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteServerTlsPolicyRequest 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 @@ -496,13 +464,10 @@ public Map extract(DeleteServerTlsPolicyRequest request) { .newBuilder() .setMethodDescriptor(listClientTlsPoliciesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListClientTlsPoliciesRequest 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 @@ -510,13 +475,10 @@ public Map extract(ListClientTlsPoliciesRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getClientTlsPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetClientTlsPolicyRequest 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 @@ -524,13 +486,10 @@ public Map extract(GetClientTlsPolicyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createClientTlsPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateClientTlsPolicyRequest 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 @@ -538,15 +497,12 @@ public Map extract(CreateClientTlsPolicyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateClientTlsPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateClientTlsPolicyRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "client_tls_policy.name", - String.valueOf(request.getClientTlsPolicy().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "client_tls_policy.name", + String.valueOf(request.getClientTlsPolicy().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -554,13 +510,10 @@ public Map extract(UpdateClientTlsPolicyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteClientTlsPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteClientTlsPolicyRequest 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(); @@ -873,7 +826,13 @@ public UnaryCallable deleteClientTlsPol @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-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/stub/NetworkSecurityStubSettings.java b/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/stub/NetworkSecurityStubSettings.java index 3f238be3..107acc53 100644 --- a/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/stub/NetworkSecurityStubSettings.java +++ b/google-cloud-network-security/src/main/java/com/google/cloud/networksecurity/v1beta1/stub/NetworkSecurityStubSettings.java @@ -1170,14 +1170,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-network-security-v1beta1/pom.xml b/grpc-google-cloud-network-security-v1beta1/pom.xml index 1412b689..19b9dee5 100644 --- a/grpc-google-cloud-network-security-v1beta1/pom.xml +++ b/grpc-google-cloud-network-security-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-network-security-v1beta1 - 0.1.0 + 0.2.0 grpc-google-cloud-network-security-v1beta1 GRPC library for google-cloud-network-security com.google.cloud google-cloud-network-security-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 79ee88fc..d07791f6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-network-security-parent pom - 0.1.0 + 0.2.0 Google Network Security API Parent https://github.com/googleapis/java-network-security @@ -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-network-security - 0.1.0 + 0.2.0 com.google.api.grpc grpc-google-cloud-network-security-v1beta1 - 0.1.0 + 0.2.0 com.google.api.grpc proto-google-cloud-network-security-v1beta1 - 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-network-security-v1beta1/pom.xml b/proto-google-cloud-network-security-v1beta1/pom.xml index 9636ee2b..be8dce6b 100644 --- a/proto-google-cloud-network-security-v1beta1/pom.xml +++ b/proto-google-cloud-network-security-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-network-security-v1beta1 - 0.1.0 + 0.2.0 proto-google-cloud-network-security-v1beta1 Proto library for google-cloud-network-security com.google.cloud google-cloud-network-security-parent - 0.1.0 + 0.2.0 diff --git a/renovate.json b/renovate.json index 293198f3..18f3b941 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 7ec85b79..9f0470b6 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-network-security - 0.0.0 + 0.1.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index a3057d6a..a9fb550a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-network-security - 0.0.0 + 0.1.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 0a5b811a..0a8f99e5 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-network-security - 0.0.0 + 0.1.0 diff --git a/versions.txt b/versions.txt index 7a601ed8..d126dd2b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-network-security:0.1.0:0.1.0 -grpc-google-cloud-network-security-v1beta1:0.1.0:0.1.0 -proto-google-cloud-network-security-v1beta1:0.1.0:0.1.0 +google-cloud-network-security:0.2.0:0.2.0 +grpc-google-cloud-network-security-v1beta1:0.2.0:0.2.0 +proto-google-cloud-network-security-v1beta1:0.2.0:0.2.0