From ee1e8412b62c7c2d4c8ce1e4756dd6a174ba481f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 01:50:14 +0000 Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#92) Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48 Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a --- .../google/cloud/gkehub/v1/GkeHubClient.java | 15 +- .../cloud/gkehub/v1/GkeHubSettings.java | 3 +- .../gkehub/v1/stub/GkeHubStubSettings.java | 3 +- .../cloud/gkehub/v1/stub/GrpcGkeHubStub.java | 123 ++++------ .../cloud/gkehub/v1alpha/GkeHubClient.java | 8 +- .../cloud/gkehub/v1alpha/GkeHubSettings.java | 3 +- .../v1alpha/stub/GkeHubStubSettings.java | 3 +- .../gkehub/v1alpha/stub/GrpcGkeHubStub.java | 57 ++--- .../cloud/gkehub/v1alpha2/GkeHubClient.java | 8 +- .../cloud/gkehub/v1alpha2/GkeHubSettings.java | 3 +- .../v1alpha2/stub/GkeHubStubSettings.java | 3 +- .../gkehub/v1alpha2/stub/GrpcGkeHubStub.java | 79 +++---- .../cloud/gkehub/v1beta/GkeHubClient.java | 8 +- .../cloud/gkehub/v1beta/GkeHubSettings.java | 3 +- .../v1beta/stub/GkeHubStubSettings.java | 3 +- .../gkehub/v1beta/stub/GrpcGkeHubStub.java | 57 ++--- .../GkeHubMembershipServiceClient.java | 8 +- .../GkeHubMembershipServiceSettings.java | 3 +- .../GkeHubMembershipServiceStubSettings.java | 3 +- .../stub/GrpcGkeHubMembershipServiceStub.java | 91 +++---- .../cloud/gkehub/v1/GkeHubClientTest.java | 6 +- .../gkehub/v1alpha/GkeHubClientTest.java | 6 +- .../cloud/gkehub/v1beta/GkeHubClientTest.java | 6 +- .../GkeHubMembershipServiceClientTest.java | 6 +- .../clirr-ignored-differences.xml | 4 + .../google/cloud/gkehub/v1/FeatureName.java | 223 ------------------ .../clirr-ignored-differences.xml | 4 + proto-google-cloud-gkehub-v1alpha/pom.xml | 8 - .../cloud/gkehub/v1alpha/FeatureName.java | 223 ------------------ .../clirr-ignored-differences.xml | 4 + proto-google-cloud-gkehub-v1beta/pom.xml | 8 - .../cloud/gkehub/v1beta/FeatureName.java | 223 ------------------ .../clirr-ignored-differences.xml | 4 + proto-google-cloud-gkehub-v1beta1/pom.xml | 8 - .../cloud/gkehub/v1beta1/MembershipName.java | 223 ------------------ 35 files changed, 188 insertions(+), 1252 deletions(-) delete mode 100644 proto-google-cloud-gkehub-v1/src/main/java/com/google/cloud/gkehub/v1/FeatureName.java delete mode 100644 proto-google-cloud-gkehub-v1alpha/src/main/java/com/google/cloud/gkehub/v1alpha/FeatureName.java delete mode 100644 proto-google-cloud-gkehub-v1beta/src/main/java/com/google/cloud/gkehub/v1beta/FeatureName.java delete mode 100644 proto-google-cloud-gkehub-v1beta1/src/main/java/com/google/cloud/gkehub/v1beta1/MembershipName.java diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/GkeHubClient.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/GkeHubClient.java index 85eabf4c..9bc29332 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/GkeHubClient.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/GkeHubClient.java @@ -16,7 +16,6 @@ package com.google.cloud.gkehub.v1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -1455,12 +1454,7 @@ public static ApiFuture createAsync( ListMembershipsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListMembershipsPagedResponse apply(ListMembershipsPage input) { - return new ListMembershipsPagedResponse(input); - } - }, + input -> new ListMembershipsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1537,12 +1531,7 @@ public static ApiFuture createAsync( ListFeaturesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListFeaturesPagedResponse apply(ListFeaturesPage input) { - return new ListFeaturesPagedResponse(input); - } - }, + input -> new ListFeaturesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/GkeHubSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/GkeHubSettings.java index 4ee5fe29..78b953c1 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/GkeHubSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/GkeHubSettings.java @@ -251,14 +251,13 @@ public GkeHubStubSettings.Builder getStubSettingsBuilder() { return ((GkeHubStubSettings.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-gkehub/src/main/java/com/google/cloud/gkehub/v1/stub/GkeHubStubSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/stub/GkeHubStubSettings.java index 51df553e..c0062e5c 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/stub/GkeHubStubSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/stub/GkeHubStubSettings.java @@ -796,14 +796,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-gkehub/src/main/java/com/google/cloud/gkehub/v1/stub/GrpcGkeHubStub.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/stub/GrpcGkeHubStub.java index 6ac04c58..5fc26392 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/stub/GrpcGkeHubStub.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1/stub/GrpcGkeHubStub.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.gkehub.v1.CreateFeatureRequest; import com.google.cloud.gkehub.v1.CreateMembershipRequest; @@ -51,7 +50,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; @@ -249,130 +247,100 @@ protected GrpcGkeHubStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listMembershipsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListMembershipsRequest 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 listFeaturesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listFeaturesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFeaturesRequest 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 getMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetMembershipRequest 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 getFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetFeatureRequest 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 createMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateMembershipRequest 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 createFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateFeatureRequest 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 deleteMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteMembershipRequest 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 deleteFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteFeatureRequest 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 updateMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateMembershipRequest 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 updateFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateFeatureRequest 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 @@ -381,13 +349,10 @@ public Map extract(UpdateFeatureRequest request) { .newBuilder() .setMethodDescriptor(generateConnectManifestMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GenerateConnectManifestRequest 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(); diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/GkeHubClient.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/GkeHubClient.java index 61148172..5cd90724 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/GkeHubClient.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/GkeHubClient.java @@ -16,7 +16,6 @@ package com.google.cloud.gkehub.v1alpha; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -724,12 +723,7 @@ public static ApiFuture createAsync( ListFeaturesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListFeaturesPagedResponse apply(ListFeaturesPage input) { - return new ListFeaturesPagedResponse(input); - } - }, + input -> new ListFeaturesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/GkeHubSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/GkeHubSettings.java index 594ac3a5..5f761cc0 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/GkeHubSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/GkeHubSettings.java @@ -200,14 +200,13 @@ public GkeHubStubSettings.Builder getStubSettingsBuilder() { return ((GkeHubStubSettings.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-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/stub/GkeHubStubSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/stub/GkeHubStubSettings.java index ca219440..5fbe489c 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/stub/GkeHubStubSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/stub/GkeHubStubSettings.java @@ -503,14 +503,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-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/stub/GrpcGkeHubStub.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/stub/GrpcGkeHubStub.java index 5d55e006..37aa2529 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/stub/GrpcGkeHubStub.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha/stub/GrpcGkeHubStub.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.gkehub.v1alpha.CreateFeatureRequest; import com.google.cloud.gkehub.v1alpha.DeleteFeatureRequest; @@ -42,7 +41,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; @@ -160,65 +158,50 @@ protected GrpcGkeHubStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listFeaturesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFeaturesRequest 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 getFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetFeatureRequest 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 createFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateFeatureRequest 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 deleteFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteFeatureRequest 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 updateFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateFeatureRequest 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(); diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/GkeHubClient.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/GkeHubClient.java index 7f9cb46d..9c6429e2 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/GkeHubClient.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/GkeHubClient.java @@ -16,7 +16,6 @@ package com.google.cloud.gkehub.v1alpha2; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -937,12 +936,7 @@ public static ApiFuture createAsync( ListMembershipsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListMembershipsPagedResponse apply(ListMembershipsPage input) { - return new ListMembershipsPagedResponse(input); - } - }, + input -> new ListMembershipsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/GkeHubSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/GkeHubSettings.java index 0078529c..80a8150b 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/GkeHubSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/GkeHubSettings.java @@ -212,14 +212,13 @@ public GkeHubStubSettings.Builder getStubSettingsBuilder() { return ((GkeHubStubSettings.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-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/stub/GkeHubStubSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/stub/GkeHubStubSettings.java index 12e7ecd8..256a2b3b 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/stub/GkeHubStubSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/stub/GkeHubStubSettings.java @@ -556,14 +556,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-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/stub/GrpcGkeHubStub.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/stub/GrpcGkeHubStub.java index 411c4000..48826df6 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/stub/GrpcGkeHubStub.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1alpha2/stub/GrpcGkeHubStub.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.gkehub.v1alpha2.CreateMembershipRequest; import com.google.cloud.gkehub.v1alpha2.DeleteMembershipRequest; @@ -46,7 +45,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; @@ -196,65 +194,50 @@ protected GrpcGkeHubStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listMembershipsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListMembershipsRequest 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 getMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetMembershipRequest 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 createMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateMembershipRequest 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 deleteMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteMembershipRequest 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 updateMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateMembershipRequest 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 @@ -263,26 +246,20 @@ public Map extract(UpdateMembershipRequest request) { .newBuilder() .setMethodDescriptor(generateConnectManifestMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GenerateConnectManifestRequest 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 initializeHubTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(initializeHubMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(InitializeHubRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("project", String.valueOf(request.getProject())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("project", String.valueOf(request.getProject())); + return params.build(); }) .build(); diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/GkeHubClient.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/GkeHubClient.java index 5141c6fd..d9ea16ca 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/GkeHubClient.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/GkeHubClient.java @@ -16,7 +16,6 @@ package com.google.cloud.gkehub.v1beta; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -724,12 +723,7 @@ public static ApiFuture createAsync( ListFeaturesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListFeaturesPagedResponse apply(ListFeaturesPage input) { - return new ListFeaturesPagedResponse(input); - } - }, + input -> new ListFeaturesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/GkeHubSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/GkeHubSettings.java index 517043c1..04165b9c 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/GkeHubSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/GkeHubSettings.java @@ -200,14 +200,13 @@ public GkeHubStubSettings.Builder getStubSettingsBuilder() { return ((GkeHubStubSettings.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-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/stub/GkeHubStubSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/stub/GkeHubStubSettings.java index 778413fd..320aae7e 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/stub/GkeHubStubSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/stub/GkeHubStubSettings.java @@ -503,14 +503,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-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/stub/GrpcGkeHubStub.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/stub/GrpcGkeHubStub.java index 99ca8e72..500f84e9 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/stub/GrpcGkeHubStub.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta/stub/GrpcGkeHubStub.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.gkehub.v1beta.CreateFeatureRequest; import com.google.cloud.gkehub.v1beta.DeleteFeatureRequest; @@ -42,7 +41,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; @@ -160,65 +158,50 @@ protected GrpcGkeHubStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listFeaturesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFeaturesRequest 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 getFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetFeatureRequest 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 createFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateFeatureRequest 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 deleteFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteFeatureRequest 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 updateFeatureTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateFeatureMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateFeatureRequest 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(); diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceClient.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceClient.java index 692c2ad4..de41b966 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceClient.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceClient.java @@ -16,7 +16,6 @@ package com.google.cloud.gkehub.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; @@ -928,12 +927,7 @@ public static ApiFuture createAsync( ListMembershipsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListMembershipsPagedResponse apply(ListMembershipsPage input) { - return new ListMembershipsPagedResponse(input); - } - }, + input -> new ListMembershipsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceSettings.java index cf9c3a33..17d05547 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceSettings.java @@ -229,14 +229,13 @@ public GkeHubMembershipServiceStubSettings.Builder getStubSettingsBuilder() { return ((GkeHubMembershipServiceStubSettings.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-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/stub/GkeHubMembershipServiceStubSettings.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/stub/GkeHubMembershipServiceStubSettings.java index 305be115..3ff7df25 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/stub/GkeHubMembershipServiceStubSettings.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/stub/GkeHubMembershipServiceStubSettings.java @@ -588,14 +588,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-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/stub/GrpcGkeHubMembershipServiceStub.java b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/stub/GrpcGkeHubMembershipServiceStub.java index e139bb89..ea3d392a 100644 --- a/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/stub/GrpcGkeHubMembershipServiceStub.java +++ b/google-cloud-gkehub/src/main/java/com/google/cloud/gkehub/v1beta1/stub/GrpcGkeHubMembershipServiceStub.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.gkehub.v1beta1.CreateMembershipRequest; import com.google.cloud.gkehub.v1beta1.DeleteMembershipRequest; @@ -48,7 +47,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; @@ -229,65 +227,50 @@ protected GrpcGkeHubMembershipServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listMembershipsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListMembershipsRequest 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 getMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetMembershipRequest 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 createMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateMembershipRequest 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 deleteMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteMembershipRequest 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 updateMembershipTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateMembershipMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateMembershipRequest 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 @@ -296,13 +279,10 @@ public Map extract(UpdateMembershipRequest request) { .newBuilder() .setMethodDescriptor(generateConnectManifestMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GenerateConnectManifestRequest 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 @@ -310,13 +290,10 @@ public Map extract(GenerateConnectManifestRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(validateExclusivityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ValidateExclusivityRequest 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,14 +303,10 @@ public Map extract(ValidateExclusivityRequest request) { newBuilder() .setMethodDescriptor(generateExclusivityManifestMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - GenerateExclusivityManifestRequest 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(); diff --git a/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1/GkeHubClientTest.java b/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1/GkeHubClientTest.java index 11c36744..ef31bae6 100644 --- a/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1/GkeHubClientTest.java +++ b/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1/GkeHubClientTest.java @@ -321,7 +321,7 @@ public void getMembershipExceptionTest2() throws Exception { public void getFeatureTest() throws Exception { Feature expectedResponse = Feature.newBuilder() - .setName(FeatureName.of("[PROJECT]", "[LOCATION]", "[FEATURE]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setResourceState(FeatureResourceState.newBuilder().build()) .setSpec(CommonFeatureSpec.newBuilder().build()) @@ -492,7 +492,7 @@ public void createMembershipExceptionTest2() throws Exception { public void createFeatureTest() throws Exception { Feature expectedResponse = Feature.newBuilder() - .setName(FeatureName.of("[PROJECT]", "[LOCATION]", "[FEATURE]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setResourceState(FeatureResourceState.newBuilder().build()) .setSpec(CommonFeatureSpec.newBuilder().build()) @@ -741,7 +741,7 @@ public void updateMembershipExceptionTest() throws Exception { public void updateFeatureTest() throws Exception { Feature expectedResponse = Feature.newBuilder() - .setName(FeatureName.of("[PROJECT]", "[LOCATION]", "[FEATURE]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setResourceState(FeatureResourceState.newBuilder().build()) .setSpec(CommonFeatureSpec.newBuilder().build()) diff --git a/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1alpha/GkeHubClientTest.java b/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1alpha/GkeHubClientTest.java index 9afc36f9..9e91f1a4 100644 --- a/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1alpha/GkeHubClientTest.java +++ b/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1alpha/GkeHubClientTest.java @@ -134,7 +134,7 @@ public void listFeaturesExceptionTest() throws Exception { public void getFeatureTest() throws Exception { Feature expectedResponse = Feature.newBuilder() - .setName(FeatureName.of("[PROJECT]", "[LOCATION]", "[FEATURE]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setResourceState(FeatureResourceState.newBuilder().build()) .setSpec(CommonFeatureSpec.newBuilder().build()) @@ -181,7 +181,7 @@ public void getFeatureExceptionTest() throws Exception { public void createFeatureTest() throws Exception { Feature expectedResponse = Feature.newBuilder() - .setName(FeatureName.of("[PROJECT]", "[LOCATION]", "[FEATURE]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setResourceState(FeatureResourceState.newBuilder().build()) .setSpec(CommonFeatureSpec.newBuilder().build()) @@ -284,7 +284,7 @@ public void deleteFeatureExceptionTest() throws Exception { public void updateFeatureTest() throws Exception { Feature expectedResponse = Feature.newBuilder() - .setName(FeatureName.of("[PROJECT]", "[LOCATION]", "[FEATURE]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setResourceState(FeatureResourceState.newBuilder().build()) .setSpec(CommonFeatureSpec.newBuilder().build()) diff --git a/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1beta/GkeHubClientTest.java b/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1beta/GkeHubClientTest.java index c5d3d630..d23e5328 100644 --- a/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1beta/GkeHubClientTest.java +++ b/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1beta/GkeHubClientTest.java @@ -134,7 +134,7 @@ public void listFeaturesExceptionTest() throws Exception { public void getFeatureTest() throws Exception { Feature expectedResponse = Feature.newBuilder() - .setName(FeatureName.of("[PROJECT]", "[LOCATION]", "[FEATURE]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setResourceState(FeatureResourceState.newBuilder().build()) .setSpec(CommonFeatureSpec.newBuilder().build()) @@ -181,7 +181,7 @@ public void getFeatureExceptionTest() throws Exception { public void createFeatureTest() throws Exception { Feature expectedResponse = Feature.newBuilder() - .setName(FeatureName.of("[PROJECT]", "[LOCATION]", "[FEATURE]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setResourceState(FeatureResourceState.newBuilder().build()) .setSpec(CommonFeatureSpec.newBuilder().build()) @@ -284,7 +284,7 @@ public void deleteFeatureExceptionTest() throws Exception { public void updateFeatureTest() throws Exception { Feature expectedResponse = Feature.newBuilder() - .setName(FeatureName.of("[PROJECT]", "[LOCATION]", "[FEATURE]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setResourceState(FeatureResourceState.newBuilder().build()) .setSpec(CommonFeatureSpec.newBuilder().build()) diff --git a/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceClientTest.java b/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceClientTest.java index 4faf33d3..c44675ad 100644 --- a/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceClientTest.java +++ b/google-cloud-gkehub/src/test/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceClientTest.java @@ -138,7 +138,7 @@ public void listMembershipsExceptionTest() throws Exception { public void getMembershipTest() throws Exception { Membership expectedResponse = Membership.newBuilder() - .setName(MembershipName.of("[PROJECT]", "[LOCATION]", "[MEMBERSHIP]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setDescription("description-1724546052") .setState(MembershipState.newBuilder().build()) @@ -186,7 +186,7 @@ public void getMembershipExceptionTest() throws Exception { public void createMembershipTest() throws Exception { Membership expectedResponse = Membership.newBuilder() - .setName(MembershipName.of("[PROJECT]", "[LOCATION]", "[MEMBERSHIP]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setDescription("description-1724546052") .setState(MembershipState.newBuilder().build()) @@ -290,7 +290,7 @@ public void deleteMembershipExceptionTest() throws Exception { public void updateMembershipTest() throws Exception { Membership expectedResponse = Membership.newBuilder() - .setName(MembershipName.of("[PROJECT]", "[LOCATION]", "[MEMBERSHIP]").toString()) + .setName("name3373707") .putAllLabels(new HashMap()) .setDescription("description-1724546052") .setState(MembershipState.newBuilder().build()) diff --git a/proto-google-cloud-gkehub-v1/clirr-ignored-differences.xml b/proto-google-cloud-gkehub-v1/clirr-ignored-differences.xml index 3b548074..1493a64c 100644 --- a/proto-google-cloud-gkehub-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-gkehub-v1/clirr-ignored-differences.xml @@ -44,4 +44,8 @@ com/google/cloud/gkehub/v1/*OrBuilder boolean has*(*) + + 8001 + com/google/cloud/gkehub/v1/FeatureName* + diff --git a/proto-google-cloud-gkehub-v1/src/main/java/com/google/cloud/gkehub/v1/FeatureName.java b/proto-google-cloud-gkehub-v1/src/main/java/com/google/cloud/gkehub/v1/FeatureName.java deleted file mode 100644 index 1ae4c669..00000000 --- a/proto-google-cloud-gkehub-v1/src/main/java/com/google/cloud/gkehub/v1/FeatureName.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.gkehub.v1; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class FeatureName implements ResourceName { - private static final PathTemplate PROJECT_LOCATION_FEATURE = - PathTemplate.createWithoutUrlEncoding( - "projects/{project}/locations/{location}/features/{feature}"); - private volatile Map fieldValuesMap; - private final String project; - private final String location; - private final String feature; - - @Deprecated - protected FeatureName() { - project = null; - location = null; - feature = null; - } - - private FeatureName(Builder builder) { - project = Preconditions.checkNotNull(builder.getProject()); - location = Preconditions.checkNotNull(builder.getLocation()); - feature = Preconditions.checkNotNull(builder.getFeature()); - } - - public String getProject() { - return project; - } - - public String getLocation() { - return location; - } - - public String getFeature() { - return feature; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static FeatureName of(String project, String location, String feature) { - return newBuilder().setProject(project).setLocation(location).setFeature(feature).build(); - } - - public static String format(String project, String location, String feature) { - return newBuilder() - .setProject(project) - .setLocation(location) - .setFeature(feature) - .build() - .toString(); - } - - public static FeatureName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - PROJECT_LOCATION_FEATURE.validatedMatch( - formattedString, "FeatureName.parse: formattedString not in valid format"); - return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("feature")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (FeatureName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return PROJECT_LOCATION_FEATURE.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (project != null) { - fieldMapBuilder.put("project", project); - } - if (location != null) { - fieldMapBuilder.put("location", location); - } - if (feature != null) { - fieldMapBuilder.put("feature", feature); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return PROJECT_LOCATION_FEATURE.instantiate( - "project", project, "location", location, "feature", feature); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - FeatureName that = ((FeatureName) o); - return Objects.equals(this.project, that.project) - && Objects.equals(this.location, that.location) - && Objects.equals(this.feature, that.feature); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(project); - h *= 1000003; - h ^= Objects.hashCode(location); - h *= 1000003; - h ^= Objects.hashCode(feature); - return h; - } - - /** Builder for projects/{project}/locations/{location}/features/{feature}. */ - public static class Builder { - private String project; - private String location; - private String feature; - - protected Builder() {} - - public String getProject() { - return project; - } - - public String getLocation() { - return location; - } - - public String getFeature() { - return feature; - } - - public Builder setProject(String project) { - this.project = project; - return this; - } - - public Builder setLocation(String location) { - this.location = location; - return this; - } - - public Builder setFeature(String feature) { - this.feature = feature; - return this; - } - - private Builder(FeatureName featureName) { - this.project = featureName.project; - this.location = featureName.location; - this.feature = featureName.feature; - } - - public FeatureName build() { - return new FeatureName(this); - } - } -} diff --git a/proto-google-cloud-gkehub-v1alpha/clirr-ignored-differences.xml b/proto-google-cloud-gkehub-v1alpha/clirr-ignored-differences.xml index fc2ff32c..e8f68b03 100644 --- a/proto-google-cloud-gkehub-v1alpha/clirr-ignored-differences.xml +++ b/proto-google-cloud-gkehub-v1alpha/clirr-ignored-differences.xml @@ -86,4 +86,8 @@ com/google/cloud/gkehub/v1alpha/*OrBuilder boolean has*(*) + + 8001 + com/google/cloud/gkehub/v1alpha/FeatureName* + diff --git a/proto-google-cloud-gkehub-v1alpha/pom.xml b/proto-google-cloud-gkehub-v1alpha/pom.xml index 1f6d7d6d..b3892f6d 100644 --- a/proto-google-cloud-gkehub-v1alpha/pom.xml +++ b/proto-google-cloud-gkehub-v1alpha/pom.xml @@ -21,14 +21,6 @@ com.google.api.grpc proto-google-common-protos - - com.google.api - api-common - - - com.google.guava - guava - diff --git a/proto-google-cloud-gkehub-v1alpha/src/main/java/com/google/cloud/gkehub/v1alpha/FeatureName.java b/proto-google-cloud-gkehub-v1alpha/src/main/java/com/google/cloud/gkehub/v1alpha/FeatureName.java deleted file mode 100644 index 336b868b..00000000 --- a/proto-google-cloud-gkehub-v1alpha/src/main/java/com/google/cloud/gkehub/v1alpha/FeatureName.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.gkehub.v1alpha; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class FeatureName implements ResourceName { - private static final PathTemplate PROJECT_LOCATION_FEATURE = - PathTemplate.createWithoutUrlEncoding( - "projects/{project}/locations/{location}/features/{feature}"); - private volatile Map fieldValuesMap; - private final String project; - private final String location; - private final String feature; - - @Deprecated - protected FeatureName() { - project = null; - location = null; - feature = null; - } - - private FeatureName(Builder builder) { - project = Preconditions.checkNotNull(builder.getProject()); - location = Preconditions.checkNotNull(builder.getLocation()); - feature = Preconditions.checkNotNull(builder.getFeature()); - } - - public String getProject() { - return project; - } - - public String getLocation() { - return location; - } - - public String getFeature() { - return feature; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static FeatureName of(String project, String location, String feature) { - return newBuilder().setProject(project).setLocation(location).setFeature(feature).build(); - } - - public static String format(String project, String location, String feature) { - return newBuilder() - .setProject(project) - .setLocation(location) - .setFeature(feature) - .build() - .toString(); - } - - public static FeatureName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - PROJECT_LOCATION_FEATURE.validatedMatch( - formattedString, "FeatureName.parse: formattedString not in valid format"); - return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("feature")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (FeatureName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return PROJECT_LOCATION_FEATURE.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (project != null) { - fieldMapBuilder.put("project", project); - } - if (location != null) { - fieldMapBuilder.put("location", location); - } - if (feature != null) { - fieldMapBuilder.put("feature", feature); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return PROJECT_LOCATION_FEATURE.instantiate( - "project", project, "location", location, "feature", feature); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - FeatureName that = ((FeatureName) o); - return Objects.equals(this.project, that.project) - && Objects.equals(this.location, that.location) - && Objects.equals(this.feature, that.feature); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(project); - h *= 1000003; - h ^= Objects.hashCode(location); - h *= 1000003; - h ^= Objects.hashCode(feature); - return h; - } - - /** Builder for projects/{project}/locations/{location}/features/{feature}. */ - public static class Builder { - private String project; - private String location; - private String feature; - - protected Builder() {} - - public String getProject() { - return project; - } - - public String getLocation() { - return location; - } - - public String getFeature() { - return feature; - } - - public Builder setProject(String project) { - this.project = project; - return this; - } - - public Builder setLocation(String location) { - this.location = location; - return this; - } - - public Builder setFeature(String feature) { - this.feature = feature; - return this; - } - - private Builder(FeatureName featureName) { - this.project = featureName.project; - this.location = featureName.location; - this.feature = featureName.feature; - } - - public FeatureName build() { - return new FeatureName(this); - } - } -} diff --git a/proto-google-cloud-gkehub-v1beta/clirr-ignored-differences.xml b/proto-google-cloud-gkehub-v1beta/clirr-ignored-differences.xml index f79529c2..6dd2092b 100644 --- a/proto-google-cloud-gkehub-v1beta/clirr-ignored-differences.xml +++ b/proto-google-cloud-gkehub-v1beta/clirr-ignored-differences.xml @@ -58,4 +58,8 @@ com/google/cloud/gkehub/v1beta/*OrBuilder boolean has*(*) + + 8001 + com/google/cloud/gkehub/v1beta/FeatureName* + diff --git a/proto-google-cloud-gkehub-v1beta/pom.xml b/proto-google-cloud-gkehub-v1beta/pom.xml index 5f06849e..720e57e9 100644 --- a/proto-google-cloud-gkehub-v1beta/pom.xml +++ b/proto-google-cloud-gkehub-v1beta/pom.xml @@ -21,14 +21,6 @@ com.google.api.grpc proto-google-common-protos - - com.google.api - api-common - - - com.google.guava - guava - diff --git a/proto-google-cloud-gkehub-v1beta/src/main/java/com/google/cloud/gkehub/v1beta/FeatureName.java b/proto-google-cloud-gkehub-v1beta/src/main/java/com/google/cloud/gkehub/v1beta/FeatureName.java deleted file mode 100644 index 23dc6e44..00000000 --- a/proto-google-cloud-gkehub-v1beta/src/main/java/com/google/cloud/gkehub/v1beta/FeatureName.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.gkehub.v1beta; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class FeatureName implements ResourceName { - private static final PathTemplate PROJECT_LOCATION_FEATURE = - PathTemplate.createWithoutUrlEncoding( - "projects/{project}/locations/{location}/features/{feature}"); - private volatile Map fieldValuesMap; - private final String project; - private final String location; - private final String feature; - - @Deprecated - protected FeatureName() { - project = null; - location = null; - feature = null; - } - - private FeatureName(Builder builder) { - project = Preconditions.checkNotNull(builder.getProject()); - location = Preconditions.checkNotNull(builder.getLocation()); - feature = Preconditions.checkNotNull(builder.getFeature()); - } - - public String getProject() { - return project; - } - - public String getLocation() { - return location; - } - - public String getFeature() { - return feature; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static FeatureName of(String project, String location, String feature) { - return newBuilder().setProject(project).setLocation(location).setFeature(feature).build(); - } - - public static String format(String project, String location, String feature) { - return newBuilder() - .setProject(project) - .setLocation(location) - .setFeature(feature) - .build() - .toString(); - } - - public static FeatureName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - PROJECT_LOCATION_FEATURE.validatedMatch( - formattedString, "FeatureName.parse: formattedString not in valid format"); - return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("feature")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (FeatureName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return PROJECT_LOCATION_FEATURE.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (project != null) { - fieldMapBuilder.put("project", project); - } - if (location != null) { - fieldMapBuilder.put("location", location); - } - if (feature != null) { - fieldMapBuilder.put("feature", feature); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return PROJECT_LOCATION_FEATURE.instantiate( - "project", project, "location", location, "feature", feature); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - FeatureName that = ((FeatureName) o); - return Objects.equals(this.project, that.project) - && Objects.equals(this.location, that.location) - && Objects.equals(this.feature, that.feature); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(project); - h *= 1000003; - h ^= Objects.hashCode(location); - h *= 1000003; - h ^= Objects.hashCode(feature); - return h; - } - - /** Builder for projects/{project}/locations/{location}/features/{feature}. */ - public static class Builder { - private String project; - private String location; - private String feature; - - protected Builder() {} - - public String getProject() { - return project; - } - - public String getLocation() { - return location; - } - - public String getFeature() { - return feature; - } - - public Builder setProject(String project) { - this.project = project; - return this; - } - - public Builder setLocation(String location) { - this.location = location; - return this; - } - - public Builder setFeature(String feature) { - this.feature = feature; - return this; - } - - private Builder(FeatureName featureName) { - this.project = featureName.project; - this.location = featureName.location; - this.feature = featureName.feature; - } - - public FeatureName build() { - return new FeatureName(this); - } - } -} diff --git a/proto-google-cloud-gkehub-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-gkehub-v1beta1/clirr-ignored-differences.xml index ff1a125c..b493235d 100644 --- a/proto-google-cloud-gkehub-v1beta1/clirr-ignored-differences.xml +++ b/proto-google-cloud-gkehub-v1beta1/clirr-ignored-differences.xml @@ -16,4 +16,8 @@ com/google/cloud/gkehub/v1beta1/*OrBuilder boolean has*(*) + + 8001 + com/google/cloud/gkehub/v1beta1/MembershipName* + diff --git a/proto-google-cloud-gkehub-v1beta1/pom.xml b/proto-google-cloud-gkehub-v1beta1/pom.xml index 7a386aad..5a608c58 100644 --- a/proto-google-cloud-gkehub-v1beta1/pom.xml +++ b/proto-google-cloud-gkehub-v1beta1/pom.xml @@ -21,14 +21,6 @@ com.google.api.grpc proto-google-common-protos - - com.google.api - api-common - - - com.google.guava - guava - diff --git a/proto-google-cloud-gkehub-v1beta1/src/main/java/com/google/cloud/gkehub/v1beta1/MembershipName.java b/proto-google-cloud-gkehub-v1beta1/src/main/java/com/google/cloud/gkehub/v1beta1/MembershipName.java deleted file mode 100644 index 7e4672e3..00000000 --- a/proto-google-cloud-gkehub-v1beta1/src/main/java/com/google/cloud/gkehub/v1beta1/MembershipName.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.gkehub.v1beta1; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class MembershipName implements ResourceName { - private static final PathTemplate PROJECT_LOCATION_MEMBERSHIP = - PathTemplate.createWithoutUrlEncoding( - "projects/{project}/locations/{location}/memberships/{membership}"); - private volatile Map fieldValuesMap; - private final String project; - private final String location; - private final String membership; - - @Deprecated - protected MembershipName() { - project = null; - location = null; - membership = null; - } - - private MembershipName(Builder builder) { - project = Preconditions.checkNotNull(builder.getProject()); - location = Preconditions.checkNotNull(builder.getLocation()); - membership = Preconditions.checkNotNull(builder.getMembership()); - } - - public String getProject() { - return project; - } - - public String getLocation() { - return location; - } - - public String getMembership() { - return membership; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static MembershipName of(String project, String location, String membership) { - return newBuilder().setProject(project).setLocation(location).setMembership(membership).build(); - } - - public static String format(String project, String location, String membership) { - return newBuilder() - .setProject(project) - .setLocation(location) - .setMembership(membership) - .build() - .toString(); - } - - public static MembershipName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - PROJECT_LOCATION_MEMBERSHIP.validatedMatch( - formattedString, "MembershipName.parse: formattedString not in valid format"); - return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("membership")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (MembershipName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return PROJECT_LOCATION_MEMBERSHIP.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (project != null) { - fieldMapBuilder.put("project", project); - } - if (location != null) { - fieldMapBuilder.put("location", location); - } - if (membership != null) { - fieldMapBuilder.put("membership", membership); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return PROJECT_LOCATION_MEMBERSHIP.instantiate( - "project", project, "location", location, "membership", membership); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - MembershipName that = ((MembershipName) o); - return Objects.equals(this.project, that.project) - && Objects.equals(this.location, that.location) - && Objects.equals(this.membership, that.membership); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(project); - h *= 1000003; - h ^= Objects.hashCode(location); - h *= 1000003; - h ^= Objects.hashCode(membership); - return h; - } - - /** Builder for projects/{project}/locations/{location}/memberships/{membership}. */ - public static class Builder { - private String project; - private String location; - private String membership; - - protected Builder() {} - - public String getProject() { - return project; - } - - public String getLocation() { - return location; - } - - public String getMembership() { - return membership; - } - - public Builder setProject(String project) { - this.project = project; - return this; - } - - public Builder setLocation(String location) { - this.location = location; - return this; - } - - public Builder setMembership(String membership) { - this.membership = membership; - return this; - } - - private Builder(MembershipName membershipName) { - this.project = membershipName.project; - this.location = membershipName.location; - this.membership = membershipName.membership; - } - - public MembershipName build() { - return new MembershipName(this); - } - } -}