Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat!: update gapic generator to 2.0.0, java 8 features #719

Merged
merged 2 commits into from Aug 9, 2021
Merged

feat!: update gapic generator to 2.0.0, java 8 features #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b71b112
chore: release gapic-generator-java v1.0.17
yoshi-automation Aug 5, 2021
27643e5
feat!: release gapic-generator-java v2.0.0
yoshi-automation Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 2 additions & 17 deletions ...oud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.firestore.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 @@ -1395,14 +1394,7 @@ public static ApiFuture<ListIndexesPagedResponse> createAsync(
ApiFuture<ListIndexesPage> futurePage =
ListIndexesPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
new ApiFunction<ListIndexesPage, ListIndexesPagedResponse>() {
@Override
public ListIndexesPagedResponse apply(ListIndexesPage input) {
return new ListIndexesPagedResponse(input);
}
},
MoreExecutors.directExecutor());
futurePage, input -> new ListIndexesPagedResponse(input), MoreExecutors.directExecutor());
}

private ListIndexesPagedResponse(ListIndexesPage page) {
Expand Down Expand Up @@ -1475,14 +1467,7 @@ public static ApiFuture<ListFieldsPagedResponse> createAsync(
ApiFuture<ListFieldsPage> futurePage =
ListFieldsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
new ApiFunction<ListFieldsPage, ListFieldsPagedResponse>() {
@Override
public ListFieldsPagedResponse apply(ListFieldsPage input) {
return new ListFieldsPagedResponse(input);
}
},
MoreExecutors.directExecutor());
futurePage, input -> new ListFieldsPagedResponse(input), MoreExecutors.directExecutor());
}

private ListFieldsPagedResponse(ListFieldsPage page) {
Expand Down
3 changes: 1 addition & 2 deletions ...d-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java
View file
Open in desktop
Expand Up @@ -248,14 +248,13 @@ public FirestoreAdminStubSettings.Builder getStubSettingsBuilder() {
return ((FirestoreAdminStubSettings.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
3 changes: 1 addition & 2 deletions ...re-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java
View file
Open in desktop
Expand Up @@ -697,14 +697,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
109 changes: 43 additions & 66 deletions ...estore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java
View file
Open in desktop
Expand Up @@ -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.common.collect.ImmutableMap;
import com.google.firestore.admin.v1.CreateIndexRequest;
Expand All @@ -52,7 +51,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 @@ -213,117 +211,90 @@ protected GrpcFirestoreAdminStub(
GrpcCallSettings.<CreateIndexRequest, Operation>newBuilder()
.setMethodDescriptor(createIndexMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<CreateIndexRequest>() {
@Override
public Map<String, String> extract(CreateIndexRequest 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<ListIndexesRequest, ListIndexesResponse> listIndexesTransportSettings =
GrpcCallSettings.<ListIndexesRequest, ListIndexesResponse>newBuilder()
.setMethodDescriptor(listIndexesMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<ListIndexesRequest>() {
@Override
public Map<String, String> extract(ListIndexesRequest 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<GetIndexRequest, Index> getIndexTransportSettings =
GrpcCallSettings.<GetIndexRequest, Index>newBuilder()
.setMethodDescriptor(getIndexMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<GetIndexRequest>() {
@Override
public Map<String, String> extract(GetIndexRequest 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<DeleteIndexRequest, Empty> deleteIndexTransportSettings =
GrpcCallSettings.<DeleteIndexRequest, Empty>newBuilder()
.setMethodDescriptor(deleteIndexMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<DeleteIndexRequest>() {
@Override
public Map<String, String> extract(DeleteIndexRequest 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<GetFieldRequest, Field> getFieldTransportSettings =
GrpcCallSettings.<GetFieldRequest, Field>newBuilder()
.setMethodDescriptor(getFieldMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<GetFieldRequest>() {
@Override
public Map<String, String> extract(GetFieldRequest 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<UpdateFieldRequest, Operation> updateFieldTransportSettings =
GrpcCallSettings.<UpdateFieldRequest, Operation>newBuilder()
.setMethodDescriptor(updateFieldMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<UpdateFieldRequest>() {
@Override
public Map<String, String> extract(UpdateFieldRequest request) {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("field.name", String.valueOf(request.getField().getName()));
return params.build();
}
request -> {
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
params.put("field.name", String.valueOf(request.getField().getName()));
return params.build();
})
.build();
GrpcCallSettings<ListFieldsRequest, ListFieldsResponse> listFieldsTransportSettings =
GrpcCallSettings.<ListFieldsRequest, ListFieldsResponse>newBuilder()
.setMethodDescriptor(listFieldsMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<ListFieldsRequest>() {
@Override
public Map<String, String> extract(ListFieldsRequest 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<ExportDocumentsRequest, Operation> exportDocumentsTransportSettings =
GrpcCallSettings.<ExportDocumentsRequest, Operation>newBuilder()
.setMethodDescriptor(exportDocumentsMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<ExportDocumentsRequest>() {
@Override
public Map<String, String> extract(ExportDocumentsRequest 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<ImportDocumentsRequest, Operation> importDocumentsTransportSettings =
GrpcCallSettings.<ImportDocumentsRequest, Operation>newBuilder()
.setMethodDescriptor(importDocumentsMethodDescriptor)
.setParamsExtractor(
new RequestParamsExtractor<ImportDocumentsRequest>() {
@Override
public Map<String, String> extract(ImportDocumentsRequest 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 @@ -474,7 +445,13 @@ public UnaryCallable<ImportDocumentsRequest, Operation> importDocumentsCallable(

@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
22 changes: 3 additions & 19 deletions google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.firestore.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 @@ -1183,12 +1182,7 @@ public static ApiFuture<ListDocumentsPagedResponse> createAsync(
ListDocumentsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
new ApiFunction<ListDocumentsPage, ListDocumentsPagedResponse>() {
@Override
public ListDocumentsPagedResponse apply(ListDocumentsPage input) {
return new ListDocumentsPagedResponse(input);
}
},
input -> new ListDocumentsPagedResponse(input),
MoreExecutors.directExecutor());
}

Expand Down Expand Up @@ -1264,12 +1258,7 @@ public static ApiFuture<PartitionQueryPagedResponse> createAsync(
PartitionQueryPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
new ApiFunction<PartitionQueryPage, PartitionQueryPagedResponse>() {
@Override
public PartitionQueryPagedResponse apply(PartitionQueryPage input) {
return new PartitionQueryPagedResponse(input);
}
},
input -> new PartitionQueryPagedResponse(input),
MoreExecutors.directExecutor());
}

Expand Down Expand Up @@ -1345,12 +1334,7 @@ public static ApiFuture<ListCollectionIdsPagedResponse> createAsync(
ListCollectionIdsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
new ApiFunction<ListCollectionIdsPage, ListCollectionIdsPagedResponse>() {
@Override
public ListCollectionIdsPagedResponse apply(ListCollectionIdsPage input) {
return new ListCollectionIdsPagedResponse(input);
}
},
input -> new ListCollectionIdsPagedResponse(input),
MoreExecutors.directExecutor());
}

Expand Down
3 changes: 1 addition & 2 deletions google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreSettings.java
View file
Open in desktop
Expand Up @@ -265,14 +265,13 @@ public FirestoreStubSettings.Builder getStubSettingsBuilder() {
return ((FirestoreStubSettings.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
3 changes: 1 addition & 2 deletions ...oud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java
View file
Open in desktop
Expand Up @@ -784,14 +784,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