From 4eb2639c322412d21edf6fac3c2510a54b1c72dc Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Thu, 15 Mar 2018 14:52:52 -0400 Subject: [PATCH] Bigtable: 08. Resource Prefixes Regenerate Bigtable GAPIC stubs to enable resource headers --- google-cloud-bigtable/autogen_files.lst | 32 ++-- google-cloud-bigtable/handwritten_files.lst | 95 ++++++---- .../stub/BigtableTableAdminStubSettings.java | 2 +- .../stub/GrpcBigtableInstanceAdminStub.java | 167 ++++++++++++++++++ .../v2/stub/GrpcBigtableTableAdminStub.java | 120 +++++++++++++ .../data/v2/stub/GrpcBigtableStub.java | 57 ++++++ 6 files changed, 422 insertions(+), 51 deletions(-) diff --git a/google-cloud-bigtable/autogen_files.lst b/google-cloud-bigtable/autogen_files.lst index 3fa294ad3c58..ef763544fed7 100644 --- a/google-cloud-bigtable/autogen_files.lst +++ b/google-cloud-bigtable/autogen_files.lst @@ -1,26 +1,26 @@ -src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java -src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java -src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java +src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java +src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java +src/main/java/com/google/cloud/bigtable/data/v2/package-info.java src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java -src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java -src/main/java/com/google/cloud/bigtable/data/v2/package-info.java -src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java -src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java -src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java -src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java -src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java +src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java +src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java +src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java +src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java +src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java +src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java +src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java -src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java -src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java -src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java -src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java +src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java -src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java +src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java +src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java -src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java +src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java +src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java diff --git a/google-cloud-bigtable/handwritten_files.lst b/google-cloud-bigtable/handwritten_files.lst index 7549a50a2469..acf082236813 100644 --- a/google-cloud-bigtable/handwritten_files.lst +++ b/google-cloud-bigtable/handwritten_files.lst @@ -1,49 +1,76 @@ src/test/resources/com/google/cloud/bigtable/data/v2/stub/readrows/read-rows-acceptance-test.json -src/test/java/com/google/cloud/bigtable/gaxx/.DS_Store src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java -src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStatusCode.java -src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java src/test/java/com/google/cloud/bigtable/gaxx/testing/package-info.java -src/test/java/com/google/cloud/bigtable/data/v2/internal/RegexUtilTest.java -src/test/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparatorTest.java -src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java -src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java -src/test/java/com/google/cloud/bigtable/data/v2/models/RowMutationTest.java -src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java -src/test/java/com/google/cloud/bigtable/data/v2/models/RangeTest.java -src/test/java/com/google/cloud/bigtable/data/v2/models/RowTest.java -src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java -src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java +src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java +src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallableTest.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptorTest.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsRetryTest.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallableTest.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallableTest.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryTest.java src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallableTest.java src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallableTest.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallableTest.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallableTest.java +src/test/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallableTest.java src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java +src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java +src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java +src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java +src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java +src/test/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutationTest.java +src/test/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRowTest.java +src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java +src/test/java/com/google/cloud/bigtable/data/v2/models/RowTest.java +src/test/java/com/google/cloud/bigtable/data/v2/models/RowMutationTest.java +src/test/java/com/google/cloud/bigtable/data/v2/models/RangeTest.java +src/test/java/com/google/cloud/bigtable/data/v2/internal/RegexUtilTest.java +src/test/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparatorTest.java +src/main/java/com/google/cloud/bigtable/gaxx/package-info.java +src/main/java/com/google/cloud/bigtable/gaxx/reframing/package-info.java src/main/java/com/google/cloud/bigtable/gaxx/reframing/IncompleteStreamException.java src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java src/main/java/com/google/cloud/bigtable/gaxx/reframing/Reframer.java -src/main/java/com/google/cloud/bigtable/gaxx/reframing/package-info.java -src/main/java/com/google/cloud/bigtable/gaxx/package-info.java -src/main/java/com/google/cloud/bigtable/data/.DS_Store -src/main/java/com/google/cloud/bigtable/data/v2/.DS_Store -src/main/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparator.java -src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java -src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java -src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java -src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java -src/main/java/com/google/cloud/bigtable/data/v2/models/RowAdapter.java -src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java -src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java -src/main/java/com/google/cloud/bigtable/data/v2/models/Row.java -src/main/java/com/google/cloud/bigtable/data/v2/models/Validations.java -src/main/java/com/google/cloud/bigtable/data/v2/models/KeyOffset.java -src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java -src/main/java/com/google/cloud/bigtable/data/v2/models/RowCell.java -src/main/java/com/google/cloud/bigtable/data/v2/models/Range.java -src/main/java/com/google/cloud/bigtable/data/v2/models/RowMutation.java src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java +src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallable.java src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsUserFacingCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/package-info.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptor.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsSpoolingCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/package-info.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsResumptionStrategy.java src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMerger.java src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/StateMachine.java -src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java -src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryCompletedCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallable.java +src/main/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRow.java +src/main/java/com/google/cloud/bigtable/data/v2/models/RowCell.java +src/main/java/com/google/cloud/bigtable/data/v2/models/Validations.java +src/main/java/com/google/cloud/bigtable/data/v2/models/RowMutation.java +src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutationBatcher.java +src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java +src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java +src/main/java/com/google/cloud/bigtable/data/v2/models/RowAdapter.java +src/main/java/com/google/cloud/bigtable/data/v2/models/KeyOffset.java +src/main/java/com/google/cloud/bigtable/data/v2/models/Range.java +src/main/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutation.java +src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java +src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java +src/main/java/com/google/cloud/bigtable/data/v2/models/Row.java +src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java +src/main/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparator.java +src/main/java/com/google/cloud/bigtable/data/v2/internal/DummyBatchingDescriptor.java +src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java +src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java index 297ccc5020f6..175a8a981117 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java @@ -594,7 +594,7 @@ private static Builder initDefaults(Builder builder) { builder .checkConsistencySettings() - .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); builder diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java index b00c2ca06246..660d07ece84c 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java @@ -24,6 +24,7 @@ import com.google.api.gax.grpc.GrpcCallableFactory; 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.bigtable.admin.v2.AppProfile; import com.google.bigtable.admin.v2.Cluster; @@ -50,6 +51,7 @@ import com.google.bigtable.admin.v2.UpdateAppProfileRequest; import com.google.bigtable.admin.v2.UpdateClusterMetadata; import com.google.bigtable.admin.v2.UpdateInstanceMetadata; +import com.google.common.collect.ImmutableMap; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.Policy; import com.google.iam.v1.SetIamPolicyRequest; @@ -61,6 +63,7 @@ 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; @@ -290,77 +293,241 @@ protected GrpcBigtableInstanceAdminStub( GrpcCallSettings createInstanceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createInstanceMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(CreateInstanceRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings getInstanceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getInstanceMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(GetInstanceRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings listInstancesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listInstancesMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(ListInstancesRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings partialUpdateInstanceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(partialUpdateInstanceMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(PartialUpdateInstanceRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "instance.name", String.valueOf(request.getInstance().getName())); + return params.build(); + } + }) .build(); GrpcCallSettings deleteInstanceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteInstanceMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(DeleteInstanceRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings createClusterTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createClusterMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(CreateClusterRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings getClusterTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getClusterMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(GetClusterRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings listClustersTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listClustersMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(ListClustersRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings updateClusterTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateClusterMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(Cluster request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings deleteClusterTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteClusterMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(DeleteClusterRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings createAppProfileTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createAppProfileMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(CreateAppProfileRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings getAppProfileTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getAppProfileMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(GetAppProfileRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings listAppProfilesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listAppProfilesMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(ListAppProfilesRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings updateAppProfileTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateAppProfileMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(UpdateAppProfileRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "app_profile.name", String.valueOf(request.getAppProfile().getName())); + return params.build(); + } + }) .build(); GrpcCallSettings deleteAppProfileTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteAppProfileMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(DeleteAppProfileRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings getIamPolicyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getIamPolicyMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(GetIamPolicyRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("resource", String.valueOf(request.getResource())); + return params.build(); + } + }) .build(); GrpcCallSettings setIamPolicyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(setIamPolicyMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(SetIamPolicyRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("resource", String.valueOf(request.getResource())); + return params.build(); + } + }) .build(); GrpcCallSettings testIamPermissionsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(testIamPermissionsMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(TestIamPermissionsRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("resource", String.valueOf(request.getResource())); + return params.build(); + } + }) .build(); this.createInstanceCallable = diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java index 7a3a23dd033c..14a881630878 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java @@ -25,6 +25,7 @@ import com.google.api.gax.grpc.GrpcCallableFactory; 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.bigtable.admin.v2.CheckConsistencyRequest; import com.google.bigtable.admin.v2.CheckConsistencyResponse; @@ -47,12 +48,14 @@ import com.google.bigtable.admin.v2.SnapshotTableMetadata; import com.google.bigtable.admin.v2.SnapshotTableRequest; import com.google.bigtable.admin.v2.Table; +import com.google.common.collect.ImmutableMap; import com.google.longrunning.Operation; import com.google.longrunning.stub.GrpcOperationsStub; import com.google.protobuf.Empty; 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; @@ -231,58 +234,175 @@ protected GrpcBigtableTableAdminStub( GrpcCallSettings createTableTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createTableMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(CreateTableRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings createTableFromSnapshotTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createTableFromSnapshotMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(CreateTableFromSnapshotRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings listTablesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listTablesMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(ListTablesRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings getTableTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getTableMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(GetTableRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings deleteTableTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteTableMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(DeleteTableRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings modifyColumnFamiliesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(modifyColumnFamiliesMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(ModifyColumnFamiliesRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings dropRowRangeTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(dropRowRangeMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(DropRowRangeRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings generateConsistencyTokenTransportSettings = GrpcCallSettings .newBuilder() .setMethodDescriptor(generateConsistencyTokenMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(GenerateConsistencyTokenRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings checkConsistencyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(checkConsistencyMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(CheckConsistencyRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings snapshotTableTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(snapshotTableMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(SnapshotTableRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings getSnapshotTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getSnapshotMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(GetSnapshotRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); GrpcCallSettings listSnapshotsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listSnapshotsMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(ListSnapshotsRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); + } + }) .build(); GrpcCallSettings deleteSnapshotTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteSnapshotMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(DeleteSnapshotRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); + } + }) .build(); this.createTableCallable = diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java index 71c5ca012855..dc88b7325b52 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java @@ -21,6 +21,7 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcCallableFactory; import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; import com.google.bigtable.v2.CheckAndMutateRowRequest; @@ -35,9 +36,11 @@ import com.google.bigtable.v2.ReadRowsResponse; import com.google.bigtable.v2.SampleRowKeysRequest; import com.google.bigtable.v2.SampleRowKeysResponse; +import com.google.common.collect.ImmutableMap; 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; @@ -136,28 +139,82 @@ protected GrpcBigtableStub(BigtableStubSettings settings, ClientContext clientCo GrpcCallSettings readRowsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(readRowsMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(ReadRowsRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("table_name", String.valueOf(request.getTableName())); + return params.build(); + } + }) .build(); GrpcCallSettings sampleRowKeysTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(sampleRowKeysMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(SampleRowKeysRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("table_name", String.valueOf(request.getTableName())); + return params.build(); + } + }) .build(); GrpcCallSettings mutateRowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(mutateRowMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(MutateRowRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("table_name", String.valueOf(request.getTableName())); + return params.build(); + } + }) .build(); GrpcCallSettings mutateRowsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(mutateRowsMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(MutateRowsRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("table_name", String.valueOf(request.getTableName())); + return params.build(); + } + }) .build(); GrpcCallSettings checkAndMutateRowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(checkAndMutateRowMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(CheckAndMutateRowRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("table_name", String.valueOf(request.getTableName())); + return params.build(); + } + }) .build(); GrpcCallSettings readModifyWriteRowTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(readModifyWriteRowMethodDescriptor) + .setParamsExtractor( + new RequestParamsExtractor() { + @Override + public Map extract(ReadModifyWriteRowRequest request) { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("table_name", String.valueOf(request.getTableName())); + return params.build(); + } + }) .build(); this.readRowsCallable =