diff --git a/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/EventarcClient.java b/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/EventarcClient.java index 2d44db36..3d75640f 100644 --- a/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/EventarcClient.java +++ b/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/EventarcClient.java @@ -16,7 +16,6 @@ package com.google.cloud.eventarc.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; @@ -822,12 +821,7 @@ public static ApiFuture createAsync( ListTriggersPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListTriggersPagedResponse apply(ListTriggersPage input) { - return new ListTriggersPagedResponse(input); - } - }, + input -> new ListTriggersPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/EventarcSettings.java b/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/EventarcSettings.java index 48597c46..87a09e76 100644 --- a/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/EventarcSettings.java +++ b/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/EventarcSettings.java @@ -198,14 +198,13 @@ public EventarcStubSettings.Builder getStubSettingsBuilder() { return ((EventarcStubSettings.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-eventarc/src/main/java/com/google/cloud/eventarc/v1/stub/EventarcStubSettings.java b/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/stub/EventarcStubSettings.java index 726d65f6..2efb07c1 100644 --- a/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/stub/EventarcStubSettings.java +++ b/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/stub/EventarcStubSettings.java @@ -490,14 +490,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-eventarc/src/main/java/com/google/cloud/eventarc/v1/stub/GrpcEventarcStub.java b/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/stub/GrpcEventarcStub.java index 3fe7ce6e..b3101345 100644 --- a/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/stub/GrpcEventarcStub.java +++ b/google-cloud-eventarc/src/main/java/com/google/cloud/eventarc/v1/stub/GrpcEventarcStub.java @@ -24,7 +24,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.eventarc.v1.CreateTriggerRequest; import com.google.cloud.eventarc.v1.DeleteTriggerRequest; @@ -40,7 +39,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; @@ -157,65 +155,50 @@ protected GrpcEventarcStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(getTriggerMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetTriggerRequest 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 listTriggersTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listTriggersMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListTriggersRequest 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 createTriggerTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createTriggerMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateTriggerRequest 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 updateTriggerTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateTriggerMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateTriggerRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("trigger.name", String.valueOf(request.getTrigger().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("trigger.name", String.valueOf(request.getTrigger().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteTriggerTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteTriggerMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteTriggerRequest 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-eventarc/src/test/java/com/google/cloud/eventarc/v1/EventarcClientTest.java b/google-cloud-eventarc/src/test/java/com/google/cloud/eventarc/v1/EventarcClientTest.java index 62d1e161..c0c545a2 100644 --- a/google-cloud-eventarc/src/test/java/com/google/cloud/eventarc/v1/EventarcClientTest.java +++ b/google-cloud-eventarc/src/test/java/com/google/cloud/eventarc/v1/EventarcClientTest.java @@ -95,7 +95,7 @@ public void getTriggerTest() throws Exception { .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .addAllEventFilters(new ArrayList()) - .setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString()) + .setServiceAccount("serviceAccount1079137720") .setDestination(Destination.newBuilder().build()) .setTransport(Transport.newBuilder().build()) .putAllLabels(new HashMap()) @@ -142,7 +142,7 @@ public void getTriggerTest2() throws Exception { .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .addAllEventFilters(new ArrayList()) - .setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString()) + .setServiceAccount("serviceAccount1079137720") .setDestination(Destination.newBuilder().build()) .setTransport(Transport.newBuilder().build()) .putAllLabels(new HashMap()) @@ -277,7 +277,7 @@ public void createTriggerTest() throws Exception { .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .addAllEventFilters(new ArrayList()) - .setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString()) + .setServiceAccount("serviceAccount1079137720") .setDestination(Destination.newBuilder().build()) .setTransport(Transport.newBuilder().build()) .putAllLabels(new HashMap()) @@ -338,7 +338,7 @@ public void createTriggerTest2() throws Exception { .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .addAllEventFilters(new ArrayList()) - .setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString()) + .setServiceAccount("serviceAccount1079137720") .setDestination(Destination.newBuilder().build()) .setTransport(Transport.newBuilder().build()) .putAllLabels(new HashMap()) @@ -399,7 +399,7 @@ public void updateTriggerTest() throws Exception { .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .addAllEventFilters(new ArrayList()) - .setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString()) + .setServiceAccount("serviceAccount1079137720") .setDestination(Destination.newBuilder().build()) .setTransport(Transport.newBuilder().build()) .putAllLabels(new HashMap()) @@ -460,7 +460,7 @@ public void deleteTriggerTest() throws Exception { .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .addAllEventFilters(new ArrayList()) - .setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString()) + .setServiceAccount("serviceAccount1079137720") .setDestination(Destination.newBuilder().build()) .setTransport(Transport.newBuilder().build()) .putAllLabels(new HashMap()) @@ -518,7 +518,7 @@ public void deleteTriggerTest2() throws Exception { .setCreateTime(Timestamp.newBuilder().build()) .setUpdateTime(Timestamp.newBuilder().build()) .addAllEventFilters(new ArrayList()) - .setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString()) + .setServiceAccount("serviceAccount1079137720") .setDestination(Destination.newBuilder().build()) .setTransport(Transport.newBuilder().build()) .putAllLabels(new HashMap()) diff --git a/proto-google-cloud-eventarc-v1/clirr-ignored-differences.xml b/proto-google-cloud-eventarc-v1/clirr-ignored-differences.xml index ea169713..c7ae76d3 100644 --- a/proto-google-cloud-eventarc-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-eventarc-v1/clirr-ignored-differences.xml @@ -16,4 +16,8 @@ com/google/cloud/eventarc/v1/*OrBuilder boolean has*(*) + + 8001 + com/google/cloud/eventarc/v1/Service* + diff --git a/proto-google-cloud-eventarc-v1/src/main/java/com/google/cloud/eventarc/v1/ServiceAccountName.java b/proto-google-cloud-eventarc-v1/src/main/java/com/google/cloud/eventarc/v1/ServiceAccountName.java deleted file mode 100644 index 04c3e2fd..00000000 --- a/proto-google-cloud-eventarc-v1/src/main/java/com/google/cloud/eventarc/v1/ServiceAccountName.java +++ /dev/null @@ -1,193 +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.eventarc.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 ServiceAccountName implements ResourceName { - private static final PathTemplate PROJECT_SERVICE_ACCOUNT = - PathTemplate.createWithoutUrlEncoding("projects/{project}/serviceAccounts/{service_account}"); - private volatile Map fieldValuesMap; - private final String project; - private final String serviceAccount; - - @Deprecated - protected ServiceAccountName() { - project = null; - serviceAccount = null; - } - - private ServiceAccountName(Builder builder) { - project = Preconditions.checkNotNull(builder.getProject()); - serviceAccount = Preconditions.checkNotNull(builder.getServiceAccount()); - } - - public String getProject() { - return project; - } - - public String getServiceAccount() { - return serviceAccount; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static ServiceAccountName of(String project, String serviceAccount) { - return newBuilder().setProject(project).setServiceAccount(serviceAccount).build(); - } - - public static String format(String project, String serviceAccount) { - return newBuilder().setProject(project).setServiceAccount(serviceAccount).build().toString(); - } - - public static ServiceAccountName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - PROJECT_SERVICE_ACCOUNT.validatedMatch( - formattedString, "ServiceAccountName.parse: formattedString not in valid format"); - return of(matchMap.get("project"), matchMap.get("service_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 (ServiceAccountName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return PROJECT_SERVICE_ACCOUNT.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 (serviceAccount != null) { - fieldMapBuilder.put("service_account", serviceAccount); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return PROJECT_SERVICE_ACCOUNT.instantiate( - "project", project, "service_account", serviceAccount); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - ServiceAccountName that = ((ServiceAccountName) o); - return Objects.equals(this.project, that.project) - && Objects.equals(this.serviceAccount, that.serviceAccount); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(project); - h *= 1000003; - h ^= Objects.hashCode(serviceAccount); - return h; - } - - /** Builder for projects/{project}/serviceAccounts/{service_account}. */ - public static class Builder { - private String project; - private String serviceAccount; - - protected Builder() {} - - public String getProject() { - return project; - } - - public String getServiceAccount() { - return serviceAccount; - } - - public Builder setProject(String project) { - this.project = project; - return this; - } - - public Builder setServiceAccount(String serviceAccount) { - this.serviceAccount = serviceAccount; - return this; - } - - private Builder(ServiceAccountName serviceAccountName) { - this.project = serviceAccountName.project; - this.serviceAccount = serviceAccountName.serviceAccount; - } - - public ServiceAccountName build() { - return new ServiceAccountName(this); - } - } -}