From c1b98e50871526ae5ed943f566133b1a73639ea4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 23:20:42 +0000 Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#433) Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48 Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a --- .../dashboard/v1/DashboardsServiceClient.java | 8 +- .../v1/DashboardsServiceSettings.java | 3 +- .../stub/DashboardsServiceStubSettings.java | 3 +- .../v1/stub/GrpcDashboardsServiceStub.java | 57 ++---- .../dashboard/v1/AlertPolicyName.java | 192 ------------------ 5 files changed, 23 insertions(+), 240 deletions(-) delete mode 100644 proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/AlertPolicyName.java diff --git a/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/DashboardsServiceClient.java b/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/DashboardsServiceClient.java index 620924ea..283898dc 100644 --- a/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/DashboardsServiceClient.java +++ b/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/DashboardsServiceClient.java @@ -16,7 +16,6 @@ package com.google.cloud.monitoring.dashboard.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; @@ -528,12 +527,7 @@ public static ApiFuture createAsync( ListDashboardsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListDashboardsPagedResponse apply(ListDashboardsPage input) { - return new ListDashboardsPagedResponse(input); - } - }, + input -> new ListDashboardsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/DashboardsServiceSettings.java b/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/DashboardsServiceSettings.java index 00c6c11c..4d352780 100644 --- a/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/DashboardsServiceSettings.java +++ b/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/DashboardsServiceSettings.java @@ -189,14 +189,13 @@ public DashboardsServiceStubSettings.Builder getStubSettingsBuilder() { return ((DashboardsServiceStubSettings.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-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/stub/DashboardsServiceStubSettings.java b/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/stub/DashboardsServiceStubSettings.java index 4ad595be..b7cbd10e 100644 --- a/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/stub/DashboardsServiceStubSettings.java +++ b/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/stub/DashboardsServiceStubSettings.java @@ -409,14 +409,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-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/stub/GrpcDashboardsServiceStub.java b/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/stub/GrpcDashboardsServiceStub.java index c634c893..67bb2bca 100644 --- a/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/stub/GrpcDashboardsServiceStub.java +++ b/google-cloud-monitoring-dashboard/src/main/java/com/google/cloud/monitoring/dashboard/v1/stub/GrpcDashboardsServiceStub.java @@ -23,7 +23,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.common.collect.ImmutableMap; import com.google.longrunning.stub.GrpcOperationsStub; @@ -38,7 +37,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; @@ -156,13 +154,10 @@ protected GrpcDashboardsServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createDashboardMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateDashboardRequest 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 @@ -170,52 +165,40 @@ public Map extract(CreateDashboardRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listDashboardsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListDashboardsRequest 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 getDashboardTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getDashboardMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetDashboardRequest 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 deleteDashboardTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteDashboardMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteDashboardRequest 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 updateDashboardTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateDashboardMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateDashboardRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("dashboard.name", String.valueOf(request.getDashboard().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("dashboard.name", String.valueOf(request.getDashboard().getName())); + return params.build(); }) .build(); diff --git a/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/AlertPolicyName.java b/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/AlertPolicyName.java deleted file mode 100644 index 6a3f7ae3..00000000 --- a/proto-google-cloud-monitoring-dashboard-v1/src/main/java/com/google/monitoring/dashboard/v1/AlertPolicyName.java +++ /dev/null @@ -1,192 +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.monitoring.dashboard.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 AlertPolicyName implements ResourceName { - private static final PathTemplate PROJECT_ALERT_POLICY = - PathTemplate.createWithoutUrlEncoding("projects/{project}/alertPolicies/{alert_policy}"); - private volatile Map fieldValuesMap; - private final String project; - private final String alertPolicy; - - @Deprecated - protected AlertPolicyName() { - project = null; - alertPolicy = null; - } - - private AlertPolicyName(Builder builder) { - project = Preconditions.checkNotNull(builder.getProject()); - alertPolicy = Preconditions.checkNotNull(builder.getAlertPolicy()); - } - - public String getProject() { - return project; - } - - public String getAlertPolicy() { - return alertPolicy; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static AlertPolicyName of(String project, String alertPolicy) { - return newBuilder().setProject(project).setAlertPolicy(alertPolicy).build(); - } - - public static String format(String project, String alertPolicy) { - return newBuilder().setProject(project).setAlertPolicy(alertPolicy).build().toString(); - } - - public static AlertPolicyName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - PROJECT_ALERT_POLICY.validatedMatch( - formattedString, "AlertPolicyName.parse: formattedString not in valid format"); - return of(matchMap.get("project"), matchMap.get("alert_policy")); - } - - 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 (AlertPolicyName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return PROJECT_ALERT_POLICY.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 (alertPolicy != null) { - fieldMapBuilder.put("alert_policy", alertPolicy); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return PROJECT_ALERT_POLICY.instantiate("project", project, "alert_policy", alertPolicy); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - AlertPolicyName that = ((AlertPolicyName) o); - return Objects.equals(this.project, that.project) - && Objects.equals(this.alertPolicy, that.alertPolicy); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(project); - h *= 1000003; - h ^= Objects.hashCode(alertPolicy); - return h; - } - - /** Builder for projects/{project}/alertPolicies/{alert_policy}. */ - public static class Builder { - private String project; - private String alertPolicy; - - protected Builder() {} - - public String getProject() { - return project; - } - - public String getAlertPolicy() { - return alertPolicy; - } - - public Builder setProject(String project) { - this.project = project; - return this; - } - - public Builder setAlertPolicy(String alertPolicy) { - this.alertPolicy = alertPolicy; - return this; - } - - private Builder(AlertPolicyName alertPolicyName) { - this.project = alertPolicyName.project; - this.alertPolicy = alertPolicyName.alertPolicy; - } - - public AlertPolicyName build() { - return new AlertPolicyName(this); - } - } -}