Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -822,12 +821,7 @@ public static ApiFuture<ListTriggersPagedResponse> createAsync(
ListTriggersPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
new ApiFunction<ListTriggersPage, ListTriggersPagedResponse>() {
@Override
public ListTriggersPagedResponse apply(ListTriggersPage input) {
return new ListTriggersPagedResponse(input);
}
},
input -> new ListTriggersPagedResponse(input),
MoreExecutors.directExecutor());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
* <p>Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
super.applyToAllUnaryMethods(
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
* <p>Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -157,65 +155,50 @@ protected GrpcEventarcStub(
GrpcCallSettings.<GetTriggerRequest, Trigger>newBuilder()
.setMethodDescriptor(getTriggerMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<GetTriggerRequest>() {
@Override
public Map<String, String> extract(GetTriggerRequest request) {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("name", String.valueOf(request.getName()));
return params.build();
}
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("name", String.valueOf(request.getName()));
return params.build();
})
.build();
GrpcCallSettings<ListTriggersRequest, ListTriggersResponse> listTriggersTransportSettings =
GrpcCallSettings.<ListTriggersRequest, ListTriggersResponse>newBuilder()
.setMethodDescriptor(listTriggersMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<ListTriggersRequest>() {
@Override
public Map<String, String> extract(ListTriggersRequest request) {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("parent", String.valueOf(request.getParent()));
return params.build();
}
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("parent", String.valueOf(request.getParent()));
return params.build();
})
.build();
GrpcCallSettings<CreateTriggerRequest, Operation> createTriggerTransportSettings =
GrpcCallSettings.<CreateTriggerRequest, Operation>newBuilder()
.setMethodDescriptor(createTriggerMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<CreateTriggerRequest>() {
@Override
public Map<String, String> extract(CreateTriggerRequest request) {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("parent", String.valueOf(request.getParent()));
return params.build();
}
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("parent", String.valueOf(request.getParent()));
return params.build();
})
.build();
GrpcCallSettings<UpdateTriggerRequest, Operation> updateTriggerTransportSettings =
GrpcCallSettings.<UpdateTriggerRequest, Operation>newBuilder()
.setMethodDescriptor(updateTriggerMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<UpdateTriggerRequest>() {
@Override
public Map<String, String> extract(UpdateTriggerRequest request) {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("trigger.name", String.valueOf(request.getTrigger().getName()));
return params.build();
}
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("trigger.name", String.valueOf(request.getTrigger().getName()));
return params.build();
})
.build();
GrpcCallSettings<DeleteTriggerRequest, Operation> deleteTriggerTransportSettings =
GrpcCallSettings.<DeleteTriggerRequest, Operation>newBuilder()
.setMethodDescriptor(deleteTriggerMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<DeleteTriggerRequest>() {
@Override
public Map<String, String> extract(DeleteTriggerRequest request) {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("name", String.valueOf(request.getName()));
return params.build();
}
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("name", String.valueOf(request.getName()));
return params.build();
})
.build();

Expand Down Expand Up @@ -314,7 +297,13 @@ public UnaryCallable<DeleteTriggerRequest, Operation> deleteTriggerCallable() {

@Override
public final void close() {
shutdown();
try {
backgroundResources.close();
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
throw new IllegalStateException("Failed to close resource", e);
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void getTriggerTest() throws Exception {
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
.addAllEventFilters(new ArrayList<EventFilter>())
.setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
.setServiceAccount("serviceAccount1079137720")
.setDestination(Destination.newBuilder().build())
.setTransport(Transport.newBuilder().build())
.putAllLabels(new HashMap<String, String>())
Expand Down Expand Up @@ -142,7 +142,7 @@ public void getTriggerTest2() throws Exception {
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
.addAllEventFilters(new ArrayList<EventFilter>())
.setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
.setServiceAccount("serviceAccount1079137720")
.setDestination(Destination.newBuilder().build())
.setTransport(Transport.newBuilder().build())
.putAllLabels(new HashMap<String, String>())
Expand Down Expand Up @@ -277,7 +277,7 @@ public void createTriggerTest() throws Exception {
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
.addAllEventFilters(new ArrayList<EventFilter>())
.setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
.setServiceAccount("serviceAccount1079137720")
.setDestination(Destination.newBuilder().build())
.setTransport(Transport.newBuilder().build())
.putAllLabels(new HashMap<String, String>())
Expand Down Expand Up @@ -338,7 +338,7 @@ public void createTriggerTest2() throws Exception {
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
.addAllEventFilters(new ArrayList<EventFilter>())
.setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
.setServiceAccount("serviceAccount1079137720")
.setDestination(Destination.newBuilder().build())
.setTransport(Transport.newBuilder().build())
.putAllLabels(new HashMap<String, String>())
Expand Down Expand Up @@ -399,7 +399,7 @@ public void updateTriggerTest() throws Exception {
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
.addAllEventFilters(new ArrayList<EventFilter>())
.setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
.setServiceAccount("serviceAccount1079137720")
.setDestination(Destination.newBuilder().build())
.setTransport(Transport.newBuilder().build())
.putAllLabels(new HashMap<String, String>())
Expand Down Expand Up @@ -460,7 +460,7 @@ public void deleteTriggerTest() throws Exception {
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
.addAllEventFilters(new ArrayList<EventFilter>())
.setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
.setServiceAccount("serviceAccount1079137720")
.setDestination(Destination.newBuilder().build())
.setTransport(Transport.newBuilder().build())
.putAllLabels(new HashMap<String, String>())
Expand Down Expand Up @@ -518,7 +518,7 @@ public void deleteTriggerTest2() throws Exception {
.setCreateTime(Timestamp.newBuilder().build())
.setUpdateTime(Timestamp.newBuilder().build())
.addAllEventFilters(new ArrayList<EventFilter>())
.setServiceAccount(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
.setServiceAccount("serviceAccount1079137720")
.setDestination(Destination.newBuilder().build())
.setTransport(Transport.newBuilder().build())
.putAllLabels(new HashMap<String, String>())
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>0.13.1</version>
<version>1.0.0</version>
</parent>

<developers>
Expand Down
4 changes: 4 additions & 0 deletions proto-google-cloud-eventarc-v1/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@
<className>com/google/cloud/eventarc/v1/*OrBuilder</className>
<method>boolean has*(*)</method>
</difference>
<difference>
<differenceType>8001</differenceType>
<className>com/google/cloud/eventarc/v1/Service*</className>
</difference>
</differences>
Loading