From 22223d653a44efa69b421b4fcdaacba3ec7781e5 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 6 Aug 2021 18:10:17 +0000 Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#548) Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48 Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a --- .../budgets/v1/BudgetServiceClient.java | 10 +- .../budgets/v1/BudgetServiceSettings.java | 3 +- .../v1/stub/BudgetServiceStubSettings.java | 3 +- .../v1/stub/GrpcBudgetServiceStub.java | 57 +++--- .../budgets/v1beta1/BudgetServiceClient.java | 10 +- .../v1beta1/BudgetServiceSettings.java | 3 +- .../stub/BudgetServiceStubSettings.java | 3 +- .../v1beta1/stub/GrpcBudgetServiceStub.java | 57 +++--- .../clirr-ignored-differences.xml | 4 + .../clirr-ignored-differences.xml | 4 + .../budgets/v1beta1/BillingAccountName.java | 168 ------------------ 11 files changed, 54 insertions(+), 268 deletions(-) delete mode 100644 proto-google-cloud-billingbudgets-v1beta1/src/main/java/com/google/cloud/billing/budgets/v1beta1/BillingAccountName.java diff --git a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/BudgetServiceClient.java b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/BudgetServiceClient.java index 6b2cd2e0..548ccf0f 100644 --- a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/BudgetServiceClient.java +++ b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/BudgetServiceClient.java @@ -16,7 +16,6 @@ package com.google.cloud.billing.budgets.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; @@ -738,14 +737,7 @@ public static ApiFuture createAsync( ApiFuture futurePage = ListBudgetsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public ListBudgetsPagedResponse apply(ListBudgetsPage input) { - return new ListBudgetsPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); + futurePage, input -> new ListBudgetsPagedResponse(input), MoreExecutors.directExecutor()); } private ListBudgetsPagedResponse(ListBudgetsPage page) { diff --git a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/BudgetServiceSettings.java b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/BudgetServiceSettings.java index dceda29f..346b94b6 100644 --- a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/BudgetServiceSettings.java +++ b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/BudgetServiceSettings.java @@ -181,14 +181,13 @@ public BudgetServiceStubSettings.Builder getStubSettingsBuilder() { return ((BudgetServiceStubSettings.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-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/stub/BudgetServiceStubSettings.java b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/stub/BudgetServiceStubSettings.java index 5df35e3c..14c9f3d9 100644 --- a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/stub/BudgetServiceStubSettings.java +++ b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/stub/BudgetServiceStubSettings.java @@ -402,14 +402,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-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/stub/GrpcBudgetServiceStub.java b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/stub/GrpcBudgetServiceStub.java index 76d35242..ec1bde11 100644 --- a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/stub/GrpcBudgetServiceStub.java +++ b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1/stub/GrpcBudgetServiceStub.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.cloud.billing.budgets.v1.Budget; import com.google.cloud.billing.budgets.v1.CreateBudgetRequest; @@ -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; @@ -146,65 +144,50 @@ protected GrpcBudgetServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createBudgetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateBudgetRequest 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 updateBudgetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateBudgetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateBudgetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("budget.name", String.valueOf(request.getBudget().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("budget.name", String.valueOf(request.getBudget().getName())); + return params.build(); }) .build(); GrpcCallSettings getBudgetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getBudgetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetBudgetRequest 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 listBudgetsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listBudgetsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListBudgetsRequest 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 deleteBudgetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteBudgetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteBudgetRequest 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-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/BudgetServiceClient.java b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/BudgetServiceClient.java index f37d1f8c..fe018850 100644 --- a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/BudgetServiceClient.java +++ b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/BudgetServiceClient.java @@ -16,7 +16,6 @@ package com.google.cloud.billing.budgets.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; @@ -497,14 +496,7 @@ public static ApiFuture createAsync( ApiFuture futurePage = ListBudgetsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public ListBudgetsPagedResponse apply(ListBudgetsPage input) { - return new ListBudgetsPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); + futurePage, input -> new ListBudgetsPagedResponse(input), MoreExecutors.directExecutor()); } private ListBudgetsPagedResponse(ListBudgetsPage page) { diff --git a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/BudgetServiceSettings.java b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/BudgetServiceSettings.java index fcbc940e..6337b47e 100644 --- a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/BudgetServiceSettings.java +++ b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/BudgetServiceSettings.java @@ -182,14 +182,13 @@ public BudgetServiceStubSettings.Builder getStubSettingsBuilder() { return ((BudgetServiceStubSettings.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-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/stub/BudgetServiceStubSettings.java b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/stub/BudgetServiceStubSettings.java index 64c446ba..8d93403f 100644 --- a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/stub/BudgetServiceStubSettings.java +++ b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/stub/BudgetServiceStubSettings.java @@ -403,14 +403,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-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/stub/GrpcBudgetServiceStub.java b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/stub/GrpcBudgetServiceStub.java index 5d1c1bfb..277af91e 100644 --- a/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/stub/GrpcBudgetServiceStub.java +++ b/google-cloud-billingbudgets/src/main/java/com/google/cloud/billing/budgets/v1beta1/stub/GrpcBudgetServiceStub.java @@ -24,7 +24,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.cloud.billing.budgets.v1beta1.Budget; import com.google.cloud.billing.budgets.v1beta1.CreateBudgetRequest; @@ -39,7 +38,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; @@ -148,65 +146,50 @@ protected GrpcBudgetServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createBudgetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateBudgetRequest 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 updateBudgetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateBudgetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateBudgetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("budget.name", String.valueOf(request.getBudget().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("budget.name", String.valueOf(request.getBudget().getName())); + return params.build(); }) .build(); GrpcCallSettings getBudgetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getBudgetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetBudgetRequest 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 listBudgetsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listBudgetsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListBudgetsRequest 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 deleteBudgetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteBudgetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteBudgetRequest 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/proto-google-cloud-billingbudgets-v1/clirr-ignored-differences.xml b/proto-google-cloud-billingbudgets-v1/clirr-ignored-differences.xml index 5b1dbff4..3bcbc162 100644 --- a/proto-google-cloud-billingbudgets-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-billingbudgets-v1/clirr-ignored-differences.xml @@ -16,4 +16,8 @@ com/google/cloud/billing/budgets/v1/*OrBuilder boolean has*(*) + + 8001 + com/google/cloud/billing/budgets/v1/BillingAccountName* + diff --git a/proto-google-cloud-billingbudgets-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-billingbudgets-v1beta1/clirr-ignored-differences.xml index f5fd1ba3..37a55199 100644 --- a/proto-google-cloud-billingbudgets-v1beta1/clirr-ignored-differences.xml +++ b/proto-google-cloud-billingbudgets-v1beta1/clirr-ignored-differences.xml @@ -16,4 +16,8 @@ com/google/cloud/billing/budgets/v1beta1/*OrBuilder boolean has*(*) + + 8001 + com/google/cloud/billing/budgets/v1beta1/Billing* + diff --git a/proto-google-cloud-billingbudgets-v1beta1/src/main/java/com/google/cloud/billing/budgets/v1beta1/BillingAccountName.java b/proto-google-cloud-billingbudgets-v1beta1/src/main/java/com/google/cloud/billing/budgets/v1beta1/BillingAccountName.java deleted file mode 100644 index f7d33a3c..00000000 --- a/proto-google-cloud-billingbudgets-v1beta1/src/main/java/com/google/cloud/billing/budgets/v1beta1/BillingAccountName.java +++ /dev/null @@ -1,168 +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.billing.budgets.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 BillingAccountName implements ResourceName { - private static final PathTemplate BILLING_ACCOUNT = - PathTemplate.createWithoutUrlEncoding("billingAccounts/{billing_account}"); - private volatile Map fieldValuesMap; - private final String billingAccount; - - @Deprecated - protected BillingAccountName() { - billingAccount = null; - } - - private BillingAccountName(Builder builder) { - billingAccount = Preconditions.checkNotNull(builder.getBillingAccount()); - } - - public String getBillingAccount() { - return billingAccount; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static BillingAccountName of(String billingAccount) { - return newBuilder().setBillingAccount(billingAccount).build(); - } - - public static String format(String billingAccount) { - return newBuilder().setBillingAccount(billingAccount).build().toString(); - } - - public static BillingAccountName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - BILLING_ACCOUNT.validatedMatch( - formattedString, "BillingAccountName.parse: formattedString not in valid format"); - return of(matchMap.get("billing_account")); - } - - 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 (BillingAccountName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return BILLING_ACCOUNT.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (billingAccount != null) { - fieldMapBuilder.put("billing_account", billingAccount); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return BILLING_ACCOUNT.instantiate("billing_account", billingAccount); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - BillingAccountName that = ((BillingAccountName) o); - return Objects.equals(this.billingAccount, that.billingAccount); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(billingAccount); - return h; - } - - /** Builder for billingAccounts/{billing_account}. */ - public static class Builder { - private String billingAccount; - - protected Builder() {} - - public String getBillingAccount() { - return billingAccount; - } - - public Builder setBillingAccount(String billingAccount) { - this.billingAccount = billingAccount; - return this; - } - - private Builder(BillingAccountName billingAccountName) { - this.billingAccount = billingAccountName.billingAccount; - } - - public BillingAccountName build() { - return new BillingAccountName(this); - } - } -}