diff --git a/generation_config.yaml b/generation_config.yaml index a3378775fb1a..1c0bd81d92dc 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.68.0 -googleapis_commitish: 8d52a0bd5332bec365647fd792102a25a665e9fe +googleapis_commitish: cd090841ab172574e740c214c99df00aef9c0dee libraries_bom_version: 26.79.0 libraries: - api_shortname: accessapproval diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAcceleratorTypesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAcceleratorTypesStub.java index a737db25514f..2826ec9207fb 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAcceleratorTypesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAcceleratorTypesStub.java @@ -31,6 +31,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AcceleratorType; import com.google.cloud.compute.v1.AcceleratorTypeAggregatedList; import com.google.cloud.compute.v1.AcceleratorTypeList; @@ -220,6 +221,13 @@ public class HttpJsonAcceleratorTypesStub extends AcceleratorTypesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/acceleratorTypes/{accelerator_type}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + public static final HttpJsonAcceleratorTypesStub create(AcceleratorTypesStubSettings settings) throws IOException { return new HttpJsonAcceleratorTypesStub(settings, ClientContext.create(settings)); @@ -271,6 +279,13 @@ protected HttpJsonAcceleratorTypesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -284,6 +299,15 @@ protected HttpJsonAcceleratorTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "accelerator_type", String.valueOf(request.getAcceleratorType())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -296,6 +320,13 @@ protected HttpJsonAcceleratorTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAddressesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAddressesStub.java index 548e3cfa28cf..738337b489cc 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAddressesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAddressesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.Address; import com.google.cloud.compute.v1.AddressAggregatedList; import com.google.cloud.compute.v1.AddressList; @@ -495,6 +496,23 @@ public class HttpJsonAddressesStub extends AddressesStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/addresses/{address}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/addresses/{address}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate MOVE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/addresses/{address}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/addresses/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/addresses/{resource}"); + public static final HttpJsonAddressesStub create(AddressesStubSettings settings) throws IOException { return new HttpJsonAddressesStub(settings, ClientContext.create(settings)); @@ -545,6 +563,13 @@ protected HttpJsonAddressesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -558,6 +583,14 @@ protected HttpJsonAddressesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("address", String.valueOf(request.getAddress())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -571,6 +604,14 @@ protected HttpJsonAddressesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("address", String.valueOf(request.getAddress())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -583,6 +624,13 @@ protected HttpJsonAddressesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -595,6 +643,13 @@ protected HttpJsonAddressesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings moveTransportSettings = HttpJsonCallSettings.newBuilder() @@ -608,6 +663,14 @@ protected HttpJsonAddressesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("address", String.valueOf(request.getAddress())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return MOVE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -621,6 +684,14 @@ protected HttpJsonAddressesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -636,6 +707,15 @@ protected HttpJsonAddressesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAutoscalersStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAutoscalersStub.java index cfa4da686038..62ca87c3ea5d 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAutoscalersStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonAutoscalersStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListAutoscalersRequest; import com.google.cloud.compute.v1.Autoscaler; import com.google.cloud.compute.v1.AutoscalerAggregatedList; @@ -508,6 +509,23 @@ public class HttpJsonAutoscalersStub extends AutoscalersStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/autoscalers/{autoscaler}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/autoscalers/{autoscaler}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/autoscalers/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + public static final HttpJsonAutoscalersStub create(AutoscalersStubSettings settings) throws IOException { return new HttpJsonAutoscalersStub(settings, ClientContext.create(settings)); @@ -559,6 +577,13 @@ protected HttpJsonAutoscalersStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -572,6 +597,14 @@ protected HttpJsonAutoscalersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("autoscaler", String.valueOf(request.getAutoscaler())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -585,6 +618,14 @@ protected HttpJsonAutoscalersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("autoscaler", String.valueOf(request.getAutoscaler())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -597,6 +638,13 @@ protected HttpJsonAutoscalersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -609,6 +657,13 @@ protected HttpJsonAutoscalersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -621,6 +676,13 @@ protected HttpJsonAutoscalersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -636,6 +698,15 @@ protected HttpJsonAutoscalersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -648,6 +719,13 @@ protected HttpJsonAutoscalersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonBackendBucketsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonBackendBucketsStub.java index 868976dec34d..640561edd5d9 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonBackendBucketsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonBackendBucketsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddSignedUrlKeyBackendBucketRequest; import com.google.cloud.compute.v1.BackendBucket; import com.google.cloud.compute.v1.BackendBucketList; @@ -695,6 +696,31 @@ public class HttpJsonBackendBucketsStub extends BackendBucketsStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_SIGNED_URL_KEY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{backend_bucket}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{backend_bucket}"); + private static final PathTemplate DELETE_SIGNED_URL_KEY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{backend_bucket}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{backend_bucket}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{backend_bucket}"); + private static final PathTemplate SET_EDGE_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{backend_bucket}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendBuckets/{backend_bucket}"); + public static final HttpJsonBackendBucketsStub create(BackendBucketsStubSettings settings) throws IOException { return new HttpJsonBackendBucketsStub(settings, ClientContext.create(settings)); @@ -748,6 +774,15 @@ protected HttpJsonBackendBucketsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_bucket", String.valueOf(request.getBackendBucket())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return ADD_SIGNED_URL_KEY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -760,6 +795,14 @@ protected HttpJsonBackendBucketsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_bucket", String.valueOf(request.getBackendBucket())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteSignedUrlKeyTransportSettings = @@ -773,6 +816,15 @@ protected HttpJsonBackendBucketsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_bucket", String.valueOf(request.getBackendBucket())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_SIGNED_URL_KEY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -785,6 +837,14 @@ protected HttpJsonBackendBucketsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_bucket", String.valueOf(request.getBackendBucket())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -797,6 +857,13 @@ protected HttpJsonBackendBucketsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -808,6 +875,12 @@ protected HttpJsonBackendBucketsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -819,6 +892,12 @@ protected HttpJsonBackendBucketsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -831,6 +910,14 @@ protected HttpJsonBackendBucketsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_bucket", String.valueOf(request.getBackendBucket())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setEdgeSecurityPolicyTransportSettings = @@ -844,6 +931,15 @@ protected HttpJsonBackendBucketsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_bucket", String.valueOf(request.getBackendBucket())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return SET_EDGE_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -856,6 +952,13 @@ protected HttpJsonBackendBucketsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -870,6 +973,14 @@ protected HttpJsonBackendBucketsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -882,6 +993,14 @@ protected HttpJsonBackendBucketsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_bucket", String.valueOf(request.getBackendBucket())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.addSignedUrlKeyCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonBackendServicesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonBackendServicesStub.java index 710db226ffaa..9b8ae3335274 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonBackendServicesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonBackendServicesStub.java @@ -34,6 +34,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddSignedUrlKeyBackendServiceRequest; import com.google.cloud.compute.v1.AggregatedListBackendServicesRequest; import com.google.cloud.compute.v1.BackendService; @@ -985,6 +986,41 @@ public class HttpJsonBackendServicesStub extends BackendServicesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_SIGNED_URL_KEY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + private static final PathTemplate DELETE_SIGNED_URL_KEY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + private static final PathTemplate GET_EFFECTIVE_SECURITY_POLICIES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + private static final PathTemplate GET_HEALTH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_USABLE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + private static final PathTemplate SET_EDGE_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{resource}"); + private static final PathTemplate SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/backendServices/{backend_service}"); + public static final HttpJsonBackendServicesStub create(BackendServicesStubSettings settings) throws IOException { return new HttpJsonBackendServicesStub(settings, ClientContext.create(settings)); @@ -1038,6 +1074,15 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return ADD_SIGNED_URL_KEY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings aggregatedListTransportSettings = @@ -1051,6 +1096,13 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1063,6 +1115,14 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteSignedUrlKeyTransportSettings = @@ -1076,6 +1136,15 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_SIGNED_URL_KEY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1088,6 +1157,14 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< GetEffectiveSecurityPoliciesBackendServiceRequest, @@ -1106,6 +1183,15 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_EFFECTIVE_SECURITY_POLICIES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getHealthTransportSettings = @@ -1120,6 +1206,14 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_HEALTH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1132,6 +1226,13 @@ protected HttpJsonBackendServicesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1143,6 +1244,12 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1154,6 +1261,12 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listUsableTransportSettings = @@ -1167,6 +1280,12 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_USABLE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1179,6 +1298,14 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setEdgeSecurityPolicyTransportSettings = @@ -1192,6 +1319,15 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return SET_EDGE_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1204,6 +1340,13 @@ protected HttpJsonBackendServicesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setSecurityPolicyTransportSettings = @@ -1217,6 +1360,15 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -1231,6 +1383,14 @@ protected HttpJsonBackendServicesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1243,6 +1403,14 @@ protected HttpJsonBackendServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.addSignedUrlKeyCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonCrossSiteNetworksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonCrossSiteNetworksStub.java index 399bf9ec98ea..36db71fe30b6 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonCrossSiteNetworksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonCrossSiteNetworksStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.CrossSiteNetwork; import com.google.cloud.compute.v1.CrossSiteNetworkList; import com.google.cloud.compute.v1.DeleteCrossSiteNetworkRequest; @@ -337,6 +338,17 @@ public class HttpJsonCrossSiteNetworksStub extends CrossSiteNetworksStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/crossSiteNetworks/{cross_site_network}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/crossSiteNetworks/{cross_site_network}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/crossSiteNetworks/{cross_site_network}"); + public static final HttpJsonCrossSiteNetworksStub create(CrossSiteNetworksStubSettings settings) throws IOException { return new HttpJsonCrossSiteNetworksStub(settings, ClientContext.create(settings)); @@ -389,6 +401,14 @@ protected HttpJsonCrossSiteNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "cross_site_network", String.valueOf(request.getCrossSiteNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -401,6 +421,14 @@ protected HttpJsonCrossSiteNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "cross_site_network", String.valueOf(request.getCrossSiteNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -412,6 +440,12 @@ protected HttpJsonCrossSiteNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -423,6 +457,12 @@ protected HttpJsonCrossSiteNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -435,6 +475,14 @@ protected HttpJsonCrossSiteNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "cross_site_network", String.valueOf(request.getCrossSiteNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonDiskTypesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonDiskTypesStub.java index 0855133124a6..704926c257b2 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonDiskTypesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonDiskTypesStub.java @@ -31,6 +31,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListDiskTypesRequest; import com.google.cloud.compute.v1.DiskType; import com.google.cloud.compute.v1.DiskTypeAggregatedList; @@ -216,6 +217,13 @@ public class HttpJsonDiskTypesStub extends DiskTypesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/diskTypes/{disk_type}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + public static final HttpJsonDiskTypesStub create(DiskTypesStubSettings settings) throws IOException { return new HttpJsonDiskTypesStub(settings, ClientContext.create(settings)); @@ -265,6 +273,13 @@ protected HttpJsonDiskTypesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -278,6 +293,14 @@ protected HttpJsonDiskTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk_type", String.valueOf(request.getDiskType())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -290,6 +313,13 @@ protected HttpJsonDiskTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonDisksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonDisksStub.java index ce8847dcf0f4..b4d8eacf9f58 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonDisksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonDisksStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddResourcePoliciesDiskRequest; import com.google.cloud.compute.v1.AggregatedListDisksRequest; import com.google.cloud.compute.v1.BulkInsertDiskRequest; @@ -1131,6 +1132,45 @@ public class HttpJsonDisksStub extends DisksStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{disk}"); + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate BULK_INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate BULK_SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate CREATE_SNAPSHOT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{disk}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{disk}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{disk}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate REMOVE_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{disk}"); + private static final PathTemplate RESIZE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{disk}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{resource}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{resource}"); + private static final PathTemplate START_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{disk}"); + private static final PathTemplate STOP_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{disk}"); + private static final PathTemplate STOP_GROUP_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/disks/{disk}"); + public static final HttpJsonDisksStub create(DisksStubSettings settings) throws IOException { return new HttpJsonDisksStub(settings, ClientContext.create(settings)); } @@ -1181,6 +1221,15 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return ADD_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings aggregatedListTransportSettings = @@ -1193,6 +1242,13 @@ protected HttpJsonDisksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings bulkInsertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1205,6 +1261,13 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return BULK_INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings bulkSetLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1217,6 +1280,13 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return BULK_SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings createSnapshotTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1230,6 +1300,14 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return CREATE_SNAPSHOT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1243,6 +1321,14 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1256,6 +1342,14 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1269,6 +1363,14 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1281,6 +1383,13 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1293,6 +1402,13 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removeResourcePoliciesTransportSettings = @@ -1307,6 +1423,15 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return REMOVE_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings resizeTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1320,6 +1445,14 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return RESIZE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1333,6 +1466,14 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1346,6 +1487,14 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings startAsyncReplicationTransportSettings = @@ -1360,6 +1509,15 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return START_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings stopAsyncReplicationTransportSettings = @@ -1374,6 +1532,15 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return STOP_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings stopGroupAsyncReplicationTransportSettings = @@ -1387,6 +1554,14 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return STOP_GROUP_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -1402,6 +1577,15 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1415,6 +1599,14 @@ protected HttpJsonDisksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.addResourcePoliciesCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonExternalVpnGatewaysStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonExternalVpnGatewaysStub.java index 91add1ecf426..263f5c2d00cb 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonExternalVpnGatewaysStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonExternalVpnGatewaysStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteExternalVpnGatewayRequest; import com.google.cloud.compute.v1.ExternalVpnGateway; import com.google.cloud.compute.v1.ExternalVpnGatewayList; @@ -368,6 +369,19 @@ public class HttpJsonExternalVpnGatewaysStub extends ExternalVpnGatewaysStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/externalVpnGateways/{external_vpn_gateway}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/externalVpnGateways/{external_vpn_gateway}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/externalVpnGateways/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/externalVpnGateways/{resource}"); + public static final HttpJsonExternalVpnGatewaysStub create( ExternalVpnGatewaysStubSettings settings) throws IOException { return new HttpJsonExternalVpnGatewaysStub(settings, ClientContext.create(settings)); @@ -421,6 +435,14 @@ protected HttpJsonExternalVpnGatewaysStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "external_vpn_gateway", String.valueOf(request.getExternalVpnGateway())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -434,6 +456,14 @@ protected HttpJsonExternalVpnGatewaysStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "external_vpn_gateway", String.valueOf(request.getExternalVpnGateway())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -445,6 +475,12 @@ protected HttpJsonExternalVpnGatewaysStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -458,6 +494,12 @@ protected HttpJsonExternalVpnGatewaysStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -470,6 +512,13 @@ protected HttpJsonExternalVpnGatewaysStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -484,6 +533,14 @@ protected HttpJsonExternalVpnGatewaysStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFirewallPoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFirewallPoliciesStub.java index 90bdad568c08..357b04418cc0 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFirewallPoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFirewallPoliciesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddAssociationFirewallPolicyRequest; import com.google.cloud.compute.v1.AddRuleFirewallPolicyRequest; import com.google.cloud.compute.v1.CloneRulesFirewallPolicyRequest; @@ -991,6 +992,37 @@ public class HttpJsonFirewallPoliciesStub extends FirewallPoliciesStub { private final HttpJsonGlobalOrganizationOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate ADD_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate CLONE_RULES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{resource}"); + private static final PathTemplate GET_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate MOVE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate PATCH_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate REMOVE_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate REMOVE_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/firewallPolicies/{resource}"); + public static final HttpJsonFirewallPoliciesStub create(FirewallPoliciesStubSettings settings) throws IOException { return new HttpJsonFirewallPoliciesStub(settings, ClientContext.create(settings)); @@ -1043,6 +1075,14 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return ADD_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings addRuleTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1054,6 +1094,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return ADD_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings cloneRulesTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1065,6 +1112,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return CLONE_RULES_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1076,6 +1130,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1087,6 +1148,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getAssociationTransportSettings = @@ -1100,6 +1168,14 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return GET_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1111,6 +1187,12 @@ protected HttpJsonFirewallPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getRuleTransportSettings = @@ -1123,6 +1205,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return GET_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1153,6 +1242,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return MOVE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1164,6 +1260,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchRuleTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1175,6 +1278,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return PATCH_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removeAssociationTransportSettings = @@ -1187,6 +1297,14 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return REMOVE_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings removeRuleTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1198,6 +1316,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("firewall_policy", String.valueOf(request.getFirewallPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + return REMOVE_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1209,6 +1334,12 @@ protected HttpJsonFirewallPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -1222,6 +1353,13 @@ protected HttpJsonFirewallPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.addAssociationCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFirewallsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFirewallsStub.java index 9600f19b4968..110acc81511b 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFirewallsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFirewallsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteFirewallRequest; import com.google.cloud.compute.v1.Firewall; import com.google.cloud.compute.v1.FirewallList; @@ -416,6 +417,21 @@ public class HttpJsonFirewallsStub extends FirewallsStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewalls/{firewall}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewalls/{firewall}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewalls/{firewall}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewalls/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewalls/{firewall}"); + public static final HttpJsonFirewallsStub create(FirewallsStubSettings settings) throws IOException { return new HttpJsonFirewallsStub(settings, ClientContext.create(settings)); @@ -466,6 +482,13 @@ protected HttpJsonFirewallsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("firewall", String.valueOf(request.getFirewall())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -478,6 +501,13 @@ protected HttpJsonFirewallsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("firewall", String.valueOf(request.getFirewall())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -489,6 +519,12 @@ protected HttpJsonFirewallsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -500,6 +536,12 @@ protected HttpJsonFirewallsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -512,6 +554,13 @@ protected HttpJsonFirewallsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("firewall", String.valueOf(request.getFirewall())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -526,6 +575,14 @@ protected HttpJsonFirewallsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -538,6 +595,13 @@ protected HttpJsonFirewallsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("firewall", String.valueOf(request.getFirewall())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonForwardingRulesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonForwardingRulesStub.java index fcf3989bcb22..6be755e9787c 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonForwardingRulesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonForwardingRulesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListForwardingRulesRequest; import com.google.cloud.compute.v1.DeleteForwardingRuleRequest; import com.google.cloud.compute.v1.ForwardingRule; @@ -527,6 +528,23 @@ public class HttpJsonForwardingRulesStub extends ForwardingRulesStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/forwardingRules/{forwarding_rule}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/forwardingRules/{forwarding_rule}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/forwardingRules/{forwarding_rule}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/forwardingRules/{resource}"); + private static final PathTemplate SET_TARGET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/forwardingRules/{forwarding_rule}"); + public static final HttpJsonForwardingRulesStub create(ForwardingRulesStubSettings settings) throws IOException { return new HttpJsonForwardingRulesStub(settings, ClientContext.create(settings)); @@ -580,6 +598,13 @@ protected HttpJsonForwardingRulesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -593,6 +618,15 @@ protected HttpJsonForwardingRulesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "forwarding_rule", String.valueOf(request.getForwardingRule())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -606,6 +640,15 @@ protected HttpJsonForwardingRulesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "forwarding_rule", String.valueOf(request.getForwardingRule())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -618,6 +661,13 @@ protected HttpJsonForwardingRulesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -630,6 +680,13 @@ protected HttpJsonForwardingRulesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -643,6 +700,15 @@ protected HttpJsonForwardingRulesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "forwarding_rule", String.valueOf(request.getForwardingRule())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -656,6 +722,14 @@ protected HttpJsonForwardingRulesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setTargetTransportSettings = HttpJsonCallSettings.newBuilder() @@ -669,6 +743,15 @@ protected HttpJsonForwardingRulesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "forwarding_rule", String.valueOf(request.getForwardingRule())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return SET_TARGET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFutureReservationsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFutureReservationsStub.java index 4f713ce855a3..d7c201046b4f 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFutureReservationsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonFutureReservationsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListFutureReservationsRequest; import com.google.cloud.compute.v1.CancelFutureReservationRequest; import com.google.cloud.compute.v1.DeleteFutureReservationRequest; @@ -470,6 +471,25 @@ public class HttpJsonFutureReservationsStub extends FutureReservationsStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate CANCEL_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/futureReservations/{future_reservation}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/futureReservations/{future_reservation}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/futureReservations/{future_reservation}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/futureReservations/{future_reservation}"); + public static final HttpJsonFutureReservationsStub create(FutureReservationsStubSettings settings) throws IOException { return new HttpJsonFutureReservationsStub(settings, ClientContext.create(settings)); @@ -524,6 +544,13 @@ protected HttpJsonFutureReservationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings cancelTransportSettings = HttpJsonCallSettings.newBuilder() @@ -537,6 +564,15 @@ protected HttpJsonFutureReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "future_reservation", String.valueOf(request.getFutureReservation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return CANCEL_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -550,6 +586,15 @@ protected HttpJsonFutureReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "future_reservation", String.valueOf(request.getFutureReservation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -563,6 +608,15 @@ protected HttpJsonFutureReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "future_reservation", String.valueOf(request.getFutureReservation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -575,6 +629,13 @@ protected HttpJsonFutureReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -589,6 +650,13 @@ protected HttpJsonFutureReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -602,6 +670,15 @@ protected HttpJsonFutureReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "future_reservation", String.valueOf(request.getFutureReservation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalAddressesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalAddressesStub.java index 4b0dcfeee5e8..91d50240215a 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalAddressesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalAddressesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.Address; import com.google.cloud.compute.v1.AddressList; import com.google.cloud.compute.v1.DeleteGlobalAddressRequest; @@ -420,6 +421,21 @@ public class HttpJsonGlobalAddressesStub extends GlobalAddressesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/addresses/{address}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/addresses/{address}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate MOVE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/addresses/{address}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/addresses/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/addresses/{resource}"); + public static final HttpJsonGlobalAddressesStub create(GlobalAddressesStubSettings settings) throws IOException { return new HttpJsonGlobalAddressesStub(settings, ClientContext.create(settings)); @@ -472,6 +488,13 @@ protected HttpJsonGlobalAddressesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("address", String.valueOf(request.getAddress())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -484,6 +507,13 @@ protected HttpJsonGlobalAddressesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("address", String.valueOf(request.getAddress())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -495,6 +525,12 @@ protected HttpJsonGlobalAddressesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -506,6 +542,12 @@ protected HttpJsonGlobalAddressesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings moveTransportSettings = HttpJsonCallSettings.newBuilder() @@ -518,6 +560,13 @@ protected HttpJsonGlobalAddressesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("address", String.valueOf(request.getAddress())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return MOVE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -530,6 +579,13 @@ protected HttpJsonGlobalAddressesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -544,6 +600,14 @@ protected HttpJsonGlobalAddressesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalForwardingRulesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalForwardingRulesStub.java index fb23622a1bd8..1e9da893a43d 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalForwardingRulesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalForwardingRulesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteGlobalForwardingRuleRequest; import com.google.cloud.compute.v1.ForwardingRule; import com.google.cloud.compute.v1.ForwardingRuleList; @@ -442,6 +443,21 @@ public class HttpJsonGlobalForwardingRulesStub extends GlobalForwardingRulesStub private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/forwardingRules/{forwarding_rule}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/forwardingRules/{forwarding_rule}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/forwardingRules/{forwarding_rule}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/forwardingRules/{resource}"); + private static final PathTemplate SET_TARGET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/forwardingRules/{forwarding_rule}"); + public static final HttpJsonGlobalForwardingRulesStub create( GlobalForwardingRulesStubSettings settings) throws IOException { return new HttpJsonGlobalForwardingRulesStub(settings, ClientContext.create(settings)); @@ -494,6 +510,14 @@ protected HttpJsonGlobalForwardingRulesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "forwarding_rule", String.valueOf(request.getForwardingRule())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -506,6 +530,14 @@ protected HttpJsonGlobalForwardingRulesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "forwarding_rule", String.valueOf(request.getForwardingRule())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -517,6 +549,12 @@ protected HttpJsonGlobalForwardingRulesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -529,6 +567,12 @@ protected HttpJsonGlobalForwardingRulesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -541,6 +585,14 @@ protected HttpJsonGlobalForwardingRulesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "forwarding_rule", String.valueOf(request.getForwardingRule())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = @@ -554,6 +606,13 @@ protected HttpJsonGlobalForwardingRulesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setTargetTransportSettings = @@ -567,6 +626,14 @@ protected HttpJsonGlobalForwardingRulesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "forwarding_rule", String.valueOf(request.getForwardingRule())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return SET_TARGET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalNetworkEndpointGroupsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalNetworkEndpointGroupsStub.java index c5cf23026d4b..2361b8efecb9 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalNetworkEndpointGroupsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalNetworkEndpointGroupsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AttachNetworkEndpointsGlobalNetworkEndpointGroupRequest; import com.google.cloud.compute.v1.DeleteGlobalNetworkEndpointGroupRequest; import com.google.cloud.compute.v1.DetachNetworkEndpointsGlobalNetworkEndpointGroupRequest; @@ -486,6 +487,26 @@ public class HttpJsonGlobalNetworkEndpointGroupsStub extends GlobalNetworkEndpoi private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ATTACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate DETACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/networkEndpointGroups/{network_endpoint_group}"); + public static final HttpJsonGlobalNetworkEndpointGroupsStub create( GlobalNetworkEndpointGroupsStubSettings settings) throws IOException { return new HttpJsonGlobalNetworkEndpointGroupsStub(settings, ClientContext.create(settings)); @@ -545,6 +566,16 @@ protected HttpJsonGlobalNetworkEndpointGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return ATTACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -560,6 +591,15 @@ protected HttpJsonGlobalNetworkEndpointGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings detachNetworkEndpointsTransportSettings = @@ -576,6 +616,16 @@ protected HttpJsonGlobalNetworkEndpointGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DETACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -592,6 +642,15 @@ protected HttpJsonGlobalNetworkEndpointGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -604,6 +663,12 @@ protected HttpJsonGlobalNetworkEndpointGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -617,6 +682,12 @@ protected HttpJsonGlobalNetworkEndpointGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListNetworkEndpointsGlobalNetworkEndpointGroupsRequest, @@ -637,6 +708,16 @@ protected HttpJsonGlobalNetworkEndpointGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.attachNetworkEndpointsCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalOperationsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalOperationsStub.java index 1824b60da725..ee9228e942d9 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalOperationsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalOperationsStub.java @@ -34,6 +34,7 @@ import com.google.api.gax.rpc.LongRunningClient; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListGlobalOperationsRequest; import com.google.cloud.compute.v1.DeleteGlobalOperationRequest; import com.google.cloud.compute.v1.DeleteGlobalOperationResponse; @@ -318,6 +319,17 @@ public class HttpJsonGlobalOperationsStub extends GlobalOperationsStub { private final LongRunningClient longRunningClient; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/operations/{operation}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/operations/{operation}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate WAIT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/operations/{operation}"); + public static final HttpJsonGlobalOperationsStub create(GlobalOperationsStubSettings settings) throws IOException { return new HttpJsonGlobalOperationsStub(settings, ClientContext.create(settings)); @@ -369,6 +381,13 @@ protected HttpJsonGlobalOperationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -383,6 +402,13 @@ protected HttpJsonGlobalOperationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -395,6 +421,13 @@ protected HttpJsonGlobalOperationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -406,6 +439,12 @@ protected HttpJsonGlobalOperationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings waitTransportSettings = HttpJsonCallSettings.newBuilder() @@ -418,6 +457,13 @@ protected HttpJsonGlobalOperationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return WAIT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalOrganizationOperationsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalOrganizationOperationsStub.java index d8a7e1657ca3..d8f769b4828f 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalOrganizationOperationsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalOrganizationOperationsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.LongRunningClient; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteGlobalOrganizationOperationRequest; import com.google.cloud.compute.v1.DeleteGlobalOrganizationOperationResponse; import com.google.cloud.compute.v1.GetGlobalOrganizationOperationRequest; @@ -222,6 +223,11 @@ public class HttpJsonGlobalOrganizationOperationsStub extends GlobalOrganization private final LongRunningClient longRunningClient; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/operations/{operation}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/operations/{operation}"); + public static final HttpJsonGlobalOrganizationOperationsStub create( GlobalOrganizationOperationsStubSettings settings) throws IOException { return new HttpJsonGlobalOrganizationOperationsStub(settings, ClientContext.create(settings)); @@ -279,6 +285,12 @@ protected HttpJsonGlobalOrganizationOperationsStub( builder.add("operation", String.valueOf(request.getOperation())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -290,6 +302,12 @@ protected HttpJsonGlobalOrganizationOperationsStub( builder.add("operation", String.valueOf(request.getOperation())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalPublicDelegatedPrefixesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalPublicDelegatedPrefixesStub.java index cf15a0c0bcfb..9356639f20b9 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalPublicDelegatedPrefixesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonGlobalPublicDelegatedPrefixesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteGlobalPublicDelegatedPrefixeRequest; import com.google.cloud.compute.v1.GetGlobalPublicDelegatedPrefixeRequest; import com.google.cloud.compute.v1.InsertGlobalPublicDelegatedPrefixeRequest; @@ -342,6 +343,20 @@ public class HttpJsonGlobalPublicDelegatedPrefixesStub extends GlobalPublicDeleg private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/publicDelegatedPrefixes/{public_delegated_prefix}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/publicDelegatedPrefixes/{public_delegated_prefix}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/publicDelegatedPrefixes/{public_delegated_prefix}"); + public static final HttpJsonGlobalPublicDelegatedPrefixesStub create( GlobalPublicDelegatedPrefixesStubSettings settings) throws IOException { return new HttpJsonGlobalPublicDelegatedPrefixesStub(settings, ClientContext.create(settings)); @@ -400,6 +415,15 @@ protected HttpJsonGlobalPublicDelegatedPrefixesStub( String.valueOf(request.getPublicDelegatedPrefix())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_delegated_prefix", + String.valueOf(request.getPublicDelegatedPrefix())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -416,6 +440,15 @@ protected HttpJsonGlobalPublicDelegatedPrefixesStub( String.valueOf(request.getPublicDelegatedPrefix())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_delegated_prefix", + String.valueOf(request.getPublicDelegatedPrefix())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -428,6 +461,12 @@ protected HttpJsonGlobalPublicDelegatedPrefixesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -441,6 +480,12 @@ protected HttpJsonGlobalPublicDelegatedPrefixesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = @@ -456,6 +501,15 @@ protected HttpJsonGlobalPublicDelegatedPrefixesStub( String.valueOf(request.getPublicDelegatedPrefix())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_delegated_prefix", + String.valueOf(request.getPublicDelegatedPrefix())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonHealthChecksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonHealthChecksStub.java index 9045d8dc939e..3416f1189d2b 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonHealthChecksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonHealthChecksStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListHealthChecksRequest; import com.google.cloud.compute.v1.DeleteHealthCheckRequest; import com.google.cloud.compute.v1.GetHealthCheckRequest; @@ -500,6 +501,23 @@ public class HttpJsonHealthChecksStub extends HealthChecksStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/healthChecks/{health_check}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/healthChecks/{health_check}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/healthChecks/{health_check}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/healthChecks/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/healthChecks/{health_check}"); + public static final HttpJsonHealthChecksStub create(HealthChecksStubSettings settings) throws IOException { return new HttpJsonHealthChecksStub(settings, ClientContext.create(settings)); @@ -553,6 +571,13 @@ protected HttpJsonHealthChecksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -565,6 +590,14 @@ protected HttpJsonHealthChecksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check", String.valueOf(request.getHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -577,6 +610,14 @@ protected HttpJsonHealthChecksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check", String.valueOf(request.getHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -588,6 +629,12 @@ protected HttpJsonHealthChecksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -599,6 +646,12 @@ protected HttpJsonHealthChecksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -611,6 +664,14 @@ protected HttpJsonHealthChecksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check", String.valueOf(request.getHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -625,6 +686,14 @@ protected HttpJsonHealthChecksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -637,6 +706,14 @@ protected HttpJsonHealthChecksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check", String.valueOf(request.getHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonImageFamilyViewsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonImageFamilyViewsStub.java index 4d44f00b11aa..f9f464b0e0bb 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonImageFamilyViewsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonImageFamilyViewsStub.java @@ -28,6 +28,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetImageFamilyViewRequest; import com.google.cloud.compute.v1.ImageFamilyView; import com.google.protobuf.TypeRegistry; @@ -89,6 +90,9 @@ public class HttpJsonImageFamilyViewsStub extends ImageFamilyViewsStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/imageFamilyViews/{family}"); + public static final HttpJsonImageFamilyViewsStub create(ImageFamilyViewsStubSettings settings) throws IOException { return new HttpJsonImageFamilyViewsStub(settings, ClientContext.create(settings)); @@ -140,6 +144,14 @@ protected HttpJsonImageFamilyViewsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("family", String.valueOf(request.getFamily())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonImagesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonImagesStub.java index 12238e407d03..97fd72577f56 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonImagesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonImagesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteImageRequest; import com.google.cloud.compute.v1.DeprecateImageRequest; import com.google.cloud.compute.v1.GetFromFamilyImageRequest; @@ -588,6 +589,29 @@ public class HttpJsonImagesStub extends ImagesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/images/{image}"); + private static final PathTemplate DEPRECATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/images/{image}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/images/{image}"); + private static final PathTemplate GET_FROM_FAMILY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/images/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/images/{image}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/images/{resource}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/images/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/images/{resource}"); + public static final HttpJsonImagesStub create(ImagesStubSettings settings) throws IOException { return new HttpJsonImagesStub(settings, ClientContext.create(settings)); } @@ -637,6 +661,13 @@ protected HttpJsonImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("image", String.valueOf(request.getImage())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deprecateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -649,6 +680,13 @@ protected HttpJsonImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("image", String.valueOf(request.getImage())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DEPRECATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -661,6 +699,13 @@ protected HttpJsonImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("image", String.valueOf(request.getImage())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getFromFamilyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -673,6 +718,12 @@ protected HttpJsonImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_FROM_FAMILY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -685,6 +736,13 @@ protected HttpJsonImagesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -696,6 +754,12 @@ protected HttpJsonImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -707,6 +771,12 @@ protected HttpJsonImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -719,6 +789,13 @@ protected HttpJsonImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("image", String.valueOf(request.getImage())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -731,6 +808,13 @@ protected HttpJsonImagesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -743,6 +827,13 @@ protected HttpJsonImagesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -757,6 +848,14 @@ protected HttpJsonImagesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupManagerResizeRequestsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupManagerResizeRequestsStub.java index 2cf3aaeb42a1..5e827285d23c 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupManagerResizeRequestsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupManagerResizeRequestsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.CancelInstanceGroupManagerResizeRequestRequest; import com.google.cloud.compute.v1.DeleteInstanceGroupManagerResizeRequestRequest; import com.google.cloud.compute.v1.GetInstanceGroupManagerResizeRequestRequest; @@ -374,6 +375,22 @@ public class HttpJsonInstanceGroupManagerResizeRequestsStub private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate CANCEL_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}/resizeRequests/{resize_request}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}/resizeRequests/{resize_request}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}/resizeRequests/{resize_request}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + public static final HttpJsonInstanceGroupManagerResizeRequestsStub create( InstanceGroupManagerResizeRequestsStubSettings settings) throws IOException { return new HttpJsonInstanceGroupManagerResizeRequestsStub( @@ -435,6 +452,18 @@ protected HttpJsonInstanceGroupManagerResizeRequestsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "resize_request", String.valueOf(request.getResizeRequest())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return CANCEL_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -453,6 +482,18 @@ protected HttpJsonInstanceGroupManagerResizeRequestsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "resize_request", String.valueOf(request.getResizeRequest())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< GetInstanceGroupManagerResizeRequestRequest, InstanceGroupManagerResizeRequest> @@ -473,6 +514,18 @@ protected HttpJsonInstanceGroupManagerResizeRequestsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "resize_request", String.valueOf(request.getResizeRequest())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -490,6 +543,16 @@ protected HttpJsonInstanceGroupManagerResizeRequestsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListInstanceGroupManagerResizeRequestsRequest, @@ -511,6 +574,16 @@ protected HttpJsonInstanceGroupManagerResizeRequestsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.cancelCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupManagersStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupManagersStub.java index d3bddf3d6df9..57442a370cfd 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupManagersStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupManagersStub.java @@ -36,6 +36,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AbandonInstancesInstanceGroupManagerRequest; import com.google.cloud.compute.v1.AggregatedListInstanceGroupManagersRequest; import com.google.cloud.compute.v1.ApplyUpdatesToInstancesInstanceGroupManagerRequest; @@ -1612,6 +1613,76 @@ public class HttpJsonInstanceGroupManagersStub extends InstanceGroupManagersStub private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ABANDON_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate APPLY_UPDATES_TO_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate CREATE_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate DELETE_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate DELETE_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_ERRORS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate LIST_MANAGED_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate LIST_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate PATCH_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate RECREATE_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate RESIZE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate RESUME_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate SET_INSTANCE_TEMPLATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate SET_TARGET_POOLS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate START_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate STOP_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate SUSPEND_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate UPDATE_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/instanceGroupManagers/{instance_group_manager}"); + public static final HttpJsonInstanceGroupManagersStub create( InstanceGroupManagersStubSettings settings) throws IOException { return new HttpJsonInstanceGroupManagersStub(settings, ClientContext.create(settings)); @@ -1668,6 +1739,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return ABANDON_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings< AggregatedListInstanceGroupManagersRequest, InstanceGroupManagerAggregatedList> @@ -1683,6 +1765,13 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings applyUpdatesToInstancesTransportSettings = @@ -1700,6 +1789,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return APPLY_UPDATES_TO_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings createInstancesTransportSettings = @@ -1716,6 +1816,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return CREATE_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1730,6 +1841,15 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteInstancesTransportSettings = @@ -1746,6 +1866,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deletePerInstanceConfigsTransportSettings = @@ -1763,6 +1894,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -1779,6 +1921,16 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1791,6 +1943,13 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -1805,6 +1964,13 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListErrorsInstanceGroupManagersRequest, InstanceGroupManagersListErrorsResponse> @@ -1824,6 +1990,16 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_ERRORS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListManagedInstancesInstanceGroupManagersRequest, @@ -1845,6 +2021,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_MANAGED_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListPerInstanceConfigsInstanceGroupManagersRequest, @@ -1866,6 +2053,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1880,6 +2078,15 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchPerInstanceConfigsTransportSettings = @@ -1897,6 +2104,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PATCH_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings recreateInstancesTransportSettings = @@ -1914,6 +2132,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return RECREATE_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings resizeTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1928,6 +2157,15 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return RESIZE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings resumeInstancesTransportSettings = @@ -1944,6 +2182,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return RESUME_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setInstanceTemplateTransportSettings = @@ -1961,6 +2210,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_INSTANCE_TEMPLATE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setTargetPoolsTransportSettings = @@ -1977,6 +2237,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_TARGET_POOLS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings startInstancesTransportSettings = @@ -1993,6 +2264,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return START_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings stopInstancesTransportSettings = @@ -2009,6 +2291,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return STOP_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings suspendInstancesTransportSettings = @@ -2026,6 +2319,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SUSPEND_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updatePerInstanceConfigsTransportSettings = @@ -2043,6 +2347,17 @@ protected HttpJsonInstanceGroupManagersStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.abandonInstancesCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupsStub.java index 666f8056b221..4d03e2a0a0be 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceGroupsStub.java @@ -34,6 +34,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddInstancesInstanceGroupRequest; import com.google.cloud.compute.v1.AggregatedListInstanceGroupsRequest; import com.google.cloud.compute.v1.DeleteInstanceGroupRequest; @@ -646,6 +647,27 @@ public class HttpJsonInstanceGroupsStub extends InstanceGroupsStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instanceGroups/{instance_group}"); + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instanceGroups/{instance_group}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instanceGroups/{instance_group}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instanceGroups/{instance_group}"); + private static final PathTemplate REMOVE_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instanceGroups/{instance_group}"); + private static final PathTemplate SET_NAMED_PORTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instanceGroups/{instance_group}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instanceGroups/{resource}"); + public static final HttpJsonInstanceGroupsStub create(InstanceGroupsStubSettings settings) throws IOException { return new HttpJsonInstanceGroupsStub(settings, ClientContext.create(settings)); @@ -699,6 +721,15 @@ protected HttpJsonInstanceGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group", String.valueOf(request.getInstanceGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return ADD_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings aggregatedListTransportSettings = @@ -712,6 +743,13 @@ protected HttpJsonInstanceGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -725,6 +763,15 @@ protected HttpJsonInstanceGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group", String.valueOf(request.getInstanceGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -738,6 +785,15 @@ protected HttpJsonInstanceGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group", String.valueOf(request.getInstanceGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -750,6 +806,13 @@ protected HttpJsonInstanceGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -762,6 +825,13 @@ protected HttpJsonInstanceGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listInstancesTransportSettings = @@ -777,6 +847,16 @@ protected HttpJsonInstanceGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group", String.valueOf(request.getInstanceGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings removeInstancesTransportSettings = @@ -791,6 +871,16 @@ protected HttpJsonInstanceGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group", String.valueOf(request.getInstanceGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return REMOVE_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setNamedPortsTransportSettings = @@ -805,6 +895,16 @@ protected HttpJsonInstanceGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group", String.valueOf(request.getInstanceGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_NAMED_PORTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -820,6 +920,15 @@ protected HttpJsonInstanceGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.addInstancesCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceSettingsServiceStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceSettingsServiceStub.java index 2ef6bb591de5..d4513101695b 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceSettingsServiceStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceSettingsServiceStub.java @@ -30,6 +30,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetInstanceSettingRequest; import com.google.cloud.compute.v1.InstanceSettings; import com.google.cloud.compute.v1.Operation; @@ -158,6 +159,11 @@ public class HttpJsonInstanceSettingsServiceStub extends InstanceSettingsService private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + public static final HttpJsonInstanceSettingsServiceStub create( InstanceSettingsServiceStubSettings settings) throws IOException { return new HttpJsonInstanceSettingsServiceStub(settings, ClientContext.create(settings)); @@ -210,6 +216,13 @@ protected HttpJsonInstanceSettingsServiceStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -222,6 +235,13 @@ protected HttpJsonInstanceSettingsServiceStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceTemplatesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceTemplatesStub.java index bf7d89ffbf29..175c61d282fc 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceTemplatesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstanceTemplatesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListInstanceTemplatesRequest; import com.google.cloud.compute.v1.DeleteInstanceTemplateRequest; import com.google.cloud.compute.v1.GetIamPolicyInstanceTemplateRequest; @@ -469,6 +470,23 @@ public class HttpJsonInstanceTemplatesStub extends InstanceTemplatesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/instanceTemplates/{instance_template}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/instanceTemplates/{instance_template}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/instanceTemplates/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/instanceTemplates/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/instanceTemplates/{resource}"); + public static final HttpJsonInstanceTemplatesStub create(InstanceTemplatesStubSettings settings) throws IOException { return new HttpJsonInstanceTemplatesStub(settings, ClientContext.create(settings)); @@ -523,6 +541,13 @@ protected HttpJsonInstanceTemplatesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -535,6 +560,14 @@ protected HttpJsonInstanceTemplatesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_template", String.valueOf(request.getInstanceTemplate())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -547,6 +580,14 @@ protected HttpJsonInstanceTemplatesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_template", String.valueOf(request.getInstanceTemplate())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -560,6 +601,14 @@ protected HttpJsonInstanceTemplatesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -571,6 +620,12 @@ protected HttpJsonInstanceTemplatesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -582,6 +637,12 @@ protected HttpJsonInstanceTemplatesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -595,6 +656,14 @@ protected HttpJsonInstanceTemplatesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -609,6 +678,14 @@ protected HttpJsonInstanceTemplatesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstancesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstancesStub.java index a686407d4bdf..085599037b8e 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstancesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstancesStub.java @@ -34,6 +34,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddAccessConfigInstanceRequest; import com.google.cloud.compute.v1.AddNetworkInterfaceInstanceRequest; import com.google.cloud.compute.v1.AddResourcePoliciesInstanceRequest; @@ -2986,6 +2987,109 @@ public class HttpJsonInstancesStub extends InstancesStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_ACCESS_CONFIG_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate ADD_NETWORK_INTERFACE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate ADD_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate ATTACH_DISK_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate BULK_INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate DELETE_ACCESS_CONFIG_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate DELETE_NETWORK_INTERFACE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate DETACH_DISK_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate GET_EFFECTIVE_FIREWALLS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate GET_GUEST_ATTRIBUTES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{resource}"); + private static final PathTemplate GET_SCREENSHOT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate GET_SERIAL_PORT_OUTPUT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate GET_SHIELDED_INSTANCE_IDENTITY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_REFERRERS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate REMOVE_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate REPORT_HOST_AS_FAULTY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate RESET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate RESUME_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SEND_DIAGNOSTIC_INTERRUPT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_DELETION_PROTECTION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{resource}"); + private static final PathTemplate SET_DISK_AUTO_DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{resource}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_MACHINE_RESOURCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_MACHINE_TYPE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_METADATA_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_MIN_CPU_PLATFORM_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_NAME_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_SCHEDULING_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_SERVICE_ACCOUNT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_SHIELDED_INSTANCE_INTEGRITY_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SET_TAGS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SIMULATE_MAINTENANCE_EVENT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate START_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate START_WITH_ENCRYPTION_KEY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate STOP_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate SUSPEND_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate UPDATE_ACCESS_CONFIG_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate UPDATE_DISPLAY_DEVICE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate UPDATE_NETWORK_INTERFACE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + private static final PathTemplate UPDATE_SHIELDED_INSTANCE_CONFIG_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instances/{instance}"); + public static final HttpJsonInstancesStub create(InstancesStubSettings settings) throws IOException { return new HttpJsonInstancesStub(settings, ClientContext.create(settings)); @@ -3037,6 +3141,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return ADD_ACCESS_CONFIG_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings addNetworkInterfaceTransportSettings = @@ -3051,6 +3164,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return ADD_NETWORK_INTERFACE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings addResourcePoliciesTransportSettings = @@ -3065,6 +3187,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return ADD_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings aggregatedListTransportSettings = @@ -3078,6 +3209,13 @@ protected HttpJsonInstancesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings attachDiskTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3091,6 +3229,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return ATTACH_DISK_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings bulkInsertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3103,6 +3249,13 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return BULK_INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3116,6 +3269,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteAccessConfigTransportSettings = @@ -3130,6 +3291,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_ACCESS_CONFIG_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteNetworkInterfaceTransportSettings = @@ -3144,6 +3314,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_NETWORK_INTERFACE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings detachDiskTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3157,6 +3336,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DETACH_DISK_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3170,6 +3357,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< GetEffectiveFirewallsInstanceRequest, InstancesGetEffectiveFirewallsResponse> @@ -3187,6 +3382,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_EFFECTIVE_FIREWALLS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getGuestAttributesTransportSettings = @@ -3201,6 +3405,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_GUEST_ATTRIBUTES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3214,6 +3427,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getScreenshotTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3227,6 +3448,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_SCREENSHOT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getSerialPortOutputTransportSettings = @@ -3241,6 +3470,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_SERIAL_PORT_OUTPUT_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getShieldedInstanceIdentityTransportSettings = @@ -3256,6 +3494,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_SHIELDED_INSTANCE_IDENTITY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3268,6 +3515,13 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3280,6 +3534,13 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listReferrersTransportSettings = @@ -3294,6 +3555,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_REFERRERS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings performMaintenanceTransportSettings = @@ -3308,6 +3578,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings removeResourcePoliciesTransportSettings = @@ -3322,6 +3601,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return REMOVE_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings reportHostAsFaultyTransportSettings = @@ -3336,6 +3624,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return REPORT_HOST_AS_FAULTY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings resetTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3349,6 +3646,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return RESET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings resumeTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3362,6 +3667,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return RESUME_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< SendDiagnosticInterruptInstanceRequest, SendDiagnosticInterruptInstanceResponse> @@ -3379,6 +3692,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SEND_DIAGNOSTIC_INTERRUPT_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setDeletionProtectionTransportSettings = @@ -3393,6 +3715,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_DELETION_PROTECTION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setDiskAutoDeleteTransportSettings = @@ -3407,6 +3738,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_DISK_AUTO_DELETE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3420,6 +3760,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3433,6 +3781,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setMachineResourcesTransportSettings = @@ -3447,6 +3803,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_MACHINE_RESOURCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setMachineTypeTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3460,6 +3825,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_MACHINE_TYPE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setMetadataTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3473,6 +3846,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_METADATA_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setMinCpuPlatformTransportSettings = @@ -3487,6 +3868,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_MIN_CPU_PLATFORM_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setNameTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3500,6 +3890,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_NAME_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setSchedulingTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3513,6 +3911,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_SCHEDULING_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setSecurityPolicyTransportSettings = @@ -3527,6 +3933,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setServiceAccountTransportSettings = @@ -3541,6 +3956,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_SERVICE_ACCOUNT_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setShieldedInstanceIntegrityPolicyTransportSettings = @@ -3556,6 +3980,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_SHIELDED_INSTANCE_INTEGRITY_POLICY_RESOURCE_NAME_TEMPLATE + .instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setTagsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3569,6 +4002,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_TAGS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings simulateMaintenanceEventTransportSettings = @@ -3583,6 +4024,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SIMULATE_MAINTENANCE_EVENT_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings startTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3596,6 +4046,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return START_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings startWithEncryptionKeyTransportSettings = @@ -3610,6 +4068,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return START_WITH_ENCRYPTION_KEY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings stopTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3623,6 +4090,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return STOP_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings suspendTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3636,6 +4111,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SUSPEND_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -3651,6 +4134,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -3664,6 +4156,14 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings updateAccessConfigTransportSettings = @@ -3678,6 +4178,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_ACCESS_CONFIG_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateDisplayDeviceTransportSettings = @@ -3692,6 +4201,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_DISPLAY_DEVICE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateNetworkInterfaceTransportSettings = @@ -3706,6 +4224,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_NETWORK_INTERFACE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateShieldedInstanceConfigTransportSettings = @@ -3721,6 +4248,15 @@ protected HttpJsonInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("instance", String.valueOf(request.getInstance())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_SHIELDED_INSTANCE_CONFIG_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.addAccessConfigCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstantSnapshotsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstantSnapshotsStub.java index 20eedab108ae..0068ebb8638b 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstantSnapshotsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInstantSnapshotsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListInstantSnapshotsRequest; import com.google.cloud.compute.v1.DeleteInstantSnapshotRequest; import com.google.cloud.compute.v1.GetIamPolicyInstantSnapshotRequest; @@ -538,6 +539,25 @@ public class HttpJsonInstantSnapshotsStub extends InstantSnapshotsStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instantSnapshots/{instant_snapshot}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instantSnapshots/{instant_snapshot}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instantSnapshots/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instantSnapshots/{resource}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instantSnapshots/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/instantSnapshots/{resource}"); + public static final HttpJsonInstantSnapshotsStub create(InstantSnapshotsStubSettings settings) throws IOException { return new HttpJsonInstantSnapshotsStub(settings, ClientContext.create(settings)); @@ -590,6 +610,13 @@ protected HttpJsonInstantSnapshotsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -603,6 +630,15 @@ protected HttpJsonInstantSnapshotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instant_snapshot", String.valueOf(request.getInstantSnapshot())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -616,6 +652,15 @@ protected HttpJsonInstantSnapshotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instant_snapshot", String.valueOf(request.getInstantSnapshot())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -629,6 +674,14 @@ protected HttpJsonInstantSnapshotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -641,6 +694,13 @@ protected HttpJsonInstantSnapshotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -653,6 +713,13 @@ protected HttpJsonInstantSnapshotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -666,6 +733,14 @@ protected HttpJsonInstantSnapshotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -679,6 +754,14 @@ protected HttpJsonInstantSnapshotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -694,6 +777,15 @@ protected HttpJsonInstantSnapshotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectAttachmentGroupsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectAttachmentGroupsStub.java index 416a3a93aaa4..ad4951efe760 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectAttachmentGroupsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectAttachmentGroupsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteInterconnectAttachmentGroupRequest; import com.google.cloud.compute.v1.GetIamPolicyInterconnectAttachmentGroupRequest; import com.google.cloud.compute.v1.GetInterconnectAttachmentGroupRequest; @@ -545,6 +546,29 @@ public class HttpJsonInterconnectAttachmentGroupsStub extends InterconnectAttach private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/interconnectAttachmentGroups/{interconnect_attachment_group}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/interconnectAttachmentGroups/{interconnect_attachment_group}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectAttachmentGroups/{resource}"); + private static final PathTemplate GET_OPERATIONAL_STATUS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/interconnectAttachmentGroups/{interconnect_attachment_group}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/interconnectAttachmentGroups/{interconnect_attachment_group}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectAttachmentGroups/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectAttachmentGroups/{resource}"); + public static final HttpJsonInterconnectAttachmentGroupsStub create( InterconnectAttachmentGroupsStubSettings settings) throws IOException { return new HttpJsonInterconnectAttachmentGroupsStub(settings, ClientContext.create(settings)); @@ -603,6 +627,15 @@ protected HttpJsonInterconnectAttachmentGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_attachment_group", + String.valueOf(request.getInterconnectAttachmentGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -619,6 +652,15 @@ protected HttpJsonInterconnectAttachmentGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_attachment_group", + String.valueOf(request.getInterconnectAttachmentGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -633,6 +675,14 @@ protected HttpJsonInterconnectAttachmentGroupsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings< GetOperationalStatusInterconnectAttachmentGroupRequest, @@ -653,6 +703,16 @@ protected HttpJsonInterconnectAttachmentGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_attachment_group", + String.valueOf(request.getInterconnectAttachmentGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_OPERATIONAL_STATUS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -665,6 +725,12 @@ protected HttpJsonInterconnectAttachmentGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListInterconnectAttachmentGroupsRequest, InterconnectAttachmentGroupsListResponse> @@ -680,6 +746,12 @@ protected HttpJsonInterconnectAttachmentGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = @@ -695,6 +767,15 @@ protected HttpJsonInterconnectAttachmentGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_attachment_group", + String.valueOf(request.getInterconnectAttachmentGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -709,6 +790,14 @@ protected HttpJsonInterconnectAttachmentGroupsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings< TestIamPermissionsInterconnectAttachmentGroupRequest, TestPermissionsResponse> @@ -725,6 +814,14 @@ protected HttpJsonInterconnectAttachmentGroupsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectAttachmentsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectAttachmentsStub.java index b5fdb03ad8e6..1a01e14f5e8c 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectAttachmentsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectAttachmentsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListInterconnectAttachmentsRequest; import com.google.cloud.compute.v1.DeleteInterconnectAttachmentRequest; import com.google.cloud.compute.v1.GetInterconnectAttachmentRequest; @@ -483,6 +484,24 @@ public class HttpJsonInterconnectAttachmentsStub extends InterconnectAttachments private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/interconnectAttachments/{interconnect_attachment}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/interconnectAttachments/{interconnect_attachment}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/interconnectAttachments/{interconnect_attachment}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/interconnectAttachments/{resource}"); + public static final HttpJsonInterconnectAttachmentsStub create( InterconnectAttachmentsStubSettings settings) throws IOException { return new HttpJsonInterconnectAttachmentsStub(settings, ClientContext.create(settings)); @@ -540,6 +559,13 @@ protected HttpJsonInterconnectAttachmentsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -555,6 +581,16 @@ protected HttpJsonInterconnectAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_attachment", + String.valueOf(request.getInterconnectAttachment())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -572,6 +608,16 @@ protected HttpJsonInterconnectAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_attachment", + String.valueOf(request.getInterconnectAttachment())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -584,6 +630,13 @@ protected HttpJsonInterconnectAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -598,6 +651,13 @@ protected HttpJsonInterconnectAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -613,6 +673,16 @@ protected HttpJsonInterconnectAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_attachment", + String.valueOf(request.getInterconnectAttachment())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = @@ -627,6 +697,14 @@ protected HttpJsonInterconnectAttachmentsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectGroupsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectGroupsStub.java index b6488f056db6..6098403439c6 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectGroupsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectGroupsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.CreateMembersInterconnectGroupRequest; import com.google.cloud.compute.v1.DeleteInterconnectGroupRequest; import com.google.cloud.compute.v1.GetIamPolicyInterconnectGroupRequest; @@ -571,6 +572,27 @@ public class HttpJsonInterconnectGroupsStub extends InterconnectGroupsStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate CREATE_MEMBERS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectGroups/{interconnect_group}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectGroups/{interconnect_group}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectGroups/{interconnect_group}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectGroups/{resource}"); + private static final PathTemplate GET_OPERATIONAL_STATUS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectGroups/{interconnect_group}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectGroups/{interconnect_group}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectGroups/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnectGroups/{resource}"); + public static final HttpJsonInterconnectGroupsStub create(InterconnectGroupsStubSettings settings) throws IOException { return new HttpJsonInterconnectGroupsStub(settings, ClientContext.create(settings)); @@ -625,6 +647,15 @@ protected HttpJsonInterconnectGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_group", String.valueOf(request.getInterconnectGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return CREATE_MEMBERS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -637,6 +668,14 @@ protected HttpJsonInterconnectGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_group", String.valueOf(request.getInterconnectGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -649,6 +688,14 @@ protected HttpJsonInterconnectGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_group", String.valueOf(request.getInterconnectGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -662,6 +709,14 @@ protected HttpJsonInterconnectGroupsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings< GetOperationalStatusInterconnectGroupRequest, @@ -681,6 +736,15 @@ protected HttpJsonInterconnectGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_group", String.valueOf(request.getInterconnectGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_OPERATIONAL_STATUS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -692,6 +756,12 @@ protected HttpJsonInterconnectGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -705,6 +775,12 @@ protected HttpJsonInterconnectGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -717,6 +793,14 @@ protected HttpJsonInterconnectGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_group", String.valueOf(request.getInterconnectGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -730,6 +814,14 @@ protected HttpJsonInterconnectGroupsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -744,6 +836,14 @@ protected HttpJsonInterconnectGroupsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.createMembersCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectLocationsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectLocationsStub.java index 8befdda3f936..92698064bdaf 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectLocationsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectLocationsStub.java @@ -30,6 +30,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetInterconnectLocationRequest; import com.google.cloud.compute.v1.InterconnectLocation; import com.google.cloud.compute.v1.InterconnectLocationList; @@ -151,6 +152,12 @@ public class HttpJsonInterconnectLocationsStub extends InterconnectLocationsStub private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/interconnectLocations/{interconnect_location}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + public static final HttpJsonInterconnectLocationsStub create( InterconnectLocationsStubSettings settings) throws IOException { return new HttpJsonInterconnectLocationsStub(settings, ClientContext.create(settings)); @@ -204,6 +211,15 @@ protected HttpJsonInterconnectLocationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_location", + String.valueOf(request.getInterconnectLocation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -217,6 +233,12 @@ protected HttpJsonInterconnectLocationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectRemoteLocationsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectRemoteLocationsStub.java index 60a64160b44c..0248cd1b09d0 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectRemoteLocationsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectRemoteLocationsStub.java @@ -30,6 +30,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetInterconnectRemoteLocationRequest; import com.google.cloud.compute.v1.InterconnectRemoteLocation; import com.google.cloud.compute.v1.InterconnectRemoteLocationList; @@ -157,6 +158,12 @@ public class HttpJsonInterconnectRemoteLocationsStub extends InterconnectRemoteL private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/interconnectRemoteLocations/{interconnect_remote_location}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + public static final HttpJsonInterconnectRemoteLocationsStub create( InterconnectRemoteLocationsStubSettings settings) throws IOException { return new HttpJsonInterconnectRemoteLocationsStub(settings, ClientContext.create(settings)); @@ -214,6 +221,15 @@ protected HttpJsonInterconnectRemoteLocationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect_remote_location", + String.valueOf(request.getInterconnectRemoteLocation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -228,6 +244,12 @@ protected HttpJsonInterconnectRemoteLocationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectsStub.java index 64e333b796f8..0b7a06e7824e 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonInterconnectsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteInterconnectRequest; import com.google.cloud.compute.v1.GetDiagnosticsInterconnectRequest; import com.google.cloud.compute.v1.GetInterconnectRequest; @@ -466,6 +467,23 @@ public class HttpJsonInterconnectsStub extends InterconnectsStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnects/{interconnect}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnects/{interconnect}"); + private static final PathTemplate GET_DIAGNOSTICS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnects/{interconnect}"); + private static final PathTemplate GET_MACSEC_CONFIG_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnects/{interconnect}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnects/{interconnect}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/interconnects/{resource}"); + public static final HttpJsonInterconnectsStub create(InterconnectsStubSettings settings) throws IOException { return new HttpJsonInterconnectsStub(settings, ClientContext.create(settings)); @@ -518,6 +536,14 @@ protected HttpJsonInterconnectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect", String.valueOf(request.getInterconnect())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -530,6 +556,14 @@ protected HttpJsonInterconnectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect", String.valueOf(request.getInterconnect())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getDiagnosticsTransportSettings = @@ -545,6 +579,15 @@ protected HttpJsonInterconnectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect", String.valueOf(request.getInterconnect())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_DIAGNOSTICS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getMacsecConfigTransportSettings = @@ -560,6 +603,15 @@ protected HttpJsonInterconnectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect", String.valueOf(request.getInterconnect())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_MACSEC_CONFIG_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -571,6 +623,12 @@ protected HttpJsonInterconnectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -582,6 +640,12 @@ protected HttpJsonInterconnectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -594,6 +658,14 @@ protected HttpJsonInterconnectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "interconnect", String.valueOf(request.getInterconnect())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -606,6 +678,13 @@ protected HttpJsonInterconnectsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonLicenseCodesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonLicenseCodesStub.java index 2cd05153aacd..6d9d47a49049 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonLicenseCodesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonLicenseCodesStub.java @@ -28,6 +28,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetLicenseCodeRequest; import com.google.cloud.compute.v1.LicenseCode; import com.google.cloud.compute.v1.TestIamPermissionsLicenseCodeRequest; @@ -133,6 +134,11 @@ public class HttpJsonLicenseCodesStub extends LicenseCodesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/licenseCodes/{license_code}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/licenseCodes/{resource}"); + public static final HttpJsonLicenseCodesStub create(LicenseCodesStubSettings settings) throws IOException { return new HttpJsonLicenseCodesStub(settings, ClientContext.create(settings)); @@ -183,6 +189,14 @@ protected HttpJsonLicenseCodesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "license_code", String.valueOf(request.getLicenseCode())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -197,6 +211,14 @@ protected HttpJsonLicenseCodesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonLicensesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonLicensesStub.java index 651402c61ed4..58ad8fb40030 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonLicensesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonLicensesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteLicenseRequest; import com.google.cloud.compute.v1.GetIamPolicyLicenseRequest; import com.google.cloud.compute.v1.GetLicenseRequest; @@ -446,6 +447,23 @@ public class HttpJsonLicensesStub extends LicensesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/licenses/{license}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/licenses/{license}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/licenses/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/licenses/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/licenses/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/licenses/{license}"); + public static final HttpJsonLicensesStub create(LicensesStubSettings settings) throws IOException { return new HttpJsonLicensesStub(settings, ClientContext.create(settings)); @@ -496,6 +514,13 @@ protected HttpJsonLicensesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("license", String.valueOf(request.getLicense())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -508,6 +533,13 @@ protected HttpJsonLicensesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("license", String.valueOf(request.getLicense())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -520,6 +552,13 @@ protected HttpJsonLicensesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -531,6 +570,12 @@ protected HttpJsonLicensesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -542,6 +587,12 @@ protected HttpJsonLicensesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -554,6 +605,13 @@ protected HttpJsonLicensesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -568,6 +626,14 @@ protected HttpJsonLicensesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -580,6 +646,13 @@ protected HttpJsonLicensesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("license", String.valueOf(request.getLicense())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonMachineImagesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonMachineImagesStub.java index ec4aae593a5f..e1a2e088d754 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonMachineImagesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonMachineImagesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteMachineImageRequest; import com.google.cloud.compute.v1.GetIamPolicyMachineImageRequest; import com.google.cloud.compute.v1.GetMachineImageRequest; @@ -456,6 +457,23 @@ public class HttpJsonMachineImagesStub extends MachineImagesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/machineImages/{machine_image}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/machineImages/{machine_image}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/machineImages/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/machineImages/{resource}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/machineImages/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/machineImages/{resource}"); + public static final HttpJsonMachineImagesStub create(MachineImagesStubSettings settings) throws IOException { return new HttpJsonMachineImagesStub(settings, ClientContext.create(settings)); @@ -508,6 +526,14 @@ protected HttpJsonMachineImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "machine_image", String.valueOf(request.getMachineImage())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -520,6 +546,14 @@ protected HttpJsonMachineImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "machine_image", String.valueOf(request.getMachineImage())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -532,6 +566,13 @@ protected HttpJsonMachineImagesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -543,6 +584,12 @@ protected HttpJsonMachineImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -554,6 +601,12 @@ protected HttpJsonMachineImagesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -566,6 +619,13 @@ protected HttpJsonMachineImagesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -578,6 +638,13 @@ protected HttpJsonMachineImagesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -592,6 +659,14 @@ protected HttpJsonMachineImagesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonMachineTypesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonMachineTypesStub.java index 30d91c1bc405..91336676a6d0 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonMachineTypesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonMachineTypesStub.java @@ -31,6 +31,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListMachineTypesRequest; import com.google.cloud.compute.v1.GetMachineTypeRequest; import com.google.cloud.compute.v1.ListMachineTypesRequest; @@ -218,6 +219,13 @@ public class HttpJsonMachineTypesStub extends MachineTypesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/machineTypes/{machine_type}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + public static final HttpJsonMachineTypesStub create(MachineTypesStubSettings settings) throws IOException { return new HttpJsonMachineTypesStub(settings, ClientContext.create(settings)); @@ -269,6 +277,13 @@ protected HttpJsonMachineTypesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -282,6 +297,15 @@ protected HttpJsonMachineTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "machine_type", String.valueOf(request.getMachineType())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -294,6 +318,13 @@ protected HttpJsonMachineTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkAttachmentsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkAttachmentsStub.java index d3c787bea979..ffda18b7a17e 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkAttachmentsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkAttachmentsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListNetworkAttachmentsRequest; import com.google.cloud.compute.v1.DeleteNetworkAttachmentRequest; import com.google.cloud.compute.v1.GetIamPolicyNetworkAttachmentRequest; @@ -541,6 +542,28 @@ public class HttpJsonNetworkAttachmentsStub extends NetworkAttachmentsStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkAttachments/{network_attachment}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkAttachments/{network_attachment}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/networkAttachments/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkAttachments/{network_attachment}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/networkAttachments/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/networkAttachments/{resource}"); + public static final HttpJsonNetworkAttachmentsStub create(NetworkAttachmentsStubSettings settings) throws IOException { return new HttpJsonNetworkAttachmentsStub(settings, ClientContext.create(settings)); @@ -595,6 +618,13 @@ protected HttpJsonNetworkAttachmentsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -608,6 +638,15 @@ protected HttpJsonNetworkAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_attachment", String.valueOf(request.getNetworkAttachment())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -621,6 +660,15 @@ protected HttpJsonNetworkAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_attachment", String.valueOf(request.getNetworkAttachment())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -635,6 +683,15 @@ protected HttpJsonNetworkAttachmentsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -647,6 +704,13 @@ protected HttpJsonNetworkAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -660,6 +724,13 @@ protected HttpJsonNetworkAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -673,6 +744,15 @@ protected HttpJsonNetworkAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_attachment", String.valueOf(request.getNetworkAttachment())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -687,6 +767,15 @@ protected HttpJsonNetworkAttachmentsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -702,6 +791,15 @@ protected HttpJsonNetworkAttachmentsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkEdgeSecurityServicesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkEdgeSecurityServicesStub.java index 304438711652..ae5e9a0e1e82 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkEdgeSecurityServicesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkEdgeSecurityServicesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListNetworkEdgeSecurityServicesRequest; import com.google.cloud.compute.v1.DeleteNetworkEdgeSecurityServiceRequest; import com.google.cloud.compute.v1.GetNetworkEdgeSecurityServiceRequest; @@ -375,6 +376,20 @@ public class HttpJsonNetworkEdgeSecurityServicesStub extends NetworkEdgeSecurity private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkEdgeSecurityServices/{network_edge_security_service}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkEdgeSecurityServices/{network_edge_security_service}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkEdgeSecurityServices/{network_edge_security_service}"); + public static final HttpJsonNetworkEdgeSecurityServicesStub create( NetworkEdgeSecurityServicesStubSettings settings) throws IOException { return new HttpJsonNetworkEdgeSecurityServicesStub(settings, ClientContext.create(settings)); @@ -435,6 +450,13 @@ protected HttpJsonNetworkEdgeSecurityServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -451,6 +473,16 @@ protected HttpJsonNetworkEdgeSecurityServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_edge_security_service", + String.valueOf(request.getNetworkEdgeSecurityService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -468,6 +500,16 @@ protected HttpJsonNetworkEdgeSecurityServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_edge_security_service", + String.valueOf(request.getNetworkEdgeSecurityService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -481,6 +523,13 @@ protected HttpJsonNetworkEdgeSecurityServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -496,6 +545,16 @@ protected HttpJsonNetworkEdgeSecurityServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_edge_security_service", + String.valueOf(request.getNetworkEdgeSecurityService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkEndpointGroupsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkEndpointGroupsStub.java index f80acb026faf..7396fe44f6b6 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkEndpointGroupsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkEndpointGroupsStub.java @@ -34,6 +34,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListNetworkEndpointGroupsRequest; import com.google.cloud.compute.v1.AttachNetworkEndpointsNetworkEndpointGroupRequest; import com.google.cloud.compute.v1.DeleteNetworkEndpointGroupRequest; @@ -619,6 +620,30 @@ public class HttpJsonNetworkEndpointGroupsStub extends NetworkEndpointGroupsStub private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate ATTACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate DETACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/networkEndpointGroups/{resource}"); + public static final HttpJsonNetworkEndpointGroupsStub create( NetworkEndpointGroupsStubSettings settings) throws IOException { return new HttpJsonNetworkEndpointGroupsStub(settings, ClientContext.create(settings)); @@ -673,6 +698,13 @@ protected HttpJsonNetworkEndpointGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings attachNetworkEndpointsTransportSettings = @@ -690,6 +722,17 @@ protected HttpJsonNetworkEndpointGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return ATTACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -704,6 +747,15 @@ protected HttpJsonNetworkEndpointGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings detachNetworkEndpointsTransportSettings = @@ -721,6 +773,17 @@ protected HttpJsonNetworkEndpointGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DETACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -737,6 +800,16 @@ protected HttpJsonNetworkEndpointGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -749,6 +822,13 @@ protected HttpJsonNetworkEndpointGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -763,6 +843,13 @@ protected HttpJsonNetworkEndpointGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListNetworkEndpointsNetworkEndpointGroupsRequest, @@ -784,6 +871,17 @@ protected HttpJsonNetworkEndpointGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -800,6 +898,15 @@ protected HttpJsonNetworkEndpointGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkFirewallPoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkFirewallPoliciesStub.java index 68c4d149ea95..3cfb69d82e7c 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkFirewallPoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkFirewallPoliciesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddAssociationNetworkFirewallPolicyRequest; import com.google.cloud.compute.v1.AddPacketMirroringRuleNetworkFirewallPolicyRequest; import com.google.cloud.compute.v1.AddRuleNetworkFirewallPolicyRequest; @@ -1262,6 +1263,49 @@ public class HttpJsonNetworkFirewallPoliciesStub extends NetworkFirewallPolicies private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate ADD_PACKET_MIRRORING_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate ADD_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate CLONE_RULES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{resource}"); + private static final PathTemplate GET_PACKET_MIRRORING_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate PATCH_PACKET_MIRRORING_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate PATCH_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate REMOVE_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate REMOVE_PACKET_MIRRORING_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate REMOVE_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{firewall_policy}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/firewallPolicies/{resource}"); + public static final HttpJsonNetworkFirewallPoliciesStub create( NetworkFirewallPoliciesStubSettings settings) throws IOException { return new HttpJsonNetworkFirewallPoliciesStub(settings, ClientContext.create(settings)); @@ -1316,6 +1360,15 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return ADD_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings addPacketMirroringRuleTransportSettings = @@ -1330,6 +1383,15 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return ADD_PACKET_MIRRORING_RULE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings addRuleTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1342,6 +1404,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return ADD_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< AggregatedListNetworkFirewallPoliciesRequest, NetworkFirewallPolicyAggregatedList> @@ -1357,6 +1427,13 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings cloneRulesTransportSettings = @@ -1370,6 +1447,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return CLONE_RULES_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1382,6 +1467,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1394,6 +1487,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getAssociationTransportSettings = @@ -1408,6 +1509,15 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -1421,6 +1531,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getPacketMirroringRuleTransportSettings = @@ -1436,6 +1554,15 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_PACKET_MIRRORING_RULE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getRuleTransportSettings = @@ -1450,6 +1577,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1461,6 +1596,12 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -1474,6 +1615,12 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1486,6 +1633,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchPacketMirroringRuleTransportSettings = @@ -1500,6 +1655,15 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_PACKET_MIRRORING_RULE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings patchRuleTransportSettings = @@ -1513,6 +1677,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removeAssociationTransportSettings = @@ -1527,6 +1699,15 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return REMOVE_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings removePacketMirroringRuleTransportSettings = @@ -1541,6 +1722,15 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return REMOVE_PACKET_MIRRORING_RULE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings removeRuleTransportSettings = @@ -1554,6 +1744,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return REMOVE_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -1567,6 +1765,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -1582,6 +1788,14 @@ protected HttpJsonNetworkFirewallPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.addAssociationCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkProfilesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkProfilesStub.java index dafccb8effe6..6cbae2f6b633 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkProfilesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworkProfilesStub.java @@ -30,6 +30,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetNetworkProfileRequest; import com.google.cloud.compute.v1.ListNetworkProfilesRequest; import com.google.cloud.compute.v1.NetworkProfile; @@ -147,6 +148,11 @@ public class HttpJsonNetworkProfilesStub extends NetworkProfilesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networkProfiles/{network_profile}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + public static final HttpJsonNetworkProfilesStub create(NetworkProfilesStubSettings settings) throws IOException { return new HttpJsonNetworkProfilesStub(settings, ClientContext.create(settings)); @@ -197,6 +203,14 @@ protected HttpJsonNetworkProfilesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_profile", String.valueOf(request.getNetworkProfile())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -210,6 +224,12 @@ protected HttpJsonNetworkProfilesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworksStub.java index 6a0d7e043549..ce9eb34b6168 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNetworksStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddPeeringNetworkRequest; import com.google.cloud.compute.v1.DeleteNetworkRequest; import com.google.cloud.compute.v1.ExchangedPeeringRoutesList; @@ -713,6 +714,31 @@ public class HttpJsonNetworksStub extends NetworksStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_PEERING_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + private static final PathTemplate GET_EFFECTIVE_FIREWALLS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_PEERING_ROUTES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + private static final PathTemplate REMOVE_PEERING_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + private static final PathTemplate REQUEST_REMOVE_PEERING_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + private static final PathTemplate SWITCH_TO_CUSTOM_MODE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + private static final PathTemplate UPDATE_PEERING_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/networks/{network}"); + public static final HttpJsonNetworksStub create(NetworksStubSettings settings) throws IOException { return new HttpJsonNetworksStub(settings, ClientContext.create(settings)); @@ -763,6 +789,13 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return ADD_PEERING_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -775,6 +808,13 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -787,6 +827,13 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getEffectiveFirewallsTransportSettings = @@ -802,6 +849,14 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_EFFECTIVE_FIREWALLS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -813,6 +868,12 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -824,6 +885,12 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listPeeringRoutesTransportSettings = @@ -838,6 +905,14 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_PEERING_ROUTES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -850,6 +925,13 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removePeeringTransportSettings = HttpJsonCallSettings.newBuilder() @@ -862,6 +944,13 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return REMOVE_PEERING_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings requestRemovePeeringTransportSettings = @@ -875,6 +964,14 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return REQUEST_REMOVE_PEERING_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings switchToCustomModeTransportSettings = @@ -888,6 +985,14 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return SWITCH_TO_CUSTOM_MODE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updatePeeringTransportSettings = HttpJsonCallSettings.newBuilder() @@ -900,6 +1005,13 @@ protected HttpJsonNetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("network", String.valueOf(request.getNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return UPDATE_PEERING_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.addPeeringCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeGroupsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeGroupsStub.java index 9f76294c5615..8c90e02b7a24 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeGroupsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeGroupsStub.java @@ -34,6 +34,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddNodesNodeGroupRequest; import com.google.cloud.compute.v1.AggregatedListNodeGroupsRequest; import com.google.cloud.compute.v1.DeleteNodeGroupRequest; @@ -897,6 +898,37 @@ public class HttpJsonNodeGroupsStub extends NodeGroupsStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_NODES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{node_group}"); + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{node_group}"); + private static final PathTemplate DELETE_NODES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{node_group}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{node_group}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_NODES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{node_group}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{node_group}"); + private static final PathTemplate PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{node_group}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{resource}"); + private static final PathTemplate SET_NODE_TEMPLATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{node_group}"); + private static final PathTemplate SIMULATE_MAINTENANCE_EVENT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{node_group}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeGroups/{resource}"); + public static final HttpJsonNodeGroupsStub create(NodeGroupsStubSettings settings) throws IOException { return new HttpJsonNodeGroupsStub(settings, ClientContext.create(settings)); @@ -948,6 +980,14 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("node_group", String.valueOf(request.getNodeGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return ADD_NODES_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings aggregatedListTransportSettings = @@ -961,6 +1001,13 @@ protected HttpJsonNodeGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -974,6 +1021,14 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("node_group", String.valueOf(request.getNodeGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteNodesTransportSettings = HttpJsonCallSettings.newBuilder() @@ -987,6 +1042,14 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("node_group", String.valueOf(request.getNodeGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_NODES_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1000,6 +1063,14 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("node_group", String.valueOf(request.getNodeGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1013,6 +1084,14 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1025,6 +1104,13 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1037,6 +1123,13 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listNodesTransportSettings = @@ -1051,6 +1144,15 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "node_group", String.valueOf(request.getNodeGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_NODES_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1064,6 +1166,14 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("node_group", String.valueOf(request.getNodeGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings performMaintenanceTransportSettings = @@ -1078,6 +1188,16 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "node_group", String.valueOf(request.getNodeGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1091,6 +1211,14 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setNodeTemplateTransportSettings = @@ -1105,6 +1233,16 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "node_group", String.valueOf(request.getNodeGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_NODE_TEMPLATE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings simulateMaintenanceEventTransportSettings = @@ -1119,6 +1257,16 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "node_group", String.valueOf(request.getNodeGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SIMULATE_MAINTENANCE_EVENT_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -1134,6 +1282,15 @@ protected HttpJsonNodeGroupsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.addNodesCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeTemplatesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeTemplatesStub.java index b0a8200a5e13..b389d04ef74b 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeTemplatesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeTemplatesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListNodeTemplatesRequest; import com.google.cloud.compute.v1.DeleteNodeTemplateRequest; import com.google.cloud.compute.v1.GetIamPolicyNodeTemplateRequest; @@ -476,6 +477,23 @@ public class HttpJsonNodeTemplatesStub extends NodeTemplatesStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/nodeTemplates/{node_template}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/nodeTemplates/{node_template}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/nodeTemplates/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/nodeTemplates/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/nodeTemplates/{resource}"); + public static final HttpJsonNodeTemplatesStub create(NodeTemplatesStubSettings settings) throws IOException { return new HttpJsonNodeTemplatesStub(settings, ClientContext.create(settings)); @@ -529,6 +547,13 @@ protected HttpJsonNodeTemplatesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -542,6 +567,15 @@ protected HttpJsonNodeTemplatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "node_template", String.valueOf(request.getNodeTemplate())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -555,6 +589,15 @@ protected HttpJsonNodeTemplatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "node_template", String.valueOf(request.getNodeTemplate())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -568,6 +611,14 @@ protected HttpJsonNodeTemplatesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -580,6 +631,13 @@ protected HttpJsonNodeTemplatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -592,6 +650,13 @@ protected HttpJsonNodeTemplatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -605,6 +670,14 @@ protected HttpJsonNodeTemplatesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -620,6 +693,15 @@ protected HttpJsonNodeTemplatesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeTypesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeTypesStub.java index b85e73446893..89b75d9ef50f 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeTypesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonNodeTypesStub.java @@ -31,6 +31,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListNodeTypesRequest; import com.google.cloud.compute.v1.GetNodeTypeRequest; import com.google.cloud.compute.v1.ListNodeTypesRequest; @@ -216,6 +217,13 @@ public class HttpJsonNodeTypesStub extends NodeTypesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/nodeTypes/{node_type}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + public static final HttpJsonNodeTypesStub create(NodeTypesStubSettings settings) throws IOException { return new HttpJsonNodeTypesStub(settings, ClientContext.create(settings)); @@ -265,6 +273,13 @@ protected HttpJsonNodeTypesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -278,6 +293,14 @@ protected HttpJsonNodeTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("node_type", String.valueOf(request.getNodeType())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -290,6 +313,13 @@ protected HttpJsonNodeTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonOrganizationSecurityPoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonOrganizationSecurityPoliciesStub.java index 677975e6e0aa..14eb46fcab85 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonOrganizationSecurityPoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonOrganizationSecurityPoliciesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddAssociationOrganizationSecurityPolicyRequest; import com.google.cloud.compute.v1.AddRuleOrganizationSecurityPolicyRequest; import com.google.cloud.compute.v1.CopyRulesOrganizationSecurityPolicyRequest; @@ -970,6 +971,31 @@ public class HttpJsonOrganizationSecurityPoliciesStub extends OrganizationSecuri private final HttpJsonGlobalOrganizationOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate ADD_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate COPY_RULES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate GET_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate GET_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate MOVE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate PATCH_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate REMOVE_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + private static final PathTemplate REMOVE_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("locations/global/securityPolicies/{security_policy}"); + public static final HttpJsonOrganizationSecurityPoliciesStub create( OrganizationSecurityPoliciesStubSettings settings) throws IOException { return new HttpJsonOrganizationSecurityPoliciesStub(settings, ClientContext.create(settings)); @@ -1026,6 +1052,14 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return ADD_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings addRuleTransportSettings = @@ -1038,6 +1072,13 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return ADD_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings copyRulesTransportSettings = @@ -1050,6 +1091,13 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return COPY_RULES_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -1062,6 +1110,13 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -1074,6 +1129,13 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getAssociationTransportSettings = @@ -1088,6 +1150,14 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return GET_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getRuleTransportSettings = @@ -1101,6 +1171,13 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return GET_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -1147,6 +1224,13 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return MOVE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1158,6 +1242,13 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchRuleTransportSettings = @@ -1170,6 +1261,13 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return PATCH_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removeAssociationTransportSettings = @@ -1183,6 +1281,14 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return REMOVE_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings removeRuleTransportSettings = @@ -1196,6 +1302,13 @@ protected HttpJsonOrganizationSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return REMOVE_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.addAssociationCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPacketMirroringsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPacketMirroringsStub.java index f381ea837ba4..315c4c5c7d90 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPacketMirroringsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPacketMirroringsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListPacketMirroringsRequest; import com.google.cloud.compute.v1.DeletePacketMirroringRequest; import com.google.cloud.compute.v1.GetPacketMirroringRequest; @@ -452,6 +453,24 @@ public class HttpJsonPacketMirroringsStub extends PacketMirroringsStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/packetMirrorings/{packet_mirroring}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/packetMirrorings/{packet_mirroring}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/packetMirrorings/{packet_mirroring}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/packetMirrorings/{resource}"); + public static final HttpJsonPacketMirroringsStub create(PacketMirroringsStubSettings settings) throws IOException { return new HttpJsonPacketMirroringsStub(settings, ClientContext.create(settings)); @@ -505,6 +524,13 @@ protected HttpJsonPacketMirroringsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -518,6 +544,15 @@ protected HttpJsonPacketMirroringsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "packet_mirroring", String.valueOf(request.getPacketMirroring())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -531,6 +566,15 @@ protected HttpJsonPacketMirroringsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "packet_mirroring", String.valueOf(request.getPacketMirroring())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -543,6 +587,13 @@ protected HttpJsonPacketMirroringsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -555,6 +606,13 @@ protected HttpJsonPacketMirroringsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -568,6 +626,15 @@ protected HttpJsonPacketMirroringsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "packet_mirroring", String.valueOf(request.getPacketMirroring())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -583,6 +650,15 @@ protected HttpJsonPacketMirroringsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPreviewFeaturesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPreviewFeaturesStub.java index 91ff77823b38..2b3c4a47a069 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPreviewFeaturesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPreviewFeaturesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetPreviewFeatureRequest; import com.google.cloud.compute.v1.ListPreviewFeaturesRequest; import com.google.cloud.compute.v1.Operation; @@ -213,6 +214,13 @@ public class HttpJsonPreviewFeaturesStub extends PreviewFeaturesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/previewFeatures/{preview_feature}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/previewFeatures/{preview_feature}"); + public static final HttpJsonPreviewFeaturesStub create(PreviewFeaturesStubSettings settings) throws IOException { return new HttpJsonPreviewFeaturesStub(settings, ClientContext.create(settings)); @@ -265,6 +273,14 @@ protected HttpJsonPreviewFeaturesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "preview_feature", String.valueOf(request.getPreviewFeature())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -276,6 +292,12 @@ protected HttpJsonPreviewFeaturesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -288,6 +310,14 @@ protected HttpJsonPreviewFeaturesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "preview_feature", String.valueOf(request.getPreviewFeature())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonProjectsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonProjectsStub.java index 5a95bfdc3b56..cab655e23bce 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonProjectsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonProjectsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DisableXpnHostProjectRequest; import com.google.cloud.compute.v1.DisableXpnResourceProjectRequest; import com.google.cloud.compute.v1.EnableXpnHostProjectRequest; @@ -820,6 +821,35 @@ public class HttpJsonProjectsStub extends ProjectsStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DISABLE_XPN_HOST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DISABLE_XPN_RESOURCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate ENABLE_XPN_HOST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate ENABLE_XPN_RESOURCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_XPN_HOST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_XPN_RESOURCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_XPN_HOSTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate MOVE_DISK_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate MOVE_INSTANCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_CLOUD_ARMOR_TIER_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_COMMON_INSTANCE_METADATA_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_DEFAULT_NETWORK_TIER_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_USAGE_EXPORT_BUCKET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + public static final HttpJsonProjectsStub create(ProjectsStubSettings settings) throws IOException { return new HttpJsonProjectsStub(settings, ClientContext.create(settings)); @@ -869,6 +899,12 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DISABLE_XPN_HOST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings disableXpnResourceTransportSettings = @@ -881,6 +917,13 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return DISABLE_XPN_RESOURCE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings enableXpnHostTransportSettings = HttpJsonCallSettings.newBuilder() @@ -892,6 +935,12 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return ENABLE_XPN_HOST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings enableXpnResourceTransportSettings = @@ -904,6 +953,13 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return ENABLE_XPN_RESOURCE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -915,6 +971,12 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getXpnHostTransportSettings = HttpJsonCallSettings.newBuilder() @@ -926,6 +988,12 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_XPN_HOST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getXpnResourcesTransportSettings = @@ -939,6 +1007,13 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_XPN_RESOURCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings listXpnHostsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -950,6 +1025,12 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_XPN_HOSTS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings moveDiskTransportSettings = HttpJsonCallSettings.newBuilder() @@ -961,6 +1042,12 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return MOVE_DISK_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings moveInstanceTransportSettings = HttpJsonCallSettings.newBuilder() @@ -972,6 +1059,12 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return MOVE_INSTANCE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setCloudArmorTierTransportSettings = @@ -984,6 +1077,13 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return SET_CLOUD_ARMOR_TIER_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setCommonInstanceMetadataTransportSettings = @@ -996,6 +1096,13 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return SET_COMMON_INSTANCE_METADATA_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setDefaultNetworkTierTransportSettings = @@ -1008,6 +1115,13 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return SET_DEFAULT_NETWORK_TIER_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setUsageExportBucketTransportSettings = @@ -1020,6 +1134,13 @@ protected HttpJsonProjectsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return SET_USAGE_EXPORT_BUCKET_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.disableXpnHostCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPublicAdvertisedPrefixesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPublicAdvertisedPrefixesStub.java index d0535bb1fdab..52b68bee44c4 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPublicAdvertisedPrefixesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPublicAdvertisedPrefixesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AnnouncePublicAdvertisedPrefixeRequest; import com.google.cloud.compute.v1.DeletePublicAdvertisedPrefixeRequest; import com.google.cloud.compute.v1.GetPublicAdvertisedPrefixeRequest; @@ -450,6 +451,26 @@ public class HttpJsonPublicAdvertisedPrefixesStub extends PublicAdvertisedPrefix private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ANNOUNCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/publicAdvertisedPrefixes/{public_advertised_prefix}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/publicAdvertisedPrefixes/{public_advertised_prefix}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/publicAdvertisedPrefixes/{public_advertised_prefix}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/publicAdvertisedPrefixes/{public_advertised_prefix}"); + private static final PathTemplate WITHDRAW_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/publicAdvertisedPrefixes/{public_advertised_prefix}"); + public static final HttpJsonPublicAdvertisedPrefixesStub create( PublicAdvertisedPrefixesStubSettings settings) throws IOException { return new HttpJsonPublicAdvertisedPrefixesStub(settings, ClientContext.create(settings)); @@ -506,6 +527,15 @@ protected HttpJsonPublicAdvertisedPrefixesStub( String.valueOf(request.getPublicAdvertisedPrefix())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_advertised_prefix", + String.valueOf(request.getPublicAdvertisedPrefix())); + return ANNOUNCE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -520,6 +550,15 @@ protected HttpJsonPublicAdvertisedPrefixesStub( String.valueOf(request.getPublicAdvertisedPrefix())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_advertised_prefix", + String.valueOf(request.getPublicAdvertisedPrefix())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -536,6 +575,15 @@ protected HttpJsonPublicAdvertisedPrefixesStub( String.valueOf(request.getPublicAdvertisedPrefix())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_advertised_prefix", + String.valueOf(request.getPublicAdvertisedPrefix())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -547,6 +595,12 @@ protected HttpJsonPublicAdvertisedPrefixesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -560,6 +614,12 @@ protected HttpJsonPublicAdvertisedPrefixesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -574,6 +634,15 @@ protected HttpJsonPublicAdvertisedPrefixesStub( String.valueOf(request.getPublicAdvertisedPrefix())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_advertised_prefix", + String.valueOf(request.getPublicAdvertisedPrefix())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings withdrawTransportSettings = @@ -589,6 +658,15 @@ protected HttpJsonPublicAdvertisedPrefixesStub( String.valueOf(request.getPublicAdvertisedPrefix())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_advertised_prefix", + String.valueOf(request.getPublicAdvertisedPrefix())); + return WITHDRAW_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.announceCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPublicDelegatedPrefixesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPublicDelegatedPrefixesStub.java index 315e0480daf1..f6ddd1cda7f4 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPublicDelegatedPrefixesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonPublicDelegatedPrefixesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListPublicDelegatedPrefixesRequest; import com.google.cloud.compute.v1.AnnouncePublicDelegatedPrefixeRequest; import com.google.cloud.compute.v1.DeletePublicDelegatedPrefixeRequest; @@ -534,6 +535,28 @@ public class HttpJsonPublicDelegatedPrefixesStub extends PublicDelegatedPrefixes private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate ANNOUNCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/publicDelegatedPrefixes/{public_delegated_prefix}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/publicDelegatedPrefixes/{public_delegated_prefix}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/publicDelegatedPrefixes/{public_delegated_prefix}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/publicDelegatedPrefixes/{public_delegated_prefix}"); + private static final PathTemplate WITHDRAW_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/publicDelegatedPrefixes/{public_delegated_prefix}"); + public static final HttpJsonPublicDelegatedPrefixesStub create( PublicDelegatedPrefixesStubSettings settings) throws IOException { return new HttpJsonPublicDelegatedPrefixesStub(settings, ClientContext.create(settings)); @@ -590,6 +613,13 @@ protected HttpJsonPublicDelegatedPrefixesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings announceTransportSettings = @@ -606,6 +636,16 @@ protected HttpJsonPublicDelegatedPrefixesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_delegated_prefix", + String.valueOf(request.getPublicDelegatedPrefix())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return ANNOUNCE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -621,6 +661,16 @@ protected HttpJsonPublicDelegatedPrefixesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_delegated_prefix", + String.valueOf(request.getPublicDelegatedPrefix())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -638,6 +688,16 @@ protected HttpJsonPublicDelegatedPrefixesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_delegated_prefix", + String.valueOf(request.getPublicDelegatedPrefix())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -650,6 +710,13 @@ protected HttpJsonPublicDelegatedPrefixesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -664,6 +731,13 @@ protected HttpJsonPublicDelegatedPrefixesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -679,6 +753,16 @@ protected HttpJsonPublicDelegatedPrefixesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_delegated_prefix", + String.valueOf(request.getPublicDelegatedPrefix())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings withdrawTransportSettings = @@ -695,6 +779,16 @@ protected HttpJsonPublicDelegatedPrefixesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "public_delegated_prefix", + String.valueOf(request.getPublicDelegatedPrefix())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return WITHDRAW_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionAutoscalersStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionAutoscalersStub.java index 117eb482cfa7..eece2a21c1db 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionAutoscalersStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionAutoscalersStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.Autoscaler; import com.google.cloud.compute.v1.DeleteRegionAutoscalerRequest; import com.google.cloud.compute.v1.GetRegionAutoscalerRequest; @@ -439,6 +440,21 @@ public class HttpJsonRegionAutoscalersStub extends RegionAutoscalersStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/autoscalers/{autoscaler}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/autoscalers/{autoscaler}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/autoscalers/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + public static final HttpJsonRegionAutoscalersStub create(RegionAutoscalersStubSettings settings) throws IOException { return new HttpJsonRegionAutoscalersStub(settings, ClientContext.create(settings)); @@ -492,6 +508,14 @@ protected HttpJsonRegionAutoscalersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("autoscaler", String.valueOf(request.getAutoscaler())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -505,6 +529,14 @@ protected HttpJsonRegionAutoscalersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("autoscaler", String.valueOf(request.getAutoscaler())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -517,6 +549,13 @@ protected HttpJsonRegionAutoscalersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -529,6 +568,13 @@ protected HttpJsonRegionAutoscalersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -541,6 +587,13 @@ protected HttpJsonRegionAutoscalersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -556,6 +609,15 @@ protected HttpJsonRegionAutoscalersStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -568,6 +630,13 @@ protected HttpJsonRegionAutoscalersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionBackendServicesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionBackendServicesStub.java index 2a081631e9b8..8d1bb7336a80 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionBackendServicesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionBackendServicesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.BackendService; import com.google.cloud.compute.v1.BackendServiceGroupHealth; import com.google.cloud.compute.v1.BackendServiceList; @@ -707,6 +708,31 @@ public class HttpJsonRegionBackendServicesStub extends RegionBackendServicesStub private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/backendServices/{backend_service}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/backendServices/{backend_service}"); + private static final PathTemplate GET_HEALTH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/backendServices/{backend_service}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/backendServices/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_USABLE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/backendServices/{backend_service}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/backendServices/{resource}"); + private static final PathTemplate SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/backendServices/{backend_service}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/backendServices/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/backendServices/{backend_service}"); + public static final HttpJsonRegionBackendServicesStub create( RegionBackendServicesStubSettings settings) throws IOException { return new HttpJsonRegionBackendServicesStub(settings, ClientContext.create(settings)); @@ -760,6 +786,15 @@ protected HttpJsonRegionBackendServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -773,6 +808,15 @@ protected HttpJsonRegionBackendServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getHealthTransportSettings = @@ -788,6 +832,15 @@ protected HttpJsonRegionBackendServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_HEALTH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -802,6 +855,15 @@ protected HttpJsonRegionBackendServicesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -814,6 +876,13 @@ protected HttpJsonRegionBackendServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -827,6 +896,13 @@ protected HttpJsonRegionBackendServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listUsableTransportSettings = @@ -841,6 +917,13 @@ protected HttpJsonRegionBackendServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_USABLE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -854,6 +937,15 @@ protected HttpJsonRegionBackendServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -868,6 +960,15 @@ protected HttpJsonRegionBackendServicesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setSecurityPolicyTransportSettings = @@ -883,6 +984,16 @@ protected HttpJsonRegionBackendServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -899,6 +1010,15 @@ protected HttpJsonRegionBackendServicesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -912,6 +1032,15 @@ protected HttpJsonRegionBackendServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "backend_service", String.valueOf(request.getBackendService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionCommitmentsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionCommitmentsStub.java index 068106ba3fcd..ab638cd8beee 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionCommitmentsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionCommitmentsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListRegionCommitmentsRequest; import com.google.cloud.compute.v1.Commitment; import com.google.cloud.compute.v1.CommitmentAggregatedList; @@ -349,6 +350,17 @@ public class HttpJsonRegionCommitmentsStub extends RegionCommitmentsStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/commitments/{commitment}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/commitments/{commitment}"); + public static final HttpJsonRegionCommitmentsStub create(RegionCommitmentsStubSettings settings) throws IOException { return new HttpJsonRegionCommitmentsStub(settings, ClientContext.create(settings)); @@ -402,6 +414,13 @@ protected HttpJsonRegionCommitmentsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -415,6 +434,14 @@ protected HttpJsonRegionCommitmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("commitment", String.valueOf(request.getCommitment())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -427,6 +454,13 @@ protected HttpJsonRegionCommitmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -439,6 +473,13 @@ protected HttpJsonRegionCommitmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -452,6 +493,14 @@ protected HttpJsonRegionCommitmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("commitment", String.valueOf(request.getCommitment())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionCompositeHealthChecksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionCompositeHealthChecksStub.java index 5123c801fc24..e94a10279ae9 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionCompositeHealthChecksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionCompositeHealthChecksStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListRegionCompositeHealthChecksRequest; import com.google.cloud.compute.v1.CompositeHealthCheck; import com.google.cloud.compute.v1.CompositeHealthCheckAggregatedList; @@ -468,6 +469,24 @@ public class HttpJsonRegionCompositeHealthChecksStub extends RegionCompositeHeal private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/compositeHealthChecks/{composite_health_check}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/compositeHealthChecks/{composite_health_check}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/compositeHealthChecks/{composite_health_check}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/compositeHealthChecks/{resource}"); + public static final HttpJsonRegionCompositeHealthChecksStub create( RegionCompositeHealthChecksStubSettings settings) throws IOException { return new HttpJsonRegionCompositeHealthChecksStub(settings, ClientContext.create(settings)); @@ -527,6 +546,13 @@ protected HttpJsonRegionCompositeHealthChecksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -543,6 +569,16 @@ protected HttpJsonRegionCompositeHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "composite_health_check", + String.valueOf(request.getCompositeHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -560,6 +596,16 @@ protected HttpJsonRegionCompositeHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "composite_health_check", + String.valueOf(request.getCompositeHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -573,6 +619,13 @@ protected HttpJsonRegionCompositeHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -587,6 +640,13 @@ protected HttpJsonRegionCompositeHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -601,6 +661,15 @@ protected HttpJsonRegionCompositeHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "composite_health_check", String.valueOf(request.getCompositeHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< TestIamPermissionsRegionCompositeHealthCheckRequest, TestPermissionsResponse> @@ -618,6 +687,15 @@ protected HttpJsonRegionCompositeHealthChecksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionDiskTypesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionDiskTypesStub.java index a50f27e68b5c..0597e0cf62ce 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionDiskTypesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionDiskTypesStub.java @@ -30,6 +30,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DiskType; import com.google.cloud.compute.v1.GetRegionDiskTypeRequest; import com.google.cloud.compute.v1.ListRegionDiskTypesRequest; @@ -147,6 +148,11 @@ public class HttpJsonRegionDiskTypesStub extends RegionDiskTypesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/diskTypes/{disk_type}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + public static final HttpJsonRegionDiskTypesStub create(RegionDiskTypesStubSettings settings) throws IOException { return new HttpJsonRegionDiskTypesStub(settings, ClientContext.create(settings)); @@ -198,6 +204,14 @@ protected HttpJsonRegionDiskTypesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk_type", String.valueOf(request.getDiskType())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -210,6 +224,13 @@ protected HttpJsonRegionDiskTypesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionDisksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionDisksStub.java index 44d95f122b3c..6a580e060ec3 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionDisksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionDisksStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddResourcePoliciesRegionDiskRequest; import com.google.cloud.compute.v1.BulkInsertRegionDiskRequest; import com.google.cloud.compute.v1.CreateSnapshotRegionDiskRequest; @@ -1008,6 +1009,41 @@ public class HttpJsonRegionDisksStub extends RegionDisksStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{disk}"); + private static final PathTemplate BULK_INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate CREATE_SNAPSHOT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{disk}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{disk}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{disk}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate REMOVE_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{disk}"); + private static final PathTemplate RESIZE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{disk}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{resource}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{resource}"); + private static final PathTemplate START_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{disk}"); + private static final PathTemplate STOP_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{disk}"); + private static final PathTemplate STOP_GROUP_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/disks/{disk}"); + public static final HttpJsonRegionDisksStub create(RegionDisksStubSettings settings) throws IOException { return new HttpJsonRegionDisksStub(settings, ClientContext.create(settings)); @@ -1061,6 +1097,15 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return ADD_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings bulkInsertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1073,6 +1118,13 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return BULK_INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings createSnapshotTransportSettings = @@ -1087,6 +1139,15 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return CREATE_SNAPSHOT_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1100,6 +1161,14 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1113,6 +1182,14 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1126,6 +1203,14 @@ protected HttpJsonRegionDisksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1138,6 +1223,13 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1150,6 +1242,13 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removeResourcePoliciesTransportSettings = @@ -1164,6 +1263,15 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return REMOVE_RESOURCE_POLICIES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings resizeTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1177,6 +1285,14 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return RESIZE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1190,6 +1306,14 @@ protected HttpJsonRegionDisksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1203,6 +1327,14 @@ protected HttpJsonRegionDisksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings startAsyncReplicationTransportSettings = @@ -1217,6 +1349,15 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return START_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings stopAsyncReplicationTransportSettings = @@ -1231,6 +1372,15 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return STOP_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings stopGroupAsyncReplicationTransportSettings = @@ -1244,6 +1394,14 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return STOP_GROUP_ASYNC_REPLICATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -1259,6 +1417,15 @@ protected HttpJsonRegionDisksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1272,6 +1439,14 @@ protected HttpJsonRegionDisksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("disk", String.valueOf(request.getDisk())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.addResourcePoliciesCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthAggregationPoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthAggregationPoliciesStub.java index 43a3dd06784b..e41ab12885a2 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthAggregationPoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthAggregationPoliciesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListRegionHealthAggregationPoliciesRequest; import com.google.cloud.compute.v1.DeleteRegionHealthAggregationPolicyRequest; import com.google.cloud.compute.v1.GetRegionHealthAggregationPolicyRequest; @@ -487,6 +488,25 @@ public class HttpJsonRegionHealthAggregationPoliciesStub private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/healthAggregationPolicies/{health_aggregation_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/healthAggregationPolicies/{health_aggregation_policy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/healthAggregationPolicies/{health_aggregation_policy}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/healthAggregationPolicies/{resource}"); + public static final HttpJsonRegionHealthAggregationPoliciesStub create( RegionHealthAggregationPoliciesStubSettings settings) throws IOException { return new HttpJsonRegionHealthAggregationPoliciesStub( @@ -548,6 +568,13 @@ protected HttpJsonRegionHealthAggregationPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -564,6 +591,16 @@ protected HttpJsonRegionHealthAggregationPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_aggregation_policy", + String.valueOf(request.getHealthAggregationPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -581,6 +618,16 @@ protected HttpJsonRegionHealthAggregationPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_aggregation_policy", + String.valueOf(request.getHealthAggregationPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -594,6 +641,13 @@ protected HttpJsonRegionHealthAggregationPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -609,6 +663,13 @@ protected HttpJsonRegionHealthAggregationPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = @@ -625,6 +686,16 @@ protected HttpJsonRegionHealthAggregationPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_aggregation_policy", + String.valueOf(request.getHealthAggregationPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< TestIamPermissionsRegionHealthAggregationPolicyRequest, TestPermissionsResponse> @@ -642,6 +713,15 @@ protected HttpJsonRegionHealthAggregationPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthCheckServicesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthCheckServicesStub.java index f7a65775cf02..649e2d9b56af 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthCheckServicesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthCheckServicesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListRegionHealthCheckServicesRequest; import com.google.cloud.compute.v1.DeleteRegionHealthCheckServiceRequest; import com.google.cloud.compute.v1.GetRegionHealthCheckServiceRequest; @@ -463,6 +464,24 @@ public class HttpJsonRegionHealthCheckServicesStub extends RegionHealthCheckServ private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/healthCheckServices/{health_check_service}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/healthCheckServices/{health_check_service}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/healthCheckServices/{health_check_service}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthCheckServices/{resource}"); + public static final HttpJsonRegionHealthCheckServicesStub create( RegionHealthCheckServicesStubSettings settings) throws IOException { return new HttpJsonRegionHealthCheckServicesStub(settings, ClientContext.create(settings)); @@ -519,6 +538,13 @@ protected HttpJsonRegionHealthCheckServicesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -533,6 +559,15 @@ protected HttpJsonRegionHealthCheckServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check_service", String.valueOf(request.getHealthCheckService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -549,6 +584,15 @@ protected HttpJsonRegionHealthCheckServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check_service", String.valueOf(request.getHealthCheckService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -561,6 +605,13 @@ protected HttpJsonRegionHealthCheckServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -575,6 +626,13 @@ protected HttpJsonRegionHealthCheckServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -589,6 +647,15 @@ protected HttpJsonRegionHealthCheckServicesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check_service", String.valueOf(request.getHealthCheckService())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -605,6 +672,15 @@ protected HttpJsonRegionHealthCheckServicesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthChecksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthChecksStub.java index 0b6218fdf2cd..abbcea3b16b8 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthChecksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthChecksStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionHealthCheckRequest; import com.google.cloud.compute.v1.GetRegionHealthCheckRequest; import com.google.cloud.compute.v1.HealthCheck; @@ -443,6 +444,21 @@ public class HttpJsonRegionHealthChecksStub extends RegionHealthChecksStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthChecks/{health_check}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthChecks/{health_check}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthChecks/{health_check}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthChecks/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthChecks/{health_check}"); + public static final HttpJsonRegionHealthChecksStub create(RegionHealthChecksStubSettings settings) throws IOException { return new HttpJsonRegionHealthChecksStub(settings, ClientContext.create(settings)); @@ -496,6 +512,15 @@ protected HttpJsonRegionHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check", String.valueOf(request.getHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -509,6 +534,15 @@ protected HttpJsonRegionHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check", String.valueOf(request.getHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -521,6 +555,13 @@ protected HttpJsonRegionHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -533,6 +574,13 @@ protected HttpJsonRegionHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -546,6 +594,15 @@ protected HttpJsonRegionHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check", String.valueOf(request.getHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -561,6 +618,15 @@ protected HttpJsonRegionHealthChecksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -574,6 +640,15 @@ protected HttpJsonRegionHealthChecksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_check", String.valueOf(request.getHealthCheck())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthSourcesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthSourcesStub.java index d2fbea8f08db..dfe12252c072 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthSourcesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionHealthSourcesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListRegionHealthSourcesRequest; import com.google.cloud.compute.v1.DeleteRegionHealthSourceRequest; import com.google.cloud.compute.v1.GetRegionHealthSourceRequest; @@ -453,6 +454,21 @@ public class HttpJsonRegionHealthSourcesStub extends RegionHealthSourcesStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthSources/{health_source}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthSources/{health_source}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthSources/{health_source}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/healthSources/{resource}"); + public static final HttpJsonRegionHealthSourcesStub create( RegionHealthSourcesStubSettings settings) throws IOException { return new HttpJsonRegionHealthSourcesStub(settings, ClientContext.create(settings)); @@ -506,6 +522,13 @@ protected HttpJsonRegionHealthSourcesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -519,6 +542,15 @@ protected HttpJsonRegionHealthSourcesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_source", String.valueOf(request.getHealthSource())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -532,6 +564,15 @@ protected HttpJsonRegionHealthSourcesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_source", String.valueOf(request.getHealthSource())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -544,6 +585,13 @@ protected HttpJsonRegionHealthSourcesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -556,6 +604,13 @@ protected HttpJsonRegionHealthSourcesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -569,6 +624,15 @@ protected HttpJsonRegionHealthSourcesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "health_source", String.valueOf(request.getHealthSource())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -584,6 +648,15 @@ protected HttpJsonRegionHealthSourcesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceGroupManagersStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceGroupManagersStub.java index f17dce288710..465d80c69bcd 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceGroupManagersStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceGroupManagersStub.java @@ -35,6 +35,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AbandonInstancesRegionInstanceGroupManagerRequest; import com.google.cloud.compute.v1.ApplyUpdatesToInstancesRegionInstanceGroupManagerRequest; import com.google.cloud.compute.v1.CreateInstancesRegionInstanceGroupManagerRequest; @@ -1604,6 +1605,74 @@ public class HttpJsonRegionInstanceGroupManagersStub extends RegionInstanceGroup private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ABANDON_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate APPLY_UPDATES_TO_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate CREATE_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate DELETE_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate DELETE_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_ERRORS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate LIST_MANAGED_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate LIST_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate PATCH_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate RECREATE_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate RESIZE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate RESUME_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate SET_INSTANCE_TEMPLATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate SET_TARGET_POOLS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate START_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate STOP_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate SUSPEND_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + private static final PathTemplate UPDATE_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceGroupManagers/{instance_group_manager}"); + public static final HttpJsonRegionInstanceGroupManagersStub create( RegionInstanceGroupManagersStubSettings settings) throws IOException { return new HttpJsonRegionInstanceGroupManagersStub(settings, ClientContext.create(settings)); @@ -1664,6 +1733,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return ABANDON_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings applyUpdatesToInstancesTransportSettings = @@ -1681,6 +1761,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return APPLY_UPDATES_TO_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings createInstancesTransportSettings = @@ -1698,6 +1789,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return CREATE_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -1714,6 +1816,16 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteInstancesTransportSettings = @@ -1731,6 +1843,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deletePerInstanceConfigsTransportSettings = @@ -1748,6 +1871,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -1765,6 +1899,16 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -1778,6 +1922,13 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -1793,6 +1944,13 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListErrorsRegionInstanceGroupManagersRequest, @@ -1814,6 +1972,16 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_ERRORS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListManagedInstancesRegionInstanceGroupManagersRequest, @@ -1835,6 +2003,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_MANAGED_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListPerInstanceConfigsRegionInstanceGroupManagersRequest, @@ -1856,6 +2035,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1870,6 +2060,15 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchPerInstanceConfigsTransportSettings = @@ -1887,6 +2086,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings recreateInstancesTransportSettings = @@ -1904,6 +2114,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return RECREATE_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings resizeTransportSettings = @@ -1920,6 +2141,16 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return RESIZE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings resumeInstancesTransportSettings = @@ -1937,6 +2168,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return RESUME_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setInstanceTemplateTransportSettings = @@ -1954,6 +2196,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return SET_INSTANCE_TEMPLATE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setTargetPoolsTransportSettings = @@ -1971,6 +2224,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return SET_TARGET_POOLS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings startInstancesTransportSettings = @@ -1988,6 +2252,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return START_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings stopInstancesTransportSettings = @@ -2005,6 +2280,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return STOP_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings suspendInstancesTransportSettings = @@ -2022,6 +2308,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return SUSPEND_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updatePerInstanceConfigsTransportSettings = @@ -2039,6 +2336,17 @@ protected HttpJsonRegionInstanceGroupManagersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group_manager", + String.valueOf(request.getInstanceGroupManager())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return UPDATE_PER_INSTANCE_CONFIGS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.abandonInstancesCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceGroupsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceGroupsStub.java index 32c6a0c70957..85d44587980b 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceGroupsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceGroupsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetRegionInstanceGroupRequest; import com.google.cloud.compute.v1.InstanceGroup; import com.google.cloud.compute.v1.ListInstancesRegionInstanceGroupsRequest; @@ -340,6 +341,17 @@ public class HttpJsonRegionInstanceGroupsStub extends RegionInstanceGroupsStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/instanceGroups/{instance_group}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_INSTANCES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/instanceGroups/{instance_group}"); + private static final PathTemplate SET_NAMED_PORTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/instanceGroups/{instance_group}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/instanceGroups/{resource}"); + public static final HttpJsonRegionInstanceGroupsStub create( RegionInstanceGroupsStubSettings settings) throws IOException { return new HttpJsonRegionInstanceGroupsStub(settings, ClientContext.create(settings)); @@ -393,6 +405,15 @@ protected HttpJsonRegionInstanceGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group", String.valueOf(request.getInstanceGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -407,6 +428,13 @@ protected HttpJsonRegionInstanceGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListInstancesRegionInstanceGroupsRequest, RegionInstanceGroupsListInstances> @@ -424,6 +452,16 @@ protected HttpJsonRegionInstanceGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group", String.valueOf(request.getInstanceGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_INSTANCES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setNamedPortsTransportSettings = @@ -438,6 +476,16 @@ protected HttpJsonRegionInstanceGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_group", String.valueOf(request.getInstanceGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return SET_NAMED_PORTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -453,6 +501,15 @@ protected HttpJsonRegionInstanceGroupsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceTemplatesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceTemplatesStub.java index f95494e95509..25d18f4d3a4a 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceTemplatesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstanceTemplatesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionInstanceTemplateRequest; import com.google.cloud.compute.v1.GetRegionInstanceTemplateRequest; import com.google.cloud.compute.v1.InsertRegionInstanceTemplateRequest; @@ -273,6 +274,17 @@ public class HttpJsonRegionInstanceTemplatesStub extends RegionInstanceTemplates private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceTemplates/{instance_template}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instanceTemplates/{instance_template}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + public static final HttpJsonRegionInstanceTemplatesStub create( RegionInstanceTemplatesStubSettings settings) throws IOException { return new HttpJsonRegionInstanceTemplatesStub(settings, ClientContext.create(settings)); @@ -327,6 +339,15 @@ protected HttpJsonRegionInstanceTemplatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_template", String.valueOf(request.getInstanceTemplate())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -340,6 +361,15 @@ protected HttpJsonRegionInstanceTemplatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instance_template", String.valueOf(request.getInstanceTemplate())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -352,6 +382,13 @@ protected HttpJsonRegionInstanceTemplatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -366,6 +403,13 @@ protected HttpJsonRegionInstanceTemplatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstantSnapshotsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstantSnapshotsStub.java index 203204eedc61..833a5c4b8b91 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstantSnapshotsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionInstantSnapshotsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionInstantSnapshotRequest; import com.google.cloud.compute.v1.GetIamPolicyRegionInstantSnapshotRequest; import com.google.cloud.compute.v1.GetRegionInstantSnapshotRequest; @@ -474,6 +475,25 @@ public class HttpJsonRegionInstantSnapshotsStub extends RegionInstantSnapshotsSt private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instantSnapshots/{instant_snapshot}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/instantSnapshots/{instant_snapshot}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/instantSnapshots/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/instantSnapshots/{resource}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/instantSnapshots/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/instantSnapshots/{resource}"); + public static final HttpJsonRegionInstantSnapshotsStub create( RegionInstantSnapshotsStubSettings settings) throws IOException { return new HttpJsonRegionInstantSnapshotsStub(settings, ClientContext.create(settings)); @@ -527,6 +547,15 @@ protected HttpJsonRegionInstantSnapshotsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instant_snapshot", String.valueOf(request.getInstantSnapshot())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -540,6 +569,15 @@ protected HttpJsonRegionInstantSnapshotsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "instant_snapshot", String.valueOf(request.getInstantSnapshot())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -554,6 +592,15 @@ protected HttpJsonRegionInstantSnapshotsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -566,6 +613,13 @@ protected HttpJsonRegionInstantSnapshotsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -580,6 +634,13 @@ protected HttpJsonRegionInstantSnapshotsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -594,6 +655,15 @@ protected HttpJsonRegionInstantSnapshotsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = @@ -608,6 +678,14 @@ protected HttpJsonRegionInstantSnapshotsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -624,6 +702,15 @@ protected HttpJsonRegionInstantSnapshotsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNetworkEndpointGroupsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNetworkEndpointGroupsStub.java index 73b0266fe7e6..d2dac608bc74 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNetworkEndpointGroupsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNetworkEndpointGroupsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AttachNetworkEndpointsRegionNetworkEndpointGroupRequest; import com.google.cloud.compute.v1.DeleteRegionNetworkEndpointGroupRequest; import com.google.cloud.compute.v1.DetachNetworkEndpointsRegionNetworkEndpointGroupRequest; @@ -497,6 +498,26 @@ public class HttpJsonRegionNetworkEndpointGroupsStub extends RegionNetworkEndpoi private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ATTACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate DETACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkEndpointGroups/{network_endpoint_group}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/networkEndpointGroups/{network_endpoint_group}"); + public static final HttpJsonRegionNetworkEndpointGroupsStub create( RegionNetworkEndpointGroupsStubSettings settings) throws IOException { return new HttpJsonRegionNetworkEndpointGroupsStub(settings, ClientContext.create(settings)); @@ -557,6 +578,17 @@ protected HttpJsonRegionNetworkEndpointGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return ATTACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -573,6 +605,16 @@ protected HttpJsonRegionNetworkEndpointGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings detachNetworkEndpointsTransportSettings = @@ -590,6 +632,17 @@ protected HttpJsonRegionNetworkEndpointGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DETACH_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -607,6 +660,16 @@ protected HttpJsonRegionNetworkEndpointGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -620,6 +683,13 @@ protected HttpJsonRegionNetworkEndpointGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -634,6 +704,13 @@ protected HttpJsonRegionNetworkEndpointGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListNetworkEndpointsRegionNetworkEndpointGroupsRequest, @@ -655,6 +732,17 @@ protected HttpJsonRegionNetworkEndpointGroupsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "network_endpoint_group", + String.valueOf(request.getNetworkEndpointGroup())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_NETWORK_ENDPOINTS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.attachNetworkEndpointsCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNetworkFirewallPoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNetworkFirewallPoliciesStub.java index eb84bc96514e..b20e713e1dec 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNetworkFirewallPoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNetworkFirewallPoliciesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddAssociationRegionNetworkFirewallPolicyRequest; import com.google.cloud.compute.v1.AddRuleRegionNetworkFirewallPolicyRequest; import com.google.cloud.compute.v1.CloneRulesRegionNetworkFirewallPolicyRequest; @@ -1040,6 +1041,41 @@ public class HttpJsonRegionNetworkFirewallPoliciesStub extends RegionNetworkFire private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate ADD_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate CLONE_RULES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate GET_EFFECTIVE_FIREWALLS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{resource}"); + private static final PathTemplate GET_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate PATCH_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate REMOVE_ASSOCIATION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate REMOVE_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{firewall_policy}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/firewallPolicies/{resource}"); + public static final HttpJsonRegionNetworkFirewallPoliciesStub create( RegionNetworkFirewallPoliciesStubSettings settings) throws IOException { return new HttpJsonRegionNetworkFirewallPoliciesStub(settings, ClientContext.create(settings)); @@ -1098,6 +1134,16 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return ADD_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings addRuleTransportSettings = @@ -1112,6 +1158,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return ADD_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings cloneRulesTransportSettings = @@ -1127,6 +1182,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return CLONE_RULES_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -1141,6 +1205,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -1155,6 +1228,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< GetAssociationRegionNetworkFirewallPolicyRequest, FirewallPolicyAssociation> @@ -1172,6 +1254,16 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings< GetEffectiveFirewallsRegionNetworkFirewallPolicyRequest, @@ -1190,6 +1282,14 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_EFFECTIVE_FIREWALLS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -1205,6 +1305,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getRuleTransportSettings = @@ -1220,6 +1329,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -1233,6 +1351,13 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -1247,6 +1372,13 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = @@ -1261,6 +1393,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchRuleTransportSettings = @@ -1276,6 +1417,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return PATCH_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removeAssociationTransportSettings = @@ -1291,6 +1441,16 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return REMOVE_ASSOCIATION_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings removeRuleTransportSettings = @@ -1306,6 +1466,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "firewall_policy", String.valueOf(request.getFirewallPolicy())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return REMOVE_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -1321,6 +1490,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings< TestIamPermissionsRegionNetworkFirewallPolicyRequest, TestPermissionsResponse> @@ -1338,6 +1516,15 @@ protected HttpJsonRegionNetworkFirewallPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.addAssociationCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNotificationEndpointsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNotificationEndpointsStub.java index d4c68a0e1338..dd7333e1f1a4 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNotificationEndpointsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionNotificationEndpointsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListRegionNotificationEndpointsRequest; import com.google.cloud.compute.v1.DeleteRegionNotificationEndpointRequest; import com.google.cloud.compute.v1.GetRegionNotificationEndpointRequest; @@ -406,6 +407,21 @@ public class HttpJsonRegionNotificationEndpointsStub extends RegionNotificationE private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/notificationEndpoints/{notification_endpoint}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/notificationEndpoints/{notification_endpoint}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/notificationEndpoints/{resource}"); + public static final HttpJsonRegionNotificationEndpointsStub create( RegionNotificationEndpointsStubSettings settings) throws IOException { return new HttpJsonRegionNotificationEndpointsStub(settings, ClientContext.create(settings)); @@ -465,6 +481,13 @@ protected HttpJsonRegionNotificationEndpointsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = @@ -481,6 +504,16 @@ protected HttpJsonRegionNotificationEndpointsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "notification_endpoint", + String.valueOf(request.getNotificationEndpoint())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = @@ -498,6 +531,16 @@ protected HttpJsonRegionNotificationEndpointsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "notification_endpoint", + String.valueOf(request.getNotificationEndpoint())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = @@ -511,6 +554,13 @@ protected HttpJsonRegionNotificationEndpointsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -525,6 +575,13 @@ protected HttpJsonRegionNotificationEndpointsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< TestIamPermissionsRegionNotificationEndpointRequest, TestPermissionsResponse> @@ -542,6 +599,15 @@ protected HttpJsonRegionNotificationEndpointsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionOperationsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionOperationsStub.java index e24ffbed37f3..0f6ce897fa99 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionOperationsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionOperationsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.LongRunningClient; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionOperationRequest; import com.google.cloud.compute.v1.DeleteRegionOperationResponse; import com.google.cloud.compute.v1.GetRegionOperationRequest; @@ -252,6 +253,15 @@ public class HttpJsonRegionOperationsStub extends RegionOperationsStub { private final LongRunningClient longRunningClient; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/operations/{operation}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/operations/{operation}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate WAIT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/operations/{operation}"); + public static final HttpJsonRegionOperationsStub create(RegionOperationsStubSettings settings) throws IOException { return new HttpJsonRegionOperationsStub(settings, ClientContext.create(settings)); @@ -305,6 +315,14 @@ protected HttpJsonRegionOperationsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -318,6 +336,14 @@ protected HttpJsonRegionOperationsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -330,6 +356,13 @@ protected HttpJsonRegionOperationsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings waitTransportSettings = HttpJsonCallSettings.newBuilder() @@ -343,6 +376,14 @@ protected HttpJsonRegionOperationsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return WAIT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSecurityPoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSecurityPoliciesStub.java index 1759414c68c2..0b76d6965391 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSecurityPoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSecurityPoliciesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddRuleRegionSecurityPolicyRequest; import com.google.cloud.compute.v1.DeleteRegionSecurityPolicyRequest; import com.google.cloud.compute.v1.GetRegionSecurityPolicyRequest; @@ -635,6 +636,27 @@ public class HttpJsonRegionSecurityPoliciesStub extends RegionSecurityPoliciesSt private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/securityPolicies/{security_policy}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/securityPolicies/{security_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/securityPolicies/{security_policy}"); + private static final PathTemplate GET_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/securityPolicies/{security_policy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/securityPolicies/{security_policy}"); + private static final PathTemplate PATCH_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/securityPolicies/{security_policy}"); + private static final PathTemplate REMOVE_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/securityPolicies/{security_policy}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/securityPolicies/{resource}"); + public static final HttpJsonRegionSecurityPoliciesStub create( RegionSecurityPoliciesStubSettings settings) throws IOException { return new HttpJsonRegionSecurityPoliciesStub(settings, ClientContext.create(settings)); @@ -688,6 +710,15 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return ADD_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -701,6 +732,15 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -714,6 +754,15 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getRuleTransportSettings = @@ -729,6 +778,15 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return GET_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -741,6 +799,13 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -754,6 +819,13 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -767,6 +839,15 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchRuleTransportSettings = @@ -781,6 +862,15 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return PATCH_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removeRuleTransportSettings = @@ -795,6 +885,15 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return REMOVE_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = @@ -809,6 +908,14 @@ protected HttpJsonRegionSecurityPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.addRuleCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSslCertificatesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSslCertificatesStub.java index 54efa1475768..0dab0eee31f8 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSslCertificatesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSslCertificatesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionSslCertificateRequest; import com.google.cloud.compute.v1.GetRegionSslCertificateRequest; import com.google.cloud.compute.v1.InsertRegionSslCertificateRequest; @@ -272,6 +273,15 @@ public class HttpJsonRegionSslCertificatesStub extends RegionSslCertificatesStub private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/sslCertificates/{ssl_certificate}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/sslCertificates/{ssl_certificate}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + public static final HttpJsonRegionSslCertificatesStub create( RegionSslCertificatesStubSettings settings) throws IOException { return new HttpJsonRegionSslCertificatesStub(settings, ClientContext.create(settings)); @@ -325,6 +335,15 @@ protected HttpJsonRegionSslCertificatesStub( builder.add("ssl_certificate", String.valueOf(request.getSslCertificate())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "ssl_certificate", String.valueOf(request.getSslCertificate())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -338,6 +357,15 @@ protected HttpJsonRegionSslCertificatesStub( builder.add("ssl_certificate", String.valueOf(request.getSslCertificate())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "ssl_certificate", String.valueOf(request.getSslCertificate())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -350,6 +378,13 @@ protected HttpJsonRegionSslCertificatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -363,6 +398,13 @@ protected HttpJsonRegionSslCertificatesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSslPoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSslPoliciesStub.java index c45f352650ca..b541fadf27ff 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSslPoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionSslPoliciesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionSslPolicyRequest; import com.google.cloud.compute.v1.GetRegionSslPolicyRequest; import com.google.cloud.compute.v1.InsertRegionSslPolicyRequest; @@ -390,6 +391,19 @@ public class HttpJsonRegionSslPoliciesStub extends RegionSslPoliciesStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/sslPolicies/{ssl_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/sslPolicies/{ssl_policy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_AVAILABLE_FEATURES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/sslPolicies/{ssl_policy}"); + public static final HttpJsonRegionSslPoliciesStub create(RegionSslPoliciesStubSettings settings) throws IOException { return new HttpJsonRegionSslPoliciesStub(settings, ClientContext.create(settings)); @@ -443,6 +457,14 @@ protected HttpJsonRegionSslPoliciesStub( builder.add("ssl_policy", String.valueOf(request.getSslPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("ssl_policy", String.valueOf(request.getSslPolicy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -456,6 +478,14 @@ protected HttpJsonRegionSslPoliciesStub( builder.add("ssl_policy", String.valueOf(request.getSslPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("ssl_policy", String.valueOf(request.getSslPolicy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -468,6 +498,13 @@ protected HttpJsonRegionSslPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -480,6 +517,13 @@ protected HttpJsonRegionSslPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListAvailableFeaturesRegionSslPoliciesRequest, SslPoliciesListAvailableFeaturesResponse> @@ -497,6 +541,14 @@ protected HttpJsonRegionSslPoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_AVAILABLE_FEATURES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -510,6 +562,14 @@ protected HttpJsonRegionSslPoliciesStub( builder.add("ssl_policy", String.valueOf(request.getSslPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("ssl_policy", String.valueOf(request.getSslPolicy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetHttpProxiesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetHttpProxiesStub.java index 37766335b4f7..2234e84cde2d 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetHttpProxiesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetHttpProxiesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionTargetHttpProxyRequest; import com.google.cloud.compute.v1.GetRegionTargetHttpProxyRequest; import com.google.cloud.compute.v1.InsertRegionTargetHttpProxyRequest; @@ -334,6 +335,20 @@ public class HttpJsonRegionTargetHttpProxiesStub extends RegionTargetHttpProxies private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetHttpProxies/{target_http_proxy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetHttpProxies/{target_http_proxy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate SET_URL_MAP_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetHttpProxies/{target_http_proxy}"); + public static final HttpJsonRegionTargetHttpProxiesStub create( RegionTargetHttpProxiesStubSettings settings) throws IOException { return new HttpJsonRegionTargetHttpProxiesStub(settings, ClientContext.create(settings)); @@ -388,6 +403,15 @@ protected HttpJsonRegionTargetHttpProxiesStub( builder.add("target_http_proxy", String.valueOf(request.getTargetHttpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_http_proxy", String.valueOf(request.getTargetHttpProxy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -401,6 +425,15 @@ protected HttpJsonRegionTargetHttpProxiesStub( builder.add("target_http_proxy", String.valueOf(request.getTargetHttpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_http_proxy", String.valueOf(request.getTargetHttpProxy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -413,6 +446,13 @@ protected HttpJsonRegionTargetHttpProxiesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -427,6 +467,13 @@ protected HttpJsonRegionTargetHttpProxiesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setUrlMapTransportSettings = @@ -442,6 +489,15 @@ protected HttpJsonRegionTargetHttpProxiesStub( "target_http_proxy", String.valueOf(request.getTargetHttpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_http_proxy", String.valueOf(request.getTargetHttpProxy())); + return SET_URL_MAP_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetHttpsProxiesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetHttpsProxiesStub.java index f284d81ce660..0b304f7d62cb 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetHttpsProxiesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetHttpsProxiesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionTargetHttpsProxyRequest; import com.google.cloud.compute.v1.GetRegionTargetHttpsProxyRequest; import com.google.cloud.compute.v1.InsertRegionTargetHttpsProxyRequest; @@ -468,6 +469,26 @@ public class HttpJsonRegionTargetHttpsProxiesStub extends RegionTargetHttpsProxi private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate SET_SSL_CERTIFICATES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate SET_URL_MAP_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetHttpsProxies/{target_https_proxy}"); + public static final HttpJsonRegionTargetHttpsProxiesStub create( RegionTargetHttpsProxiesStubSettings settings) throws IOException { return new HttpJsonRegionTargetHttpsProxiesStub(settings, ClientContext.create(settings)); @@ -522,6 +543,15 @@ protected HttpJsonRegionTargetHttpsProxiesStub( builder.add("target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -535,6 +565,15 @@ protected HttpJsonRegionTargetHttpsProxiesStub( builder.add("target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -547,6 +586,13 @@ protected HttpJsonRegionTargetHttpsProxiesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -561,6 +607,13 @@ protected HttpJsonRegionTargetHttpsProxiesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -574,6 +627,15 @@ protected HttpJsonRegionTargetHttpsProxiesStub( builder.add("target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setSslCertificatesTransportSettings = @@ -590,6 +652,16 @@ protected HttpJsonRegionTargetHttpsProxiesStub( "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return SET_SSL_CERTIFICATES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setUrlMapTransportSettings = @@ -605,6 +677,15 @@ protected HttpJsonRegionTargetHttpsProxiesStub( "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return SET_URL_MAP_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetTcpProxiesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetTcpProxiesStub.java index 8b44b67c139e..a7c7b1cb211e 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetTcpProxiesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionTargetTcpProxiesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionTargetTcpProxyRequest; import com.google.cloud.compute.v1.GetRegionTargetTcpProxyRequest; import com.google.cloud.compute.v1.InsertRegionTargetTcpProxyRequest; @@ -272,6 +273,17 @@ public class HttpJsonRegionTargetTcpProxiesStub extends RegionTargetTcpProxiesSt private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetTcpProxies/{target_tcp_proxy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetTcpProxies/{target_tcp_proxy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + public static final HttpJsonRegionTargetTcpProxiesStub create( RegionTargetTcpProxiesStubSettings settings) throws IOException { return new HttpJsonRegionTargetTcpProxiesStub(settings, ClientContext.create(settings)); @@ -325,6 +337,15 @@ protected HttpJsonRegionTargetTcpProxiesStub( builder.add("target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -338,6 +359,15 @@ protected HttpJsonRegionTargetTcpProxiesStub( builder.add("target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -350,6 +380,13 @@ protected HttpJsonRegionTargetTcpProxiesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -363,6 +400,13 @@ protected HttpJsonRegionTargetTcpProxiesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionUrlMapsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionUrlMapsStub.java index d187af52233e..f75a1883c983 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionUrlMapsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionUrlMapsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRegionUrlMapRequest; import com.google.cloud.compute.v1.GetRegionUrlMapRequest; import com.google.cloud.compute.v1.InsertRegionUrlMapRequest; @@ -426,6 +427,21 @@ public class HttpJsonRegionUrlMapsStub extends RegionUrlMapsStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/urlMaps/{url_map}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/urlMaps/{url_map}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/urlMaps/{url_map}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/urlMaps/{url_map}"); + private static final PathTemplate VALIDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/urlMaps/{url_map}"); + public static final HttpJsonRegionUrlMapsStub create(RegionUrlMapsStubSettings settings) throws IOException { return new HttpJsonRegionUrlMapsStub(settings, ClientContext.create(settings)); @@ -479,6 +495,14 @@ protected HttpJsonRegionUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -492,6 +516,14 @@ protected HttpJsonRegionUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -504,6 +536,13 @@ protected HttpJsonRegionUrlMapsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -516,6 +555,13 @@ protected HttpJsonRegionUrlMapsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -529,6 +575,14 @@ protected HttpJsonRegionUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -542,6 +596,14 @@ protected HttpJsonRegionUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings validateTransportSettings = @@ -556,6 +618,14 @@ protected HttpJsonRegionUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return VALIDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionZonesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionZonesStub.java index dcb8ca1158b9..0eff1cf845b6 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionZonesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionZonesStub.java @@ -30,6 +30,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.ListRegionZonesRequest; import com.google.cloud.compute.v1.ZoneList; import com.google.protobuf.TypeRegistry; @@ -106,6 +107,9 @@ public class HttpJsonRegionZonesStub extends RegionZonesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + public static final HttpJsonRegionZonesStub create(RegionZonesStubSettings settings) throws IOException { return new HttpJsonRegionZonesStub(settings, ClientContext.create(settings)); @@ -155,6 +159,13 @@ protected HttpJsonRegionZonesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.listCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionsStub.java index 9d2434f9db6d..d23637de5bc2 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRegionsStub.java @@ -30,6 +30,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetRegionRequest; import com.google.cloud.compute.v1.ListRegionsRequest; import com.google.cloud.compute.v1.Region; @@ -141,6 +142,11 @@ public class HttpJsonRegionsStub extends RegionsStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + public static final HttpJsonRegionsStub create(RegionsStubSettings settings) throws IOException { return new HttpJsonRegionsStub(settings, ClientContext.create(settings)); } @@ -188,6 +194,13 @@ protected HttpJsonRegionsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -199,6 +212,12 @@ protected HttpJsonRegionsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationBlocksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationBlocksStub.java index bd889e2e4618..291c48941937 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationBlocksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationBlocksStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetIamPolicyReservationBlockRequest; import com.google.cloud.compute.v1.GetReservationBlockRequest; import com.google.cloud.compute.v1.ListReservationBlocksRequest; @@ -373,6 +374,24 @@ public class HttpJsonReservationBlocksStub extends ReservationBlocksStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/reservations/{reservation}/reservationBlocks/{reservation_block}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/reservations/{parent_resource}/reservationBlocks/{resource}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/reservations/{reservation}"); + private static final PathTemplate PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/reservations/{reservation}/reservationBlocks/{reservation_block}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/reservations/{parent_resource}/reservationBlocks/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/reservations/{parent_resource}/reservationBlocks/{resource}"); + public static final HttpJsonReservationBlocksStub create(ReservationBlocksStubSettings settings) throws IOException { return new HttpJsonReservationBlocksStub(settings, ClientContext.create(settings)); @@ -429,6 +448,17 @@ protected HttpJsonReservationBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation", String.valueOf(request.getReservation())); + resourceNameSegments.put( + "reservation_block", String.valueOf(request.getReservationBlock())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -444,6 +474,17 @@ protected HttpJsonReservationBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_resource", String.valueOf(request.getParentResource())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -459,6 +500,15 @@ protected HttpJsonReservationBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation", String.valueOf(request.getReservation())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings performMaintenanceTransportSettings = @@ -475,6 +525,18 @@ protected HttpJsonReservationBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation", String.valueOf(request.getReservation())); + resourceNameSegments.put( + "reservation_block", String.valueOf(request.getReservationBlock())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -490,6 +552,17 @@ protected HttpJsonReservationBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_resource", String.valueOf(request.getParentResource())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -506,6 +579,17 @@ protected HttpJsonReservationBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_resource", String.valueOf(request.getParentResource())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationSlotsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationSlotsStub.java index bc7c34b8fd1d..20374145d67c 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationSlotsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationSlotsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetReservationSlotRequest; import com.google.cloud.compute.v1.GetVersionReservationSlotRequest; import com.google.cloud.compute.v1.ListReservationSlotsRequest; @@ -287,6 +288,19 @@ public class HttpJsonReservationSlotsStub extends ReservationSlotsStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_name=reservations/*/reservationBlocks/*/reservationSubBlocks/*}/reservationSlots/{reservation_slot}"); + private static final PathTemplate GET_VERSION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_name=reservations/*/reservationBlocks/*/reservationSubBlocks/*}/reservationSlots/{reservation_slot}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_name=reservations/*/reservationBlocks/*/reservationSubBlocks/*}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_name=reservations/*/reservationBlocks/*/reservationSubBlocks/*}/reservationSlots/{reservation_slot}"); + public static final HttpJsonReservationSlotsStub create(ReservationSlotsStubSettings settings) throws IOException { return new HttpJsonReservationSlotsStub(settings, ClientContext.create(settings)); @@ -342,6 +356,17 @@ protected HttpJsonReservationSlotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_name", String.valueOf(request.getParentName())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation_slot", String.valueOf(request.getReservationSlot())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getVersionTransportSettings = HttpJsonCallSettings.newBuilder() @@ -356,6 +381,16 @@ protected HttpJsonReservationSlotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("parent_name", String.valueOf(request.getParentName())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation_slot", String.valueOf(request.getReservationSlot())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_VERSION_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -371,6 +406,15 @@ protected HttpJsonReservationSlotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_name", String.valueOf(request.getParentName())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -385,6 +429,16 @@ protected HttpJsonReservationSlotsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("parent_name", String.valueOf(request.getParentName())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation_slot", String.valueOf(request.getReservationSlot())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationSubBlocksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationSubBlocksStub.java index e1f7a3f3fb76..408255a77ae7 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationSubBlocksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationSubBlocksStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetIamPolicyReservationSubBlockRequest; import com.google.cloud.compute.v1.GetReservationSubBlockRequest; import com.google.cloud.compute.v1.GetVersionReservationSubBlockRequest; @@ -494,6 +495,31 @@ public class HttpJsonReservationSubBlocksStub extends ReservationSubBlocksStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_name=reservations/*/reservationBlocks/*}/reservationSubBlocks/{reservation_sub_block}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_resource=reservations/*/reservationBlocks/*}/reservationSubBlocks/{resource}"); + private static final PathTemplate GET_VERSION_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_name=reservations/*/reservationBlocks/*}/reservationSubBlocks/{reservation_sub_block}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_name=reservations/*/reservationBlocks/*}"); + private static final PathTemplate PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_name=reservations/*/reservationBlocks/*}/reservationSubBlocks/{reservation_sub_block}"); + private static final PathTemplate REPORT_FAULTY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_name=reservations/*/reservationBlocks/*}/reservationSubBlocks/{reservation_sub_block}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_resource=reservations/*/reservationBlocks/*}/reservationSubBlocks/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/zones/{zone}/{parent_resource=reservations/*/reservationBlocks/*}/reservationSubBlocks/{resource}"); + public static final HttpJsonReservationSubBlocksStub create( ReservationSubBlocksStubSettings settings) throws IOException { return new HttpJsonReservationSubBlocksStub(settings, ClientContext.create(settings)); @@ -551,6 +577,18 @@ protected HttpJsonReservationSubBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_name", String.valueOf(request.getParentName())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation_sub_block", + String.valueOf(request.getReservationSubBlock())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -566,6 +604,17 @@ protected HttpJsonReservationSubBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_resource", String.valueOf(request.getParentResource())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getVersionTransportSettings = @@ -583,6 +632,18 @@ protected HttpJsonReservationSubBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_name", String.valueOf(request.getParentName())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation_sub_block", + String.valueOf(request.getReservationSubBlock())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_VERSION_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -598,6 +659,15 @@ protected HttpJsonReservationSubBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_name", String.valueOf(request.getParentName())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings performMaintenanceTransportSettings = @@ -616,6 +686,19 @@ protected HttpJsonReservationSubBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_name", String.valueOf(request.getParentName())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation_sub_block", + String.valueOf(request.getReservationSubBlock())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings reportFaultyTransportSettings = @@ -633,6 +716,18 @@ protected HttpJsonReservationSubBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_name", String.valueOf(request.getParentName())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation_sub_block", + String.valueOf(request.getReservationSubBlock())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return REPORT_FAULTY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -648,6 +743,17 @@ protected HttpJsonReservationSubBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_resource", String.valueOf(request.getParentResource())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -664,6 +770,17 @@ protected HttpJsonReservationSubBlocksStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "parent_resource", String.valueOf(request.getParentResource())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationsStub.java index 9eb90f2ac63f..2df6455b9c78 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonReservationsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListReservationsRequest; import com.google.cloud.compute.v1.DeleteReservationRequest; import com.google.cloud.compute.v1.GetIamPolicyReservationRequest; @@ -668,6 +669,29 @@ public class HttpJsonReservationsStub extends ReservationsStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/reservations/{reservation}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/reservations/{reservation}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/reservations/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/reservations/{reservation}"); + private static final PathTemplate RESIZE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/reservations/{reservation}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/reservations/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/reservations/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/reservations/{reservation}"); + public static final HttpJsonReservationsStub create(ReservationsStubSettings settings) throws IOException { return new HttpJsonReservationsStub(settings, ClientContext.create(settings)); @@ -720,6 +744,13 @@ protected HttpJsonReservationsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -733,6 +764,14 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("reservation", String.valueOf(request.getReservation())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -746,6 +785,14 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("reservation", String.valueOf(request.getReservation())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -759,6 +806,14 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -771,6 +826,13 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -783,6 +845,13 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings performMaintenanceTransportSettings = @@ -797,6 +866,16 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "reservation", String.valueOf(request.getReservation())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return PERFORM_MAINTENANCE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings resizeTransportSettings = HttpJsonCallSettings.newBuilder() @@ -810,6 +889,14 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("reservation", String.valueOf(request.getReservation())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return RESIZE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -823,6 +910,14 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -838,6 +933,15 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -851,6 +955,14 @@ protected HttpJsonReservationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("reservation", String.valueOf(request.getReservation())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonResourcePoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonResourcePoliciesStub.java index 0f57e9750426..a2c82fdc5798 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonResourcePoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonResourcePoliciesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListResourcePoliciesRequest; import com.google.cloud.compute.v1.DeleteResourcePolicyRequest; import com.google.cloud.compute.v1.GetIamPolicyResourcePolicyRequest; @@ -542,6 +543,25 @@ public class HttpJsonResourcePoliciesStub extends ResourcePoliciesStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/resourcePolicies/{resource_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/resourcePolicies/{resource_policy}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/resourcePolicies/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/resourcePolicies/{resource_policy}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/resourcePolicies/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/resourcePolicies/{resource}"); + public static final HttpJsonResourcePoliciesStub create(ResourcePoliciesStubSettings settings) throws IOException { return new HttpJsonResourcePoliciesStub(settings, ClientContext.create(settings)); @@ -595,6 +615,13 @@ protected HttpJsonResourcePoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -608,6 +635,15 @@ protected HttpJsonResourcePoliciesStub( builder.add("resource_policy", String.valueOf(request.getResourcePolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "resource_policy", String.valueOf(request.getResourcePolicy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -621,6 +657,15 @@ protected HttpJsonResourcePoliciesStub( builder.add("resource_policy", String.valueOf(request.getResourcePolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "resource_policy", String.valueOf(request.getResourcePolicy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -634,6 +679,14 @@ protected HttpJsonResourcePoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -646,6 +699,13 @@ protected HttpJsonResourcePoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -658,6 +718,13 @@ protected HttpJsonResourcePoliciesStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -671,6 +738,15 @@ protected HttpJsonResourcePoliciesStub( builder.add("resource_policy", String.valueOf(request.getResourcePolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "resource_policy", String.valueOf(request.getResourcePolicy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -684,6 +760,14 @@ protected HttpJsonResourcePoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -699,6 +783,15 @@ protected HttpJsonResourcePoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRoutersStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRoutersStub.java index da10f6a6485a..59d9dba9b69a 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRoutersStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRoutersStub.java @@ -36,6 +36,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListRoutersRequest; import com.google.cloud.compute.v1.DeleteRoutePolicyRouterRequest; import com.google.cloud.compute.v1.DeleteRouterRequest; @@ -994,6 +995,41 @@ public class HttpJsonRoutersStub extends RoutersStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate DELETE_ROUTE_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate GET_NAT_IP_INFO_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate GET_NAT_MAPPING_INFO_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate GET_ROUTE_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate GET_ROUTER_STATUS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_BGP_ROUTES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate LIST_ROUTE_POLICIES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate PATCH_ROUTE_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate PREVIEW_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + private static final PathTemplate UPDATE_ROUTE_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/routers/{router}"); + public static final HttpJsonRoutersStub create(RoutersStubSettings settings) throws IOException { return new HttpJsonRoutersStub(settings, ClientContext.create(settings)); } @@ -1043,6 +1079,13 @@ protected HttpJsonRoutersStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1056,6 +1099,14 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteRoutePolicyTransportSettings = @@ -1070,6 +1121,15 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return DELETE_ROUTE_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1083,6 +1143,14 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getNatIpInfoTransportSettings = @@ -1097,6 +1165,15 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return GET_NAT_IP_INFO_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getNatMappingInfoTransportSettings = @@ -1112,6 +1189,15 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return GET_NAT_MAPPING_INFO_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getRoutePolicyTransportSettings = @@ -1127,6 +1213,15 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return GET_ROUTE_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getRouterStatusTransportSettings = @@ -1141,6 +1236,15 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return GET_ROUTER_STATUS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1153,6 +1257,13 @@ protected HttpJsonRoutersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1165,6 +1276,13 @@ protected HttpJsonRoutersStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listBgpRoutesTransportSettings = @@ -1179,6 +1297,15 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return LIST_BGP_ROUTES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings listRoutePoliciesTransportSettings = @@ -1194,6 +1321,15 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return LIST_ROUTE_POLICIES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1207,6 +1343,14 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchRoutePolicyTransportSettings = @@ -1221,6 +1365,15 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return PATCH_ROUTE_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings previewTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1234,6 +1387,14 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return PREVIEW_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -1247,6 +1408,14 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings updateRoutePolicyTransportSettings = @@ -1261,6 +1430,15 @@ protected HttpJsonRoutersStub( builder.add("router", String.valueOf(request.getRouter())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("router", String.valueOf(request.getRouter())); + return UPDATE_ROUTE_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRoutesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRoutesStub.java index bc3edc361fd2..f8cea01abf7e 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRoutesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonRoutesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteRouteRequest; import com.google.cloud.compute.v1.GetRouteRequest; import com.google.cloud.compute.v1.InsertRouteRequest; @@ -295,6 +296,17 @@ public class HttpJsonRoutesStub extends RoutesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/routes/{route}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/routes/{route}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/routes/{resource}"); + public static final HttpJsonRoutesStub create(RoutesStubSettings settings) throws IOException { return new HttpJsonRoutesStub(settings, ClientContext.create(settings)); } @@ -344,6 +356,13 @@ protected HttpJsonRoutesStub( builder.add("route", String.valueOf(request.getRoute())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("route", String.valueOf(request.getRoute())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -356,6 +375,13 @@ protected HttpJsonRoutesStub( builder.add("route", String.valueOf(request.getRoute())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("route", String.valueOf(request.getRoute())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -367,6 +393,12 @@ protected HttpJsonRoutesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -378,6 +410,12 @@ protected HttpJsonRoutesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -392,6 +430,14 @@ protected HttpJsonRoutesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSecurityPoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSecurityPoliciesStub.java index a7ce5fa3a3e4..8776afaad6d8 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSecurityPoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSecurityPoliciesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddRuleSecurityPolicyRequest; import com.google.cloud.compute.v1.AggregatedListSecurityPoliciesRequest; import com.google.cloud.compute.v1.DeleteSecurityPolicyRequest; @@ -754,6 +755,31 @@ public class HttpJsonSecurityPoliciesStub extends SecurityPoliciesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/securityPolicies/{security_policy}"); + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/securityPolicies/{security_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/securityPolicies/{security_policy}"); + private static final PathTemplate GET_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/securityPolicies/{security_policy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_PRECONFIGURED_EXPRESSION_SETS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/securityPolicies/{security_policy}"); + private static final PathTemplate PATCH_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/securityPolicies/{security_policy}"); + private static final PathTemplate REMOVE_RULE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/securityPolicies/{security_policy}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/securityPolicies/{resource}"); + public static final HttpJsonSecurityPoliciesStub create(SecurityPoliciesStubSettings settings) throws IOException { return new HttpJsonSecurityPoliciesStub(settings, ClientContext.create(settings)); @@ -806,6 +832,14 @@ protected HttpJsonSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return ADD_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings aggregatedListTransportSettings = @@ -819,6 +853,13 @@ protected HttpJsonSecurityPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -831,6 +872,14 @@ protected HttpJsonSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -843,6 +892,14 @@ protected HttpJsonSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getRuleTransportSettings = @@ -856,6 +913,14 @@ protected HttpJsonSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return GET_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -867,6 +932,12 @@ protected HttpJsonSecurityPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -878,6 +949,12 @@ protected HttpJsonSecurityPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListPreconfiguredExpressionSetsSecurityPoliciesRequest, @@ -895,6 +972,13 @@ protected HttpJsonSecurityPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_PRECONFIGURED_EXPRESSION_SETS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -907,6 +991,14 @@ protected HttpJsonSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchRuleTransportSettings = HttpJsonCallSettings.newBuilder() @@ -919,6 +1011,14 @@ protected HttpJsonSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return PATCH_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removeRuleTransportSettings = HttpJsonCallSettings.newBuilder() @@ -931,6 +1031,14 @@ protected HttpJsonSecurityPoliciesStub( builder.add("security_policy", String.valueOf(request.getSecurityPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "security_policy", String.valueOf(request.getSecurityPolicy())); + return REMOVE_RULE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -943,6 +1051,13 @@ protected HttpJsonSecurityPoliciesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.addRuleCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonServiceAttachmentsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonServiceAttachmentsStub.java index 4afe837d0111..beaac11b46f9 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonServiceAttachmentsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonServiceAttachmentsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListServiceAttachmentsRequest; import com.google.cloud.compute.v1.DeleteServiceAttachmentRequest; import com.google.cloud.compute.v1.GetIamPolicyServiceAttachmentRequest; @@ -545,6 +546,28 @@ public class HttpJsonServiceAttachmentsStub extends ServiceAttachmentsStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/serviceAttachments/{service_attachment}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/serviceAttachments/{service_attachment}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/serviceAttachments/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/serviceAttachments/{service_attachment}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/serviceAttachments/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/serviceAttachments/{resource}"); + public static final HttpJsonServiceAttachmentsStub create(ServiceAttachmentsStubSettings settings) throws IOException { return new HttpJsonServiceAttachmentsStub(settings, ClientContext.create(settings)); @@ -599,6 +622,13 @@ protected HttpJsonServiceAttachmentsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -612,6 +642,15 @@ protected HttpJsonServiceAttachmentsStub( builder.add("service_attachment", String.valueOf(request.getServiceAttachment())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "service_attachment", String.valueOf(request.getServiceAttachment())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -625,6 +664,15 @@ protected HttpJsonServiceAttachmentsStub( builder.add("service_attachment", String.valueOf(request.getServiceAttachment())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "service_attachment", String.valueOf(request.getServiceAttachment())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = @@ -639,6 +687,15 @@ protected HttpJsonServiceAttachmentsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -651,6 +708,13 @@ protected HttpJsonServiceAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -664,6 +728,13 @@ protected HttpJsonServiceAttachmentsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -677,6 +748,15 @@ protected HttpJsonServiceAttachmentsStub( builder.add("service_attachment", String.valueOf(request.getServiceAttachment())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "service_attachment", String.valueOf(request.getServiceAttachment())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = @@ -691,6 +771,15 @@ protected HttpJsonServiceAttachmentsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -706,6 +795,15 @@ protected HttpJsonServiceAttachmentsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSnapshotSettingsServiceStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSnapshotSettingsServiceStub.java index 51ae27e20d48..77b1128c435a 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSnapshotSettingsServiceStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSnapshotSettingsServiceStub.java @@ -30,6 +30,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetSnapshotSettingRequest; import com.google.cloud.compute.v1.Operation; import com.google.cloud.compute.v1.Operation.Status; @@ -155,6 +156,11 @@ public class HttpJsonSnapshotSettingsServiceStub extends SnapshotSettingsService private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + public static final HttpJsonSnapshotSettingsServiceStub create( SnapshotSettingsServiceStubSettings settings) throws IOException { return new HttpJsonSnapshotSettingsServiceStub(settings, ClientContext.create(settings)); @@ -207,6 +213,12 @@ protected HttpJsonSnapshotSettingsServiceStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -218,6 +230,12 @@ protected HttpJsonSnapshotSettingsServiceStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSnapshotsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSnapshotsStub.java index 0b4165d881c8..c9e71b58c78b 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSnapshotsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSnapshotsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteSnapshotRequest; import com.google.cloud.compute.v1.GetIamPolicySnapshotRequest; import com.google.cloud.compute.v1.GetSnapshotRequest; @@ -446,6 +447,23 @@ public class HttpJsonSnapshotsStub extends SnapshotsStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/snapshots/{snapshot}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/snapshots/{snapshot}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/snapshots/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/snapshots/{resource}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/snapshots/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/snapshots/{resource}"); + public static final HttpJsonSnapshotsStub create(SnapshotsStubSettings settings) throws IOException { return new HttpJsonSnapshotsStub(settings, ClientContext.create(settings)); @@ -496,6 +514,13 @@ protected HttpJsonSnapshotsStub( builder.add("snapshot", String.valueOf(request.getSnapshot())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("snapshot", String.valueOf(request.getSnapshot())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -508,6 +533,13 @@ protected HttpJsonSnapshotsStub( builder.add("snapshot", String.valueOf(request.getSnapshot())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("snapshot", String.valueOf(request.getSnapshot())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -520,6 +552,13 @@ protected HttpJsonSnapshotsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -531,6 +570,12 @@ protected HttpJsonSnapshotsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -542,6 +587,12 @@ protected HttpJsonSnapshotsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -554,6 +605,13 @@ protected HttpJsonSnapshotsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -566,6 +624,13 @@ protected HttpJsonSnapshotsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -580,6 +645,14 @@ protected HttpJsonSnapshotsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSslCertificatesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSslCertificatesStub.java index 813f8e5ce4f5..f4c9db15826d 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSslCertificatesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSslCertificatesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListSslCertificatesRequest; import com.google.cloud.compute.v1.DeleteSslCertificateRequest; import com.google.cloud.compute.v1.GetSslCertificateRequest; @@ -336,6 +337,17 @@ public class HttpJsonSslCertificatesStub extends SslCertificatesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/sslCertificates/{ssl_certificate}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/sslCertificates/{ssl_certificate}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + public static final HttpJsonSslCertificatesStub create(SslCertificatesStubSettings settings) throws IOException { return new HttpJsonSslCertificatesStub(settings, ClientContext.create(settings)); @@ -389,6 +401,13 @@ protected HttpJsonSslCertificatesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -401,6 +420,14 @@ protected HttpJsonSslCertificatesStub( builder.add("ssl_certificate", String.valueOf(request.getSslCertificate())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "ssl_certificate", String.valueOf(request.getSslCertificate())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -413,6 +440,14 @@ protected HttpJsonSslCertificatesStub( builder.add("ssl_certificate", String.valueOf(request.getSslCertificate())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "ssl_certificate", String.valueOf(request.getSslCertificate())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -424,6 +459,12 @@ protected HttpJsonSslCertificatesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -435,6 +476,12 @@ protected HttpJsonSslCertificatesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSslPoliciesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSslPoliciesStub.java index 316fc46f092a..2820c3848f74 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSslPoliciesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSslPoliciesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListSslPoliciesRequest; import com.google.cloud.compute.v1.DeleteSslPolicyRequest; import com.google.cloud.compute.v1.GetSslPolicyRequest; @@ -447,6 +448,21 @@ public class HttpJsonSslPoliciesStub extends SslPoliciesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/sslPolicies/{ssl_policy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/sslPolicies/{ssl_policy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_AVAILABLE_FEATURES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/sslPolicies/{ssl_policy}"); + public static final HttpJsonSslPoliciesStub create(SslPoliciesStubSettings settings) throws IOException { return new HttpJsonSslPoliciesStub(settings, ClientContext.create(settings)); @@ -499,6 +515,13 @@ protected HttpJsonSslPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -511,6 +534,13 @@ protected HttpJsonSslPoliciesStub( builder.add("ssl_policy", String.valueOf(request.getSslPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("ssl_policy", String.valueOf(request.getSslPolicy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -523,6 +553,13 @@ protected HttpJsonSslPoliciesStub( builder.add("ssl_policy", String.valueOf(request.getSslPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("ssl_policy", String.valueOf(request.getSslPolicy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -534,6 +571,12 @@ protected HttpJsonSslPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -545,6 +588,12 @@ protected HttpJsonSslPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings< ListAvailableFeaturesSslPoliciesRequest, SslPoliciesListAvailableFeaturesResponse> @@ -560,6 +609,13 @@ protected HttpJsonSslPoliciesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_AVAILABLE_FEATURES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -572,6 +628,13 @@ protected HttpJsonSslPoliciesStub( builder.add("ssl_policy", String.valueOf(request.getSslPolicy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("ssl_policy", String.valueOf(request.getSslPolicy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonStoragePoolTypesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonStoragePoolTypesStub.java index 31dbb0c2b0e7..45fef98a9651 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonStoragePoolTypesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonStoragePoolTypesStub.java @@ -31,6 +31,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListStoragePoolTypesRequest; import com.google.cloud.compute.v1.GetStoragePoolTypeRequest; import com.google.cloud.compute.v1.ListStoragePoolTypesRequest; @@ -220,6 +221,13 @@ public class HttpJsonStoragePoolTypesStub extends StoragePoolTypesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/storagePoolTypes/{storage_pool_type}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + public static final HttpJsonStoragePoolTypesStub create(StoragePoolTypesStubSettings settings) throws IOException { return new HttpJsonStoragePoolTypesStub(settings, ClientContext.create(settings)); @@ -271,6 +279,13 @@ protected HttpJsonStoragePoolTypesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -284,6 +299,15 @@ protected HttpJsonStoragePoolTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "storage_pool_type", String.valueOf(request.getStoragePoolType())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -296,6 +320,13 @@ protected HttpJsonStoragePoolTypesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonStoragePoolsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonStoragePoolsStub.java index 14674bf4f253..1342f4a5972b 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonStoragePoolsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonStoragePoolsStub.java @@ -34,6 +34,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListStoragePoolsRequest; import com.google.cloud.compute.v1.DeleteStoragePoolRequest; import com.google.cloud.compute.v1.GetIamPolicyStoragePoolRequest; @@ -601,6 +602,27 @@ public class HttpJsonStoragePoolsStub extends StoragePoolsStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/storagePools/{storage_pool}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/storagePools/{storage_pool}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/storagePools/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_DISKS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/storagePools/{storage_pool}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/storagePools/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/storagePools/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/storagePools/{storage_pool}"); + public static final HttpJsonStoragePoolsStub create(StoragePoolsStubSettings settings) throws IOException { return new HttpJsonStoragePoolsStub(settings, ClientContext.create(settings)); @@ -653,6 +675,13 @@ protected HttpJsonStoragePoolsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -666,6 +695,15 @@ protected HttpJsonStoragePoolsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "storage_pool", String.valueOf(request.getStoragePool())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -679,6 +717,15 @@ protected HttpJsonStoragePoolsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "storage_pool", String.valueOf(request.getStoragePool())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -692,6 +739,14 @@ protected HttpJsonStoragePoolsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -704,6 +759,13 @@ protected HttpJsonStoragePoolsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -716,6 +778,13 @@ protected HttpJsonStoragePoolsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listDisksTransportSettings = @@ -730,6 +799,15 @@ protected HttpJsonStoragePoolsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "storage_pool", String.valueOf(request.getStoragePool())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_DISKS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -743,6 +821,14 @@ protected HttpJsonStoragePoolsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -758,6 +844,15 @@ protected HttpJsonStoragePoolsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -771,6 +866,15 @@ protected HttpJsonStoragePoolsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "storage_pool", String.valueOf(request.getStoragePool())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSubnetworksStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSubnetworksStub.java index 4598a07d0205..f29644661551 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSubnetworksStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonSubnetworksStub.java @@ -34,6 +34,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListSubnetworksRequest; import com.google.cloud.compute.v1.DeleteSubnetworkRequest; import com.google.cloud.compute.v1.ExpandIpCidrRangeSubnetworkRequest; @@ -734,6 +735,31 @@ public class HttpJsonSubnetworksStub extends SubnetworksStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/subnetworks/{subnetwork}"); + private static final PathTemplate EXPAND_IP_CIDR_RANGE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/subnetworks/{subnetwork}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/subnetworks/{subnetwork}"); + private static final PathTemplate GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/subnetworks/{resource}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_USABLE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/subnetworks/{subnetwork}"); + private static final PathTemplate SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/subnetworks/{resource}"); + private static final PathTemplate SET_PRIVATE_IP_GOOGLE_ACCESS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/subnetworks/{subnetwork}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/subnetworks/{resource}"); + public static final HttpJsonSubnetworksStub create(SubnetworksStubSettings settings) throws IOException { return new HttpJsonSubnetworksStub(settings, ClientContext.create(settings)); @@ -786,6 +812,13 @@ protected HttpJsonSubnetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -799,6 +832,14 @@ protected HttpJsonSubnetworksStub( builder.add("subnetwork", String.valueOf(request.getSubnetwork())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("subnetwork", String.valueOf(request.getSubnetwork())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings expandIpCidrRangeTransportSettings = @@ -813,6 +854,16 @@ protected HttpJsonSubnetworksStub( builder.add("subnetwork", String.valueOf(request.getSubnetwork())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "subnetwork", String.valueOf(request.getSubnetwork())); + return EXPAND_IP_CIDR_RANGE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -826,6 +877,14 @@ protected HttpJsonSubnetworksStub( builder.add("subnetwork", String.valueOf(request.getSubnetwork())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("subnetwork", String.valueOf(request.getSubnetwork())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -839,6 +898,14 @@ protected HttpJsonSubnetworksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return GET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -851,6 +918,13 @@ protected HttpJsonSubnetworksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -863,6 +937,13 @@ protected HttpJsonSubnetworksStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listUsableTransportSettings = @@ -876,6 +957,12 @@ protected HttpJsonSubnetworksStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_USABLE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -889,6 +976,14 @@ protected HttpJsonSubnetworksStub( builder.add("subnetwork", String.valueOf(request.getSubnetwork())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("subnetwork", String.valueOf(request.getSubnetwork())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -902,6 +997,14 @@ protected HttpJsonSubnetworksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_IAM_POLICY_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setPrivateIpGoogleAccessTransportSettings = @@ -916,6 +1019,16 @@ protected HttpJsonSubnetworksStub( builder.add("subnetwork", String.valueOf(request.getSubnetwork())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "subnetwork", String.valueOf(request.getSubnetwork())); + return SET_PRIVATE_IP_GOOGLE_ACCESS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -931,6 +1044,15 @@ protected HttpJsonSubnetworksStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetGrpcProxiesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetGrpcProxiesStub.java index 092d928495aa..884006bc3297 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetGrpcProxiesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetGrpcProxiesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteTargetGrpcProxyRequest; import com.google.cloud.compute.v1.GetTargetGrpcProxyRequest; import com.google.cloud.compute.v1.InsertTargetGrpcProxyRequest; @@ -325,6 +326,17 @@ public class HttpJsonTargetGrpcProxiesStub extends TargetGrpcProxiesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetGrpcProxies/{target_grpc_proxy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetGrpcProxies/{target_grpc_proxy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetGrpcProxies/{target_grpc_proxy}"); + public static final HttpJsonTargetGrpcProxiesStub create(TargetGrpcProxiesStubSettings settings) throws IOException { return new HttpJsonTargetGrpcProxiesStub(settings, ClientContext.create(settings)); @@ -377,6 +389,14 @@ protected HttpJsonTargetGrpcProxiesStub( builder.add("target_grpc_proxy", String.valueOf(request.getTargetGrpcProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_grpc_proxy", String.valueOf(request.getTargetGrpcProxy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -389,6 +409,14 @@ protected HttpJsonTargetGrpcProxiesStub( builder.add("target_grpc_proxy", String.valueOf(request.getTargetGrpcProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_grpc_proxy", String.valueOf(request.getTargetGrpcProxy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -400,6 +428,12 @@ protected HttpJsonTargetGrpcProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -411,6 +445,12 @@ protected HttpJsonTargetGrpcProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -423,6 +463,14 @@ protected HttpJsonTargetGrpcProxiesStub( builder.add("target_grpc_proxy", String.valueOf(request.getTargetGrpcProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_grpc_proxy", String.valueOf(request.getTargetGrpcProxy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetHttpProxiesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetHttpProxiesStub.java index 6b299ba1ea71..05e93162403a 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetHttpProxiesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetHttpProxiesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListTargetHttpProxiesRequest; import com.google.cloud.compute.v1.DeleteTargetHttpProxyRequest; import com.google.cloud.compute.v1.GetTargetHttpProxyRequest; @@ -456,6 +457,21 @@ public class HttpJsonTargetHttpProxiesStub extends TargetHttpProxiesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetHttpProxies/{target_http_proxy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetHttpProxies/{target_http_proxy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetHttpProxies/{target_http_proxy}"); + private static final PathTemplate SET_URL_MAP_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/targetHttpProxies/{target_http_proxy}"); + public static final HttpJsonTargetHttpProxiesStub create(TargetHttpProxiesStubSettings settings) throws IOException { return new HttpJsonTargetHttpProxiesStub(settings, ClientContext.create(settings)); @@ -509,6 +525,13 @@ protected HttpJsonTargetHttpProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -521,6 +544,14 @@ protected HttpJsonTargetHttpProxiesStub( builder.add("target_http_proxy", String.valueOf(request.getTargetHttpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_http_proxy", String.valueOf(request.getTargetHttpProxy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -533,6 +564,14 @@ protected HttpJsonTargetHttpProxiesStub( builder.add("target_http_proxy", String.valueOf(request.getTargetHttpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_http_proxy", String.valueOf(request.getTargetHttpProxy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -544,6 +583,12 @@ protected HttpJsonTargetHttpProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -555,6 +600,12 @@ protected HttpJsonTargetHttpProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -567,6 +618,14 @@ protected HttpJsonTargetHttpProxiesStub( builder.add("target_http_proxy", String.valueOf(request.getTargetHttpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_http_proxy", String.valueOf(request.getTargetHttpProxy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setUrlMapTransportSettings = HttpJsonCallSettings.newBuilder() @@ -579,6 +638,14 @@ protected HttpJsonTargetHttpProxiesStub( builder.add("target_http_proxy", String.valueOf(request.getTargetHttpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_http_proxy", String.valueOf(request.getTargetHttpProxy())); + return SET_URL_MAP_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetHttpsProxiesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetHttpsProxiesStub.java index 479bdb7063bb..160ed38ba861 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetHttpsProxiesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetHttpsProxiesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListTargetHttpsProxiesRequest; import com.google.cloud.compute.v1.DeleteTargetHttpsProxyRequest; import com.google.cloud.compute.v1.GetTargetHttpsProxyRequest; @@ -704,6 +705,29 @@ public class HttpJsonTargetHttpsProxiesStub extends TargetHttpsProxiesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate SET_CERTIFICATE_MAP_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate SET_QUIC_OVERRIDE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate SET_SSL_CERTIFICATES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate SET_SSL_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetHttpsProxies/{target_https_proxy}"); + private static final PathTemplate SET_URL_MAP_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/targetHttpsProxies/{target_https_proxy}"); + public static final HttpJsonTargetHttpsProxiesStub create(TargetHttpsProxiesStubSettings settings) throws IOException { return new HttpJsonTargetHttpsProxiesStub(settings, ClientContext.create(settings)); @@ -758,6 +782,13 @@ protected HttpJsonTargetHttpsProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -770,6 +801,14 @@ protected HttpJsonTargetHttpsProxiesStub( builder.add("target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -782,6 +821,14 @@ protected HttpJsonTargetHttpsProxiesStub( builder.add("target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -793,6 +840,12 @@ protected HttpJsonTargetHttpsProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = @@ -805,6 +858,12 @@ protected HttpJsonTargetHttpsProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -817,6 +876,14 @@ protected HttpJsonTargetHttpsProxiesStub( builder.add("target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setCertificateMapTransportSettings = @@ -831,6 +898,15 @@ protected HttpJsonTargetHttpsProxiesStub( "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return SET_CERTIFICATE_MAP_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setQuicOverrideTransportSettings = @@ -845,6 +921,15 @@ protected HttpJsonTargetHttpsProxiesStub( "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return SET_QUIC_OVERRIDE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setSslCertificatesTransportSettings = @@ -859,6 +944,15 @@ protected HttpJsonTargetHttpsProxiesStub( "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return SET_SSL_CERTIFICATES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setSslPolicyTransportSettings = @@ -873,6 +967,15 @@ protected HttpJsonTargetHttpsProxiesStub( "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return SET_SSL_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setUrlMapTransportSettings = HttpJsonCallSettings.newBuilder() @@ -885,6 +988,14 @@ protected HttpJsonTargetHttpsProxiesStub( builder.add("target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_https_proxy", String.valueOf(request.getTargetHttpsProxy())); + return SET_URL_MAP_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetInstancesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetInstancesStub.java index ac4e791ed559..d9d5b678187f 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetInstancesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetInstancesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListTargetInstancesRequest; import com.google.cloud.compute.v1.DeleteTargetInstanceRequest; import com.google.cloud.compute.v1.GetTargetInstanceRequest; @@ -452,6 +453,21 @@ public class HttpJsonTargetInstancesStub extends TargetInstancesStub { private final HttpJsonZoneOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/targetInstances/{target_instance}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/targetInstances/{target_instance}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/targetInstances/{target_instance}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/targetInstances/{resource}"); + public static final HttpJsonTargetInstancesStub create(TargetInstancesStubSettings settings) throws IOException { return new HttpJsonTargetInstancesStub(settings, ClientContext.create(settings)); @@ -504,6 +520,13 @@ protected HttpJsonTargetInstancesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -517,6 +540,15 @@ protected HttpJsonTargetInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_instance", String.valueOf(request.getTargetInstance())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -530,6 +562,15 @@ protected HttpJsonTargetInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_instance", String.valueOf(request.getTargetInstance())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -542,6 +583,13 @@ protected HttpJsonTargetInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -554,6 +602,13 @@ protected HttpJsonTargetInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setSecurityPolicyTransportSettings = @@ -568,6 +623,16 @@ protected HttpJsonTargetInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_instance", String.valueOf(request.getTargetInstance())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -583,6 +648,15 @@ protected HttpJsonTargetInstancesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetPoolsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetPoolsStub.java index 2ea11e5778d4..c5e34c42524f 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetPoolsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetPoolsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AddHealthCheckTargetPoolRequest; import com.google.cloud.compute.v1.AddInstanceTargetPoolRequest; import com.google.cloud.compute.v1.AggregatedListTargetPoolsRequest; @@ -801,6 +802,33 @@ public class HttpJsonTargetPoolsStub extends TargetPoolsStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate ADD_HEALTH_CHECK_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{target_pool}"); + private static final PathTemplate ADD_INSTANCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{target_pool}"); + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{target_pool}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{target_pool}"); + private static final PathTemplate GET_HEALTH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{target_pool}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate REMOVE_HEALTH_CHECK_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{target_pool}"); + private static final PathTemplate REMOVE_INSTANCE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{target_pool}"); + private static final PathTemplate SET_BACKUP_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{target_pool}"); + private static final PathTemplate SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{target_pool}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetPools/{resource}"); + public static final HttpJsonTargetPoolsStub create(TargetPoolsStubSettings settings) throws IOException { return new HttpJsonTargetPoolsStub(settings, ClientContext.create(settings)); @@ -854,6 +882,16 @@ protected HttpJsonTargetPoolsStub( builder.add("target_pool", String.valueOf(request.getTargetPool())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_pool", String.valueOf(request.getTargetPool())); + return ADD_HEALTH_CHECK_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings addInstanceTransportSettings = HttpJsonCallSettings.newBuilder() @@ -867,6 +905,14 @@ protected HttpJsonTargetPoolsStub( builder.add("target_pool", String.valueOf(request.getTargetPool())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("target_pool", String.valueOf(request.getTargetPool())); + return ADD_INSTANCE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings aggregatedListTransportSettings = @@ -880,6 +926,13 @@ protected HttpJsonTargetPoolsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -893,6 +946,14 @@ protected HttpJsonTargetPoolsStub( builder.add("target_pool", String.valueOf(request.getTargetPool())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("target_pool", String.valueOf(request.getTargetPool())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -906,6 +967,14 @@ protected HttpJsonTargetPoolsStub( builder.add("target_pool", String.valueOf(request.getTargetPool())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("target_pool", String.valueOf(request.getTargetPool())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getHealthTransportSettings = @@ -920,6 +989,15 @@ protected HttpJsonTargetPoolsStub( builder.add("target_pool", String.valueOf(request.getTargetPool())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_pool", String.valueOf(request.getTargetPool())); + return GET_HEALTH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -932,6 +1010,13 @@ protected HttpJsonTargetPoolsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -944,6 +1029,13 @@ protected HttpJsonTargetPoolsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings removeHealthCheckTransportSettings = @@ -958,6 +1050,16 @@ protected HttpJsonTargetPoolsStub( builder.add("target_pool", String.valueOf(request.getTargetPool())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_pool", String.valueOf(request.getTargetPool())); + return REMOVE_HEALTH_CHECK_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings removeInstanceTransportSettings = @@ -972,6 +1074,16 @@ protected HttpJsonTargetPoolsStub( builder.add("target_pool", String.valueOf(request.getTargetPool())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_pool", String.valueOf(request.getTargetPool())); + return REMOVE_INSTANCE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setBackupTransportSettings = HttpJsonCallSettings.newBuilder() @@ -985,6 +1097,14 @@ protected HttpJsonTargetPoolsStub( builder.add("target_pool", String.valueOf(request.getTargetPool())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("target_pool", String.valueOf(request.getTargetPool())); + return SET_BACKUP_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setSecurityPolicyTransportSettings = @@ -999,6 +1119,16 @@ protected HttpJsonTargetPoolsStub( builder.add("target_pool", String.valueOf(request.getTargetPool())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_pool", String.valueOf(request.getTargetPool())); + return SET_SECURITY_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -1014,6 +1144,15 @@ protected HttpJsonTargetPoolsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.addHealthCheckCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetSslProxiesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetSslProxiesStub.java index b3d1f0c67f51..4b579b19ab55 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetSslProxiesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetSslProxiesStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteTargetSslProxyRequest; import com.google.cloud.compute.v1.GetTargetSslProxyRequest; import com.google.cloud.compute.v1.InsertTargetSslProxyRequest; @@ -616,6 +617,27 @@ public class HttpJsonTargetSslProxiesStub extends TargetSslProxiesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetSslProxies/{target_ssl_proxy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetSslProxies/{target_ssl_proxy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_BACKEND_SERVICE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetSslProxies/{target_ssl_proxy}"); + private static final PathTemplate SET_CERTIFICATE_MAP_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetSslProxies/{target_ssl_proxy}"); + private static final PathTemplate SET_PROXY_HEADER_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetSslProxies/{target_ssl_proxy}"); + private static final PathTemplate SET_SSL_CERTIFICATES_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetSslProxies/{target_ssl_proxy}"); + private static final PathTemplate SET_SSL_POLICY_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetSslProxies/{target_ssl_proxy}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetSslProxies/{resource}"); + public static final HttpJsonTargetSslProxiesStub create(TargetSslProxiesStubSettings settings) throws IOException { return new HttpJsonTargetSslProxiesStub(settings, ClientContext.create(settings)); @@ -668,6 +690,14 @@ protected HttpJsonTargetSslProxiesStub( builder.add("target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -680,6 +710,14 @@ protected HttpJsonTargetSslProxiesStub( builder.add("target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -691,6 +729,12 @@ protected HttpJsonTargetSslProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -702,6 +746,12 @@ protected HttpJsonTargetSslProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setBackendServiceTransportSettings = @@ -715,6 +765,15 @@ protected HttpJsonTargetSslProxiesStub( builder.add("target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); + return SET_BACKEND_SERVICE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setCertificateMapTransportSettings = @@ -728,6 +787,15 @@ protected HttpJsonTargetSslProxiesStub( builder.add("target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); + return SET_CERTIFICATE_MAP_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setProxyHeaderTransportSettings = @@ -741,6 +809,15 @@ protected HttpJsonTargetSslProxiesStub( builder.add("target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); + return SET_PROXY_HEADER_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setSslCertificatesTransportSettings = @@ -754,6 +831,15 @@ protected HttpJsonTargetSslProxiesStub( builder.add("target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); + return SET_SSL_CERTIFICATES_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setSslPolicyTransportSettings = @@ -767,6 +853,15 @@ protected HttpJsonTargetSslProxiesStub( builder.add("target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_ssl_proxy", String.valueOf(request.getTargetSslProxy())); + return SET_SSL_POLICY_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -781,6 +876,14 @@ protected HttpJsonTargetSslProxiesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetTcpProxiesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetTcpProxiesStub.java index 52e18ef2de28..7dadd651311e 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetTcpProxiesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetTcpProxiesStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListTargetTcpProxiesRequest; import com.google.cloud.compute.v1.DeleteTargetTcpProxyRequest; import com.google.cloud.compute.v1.GetTargetTcpProxyRequest; @@ -504,6 +505,23 @@ public class HttpJsonTargetTcpProxiesStub extends TargetTcpProxiesStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetTcpProxies/{target_tcp_proxy}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetTcpProxies/{target_tcp_proxy}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate SET_BACKEND_SERVICE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetTcpProxies/{target_tcp_proxy}"); + private static final PathTemplate SET_PROXY_HEADER_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetTcpProxies/{target_tcp_proxy}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/targetTcpProxies/{resource}"); + public static final HttpJsonTargetTcpProxiesStub create(TargetTcpProxiesStubSettings settings) throws IOException { return new HttpJsonTargetTcpProxiesStub(settings, ClientContext.create(settings)); @@ -557,6 +575,13 @@ protected HttpJsonTargetTcpProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -569,6 +594,14 @@ protected HttpJsonTargetTcpProxiesStub( builder.add("target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -581,6 +614,14 @@ protected HttpJsonTargetTcpProxiesStub( builder.add("target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -592,6 +633,12 @@ protected HttpJsonTargetTcpProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -603,6 +650,12 @@ protected HttpJsonTargetTcpProxiesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setBackendServiceTransportSettings = @@ -616,6 +669,15 @@ protected HttpJsonTargetTcpProxiesStub( builder.add("target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); + return SET_BACKEND_SERVICE_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings setProxyHeaderTransportSettings = @@ -629,6 +691,15 @@ protected HttpJsonTargetTcpProxiesStub( builder.add("target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put( + "target_tcp_proxy", String.valueOf(request.getTargetTcpProxy())); + return SET_PROXY_HEADER_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -643,6 +714,14 @@ protected HttpJsonTargetTcpProxiesStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetVpnGatewaysStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetVpnGatewaysStub.java index e7eec7241ee4..9a04e3b5520e 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetVpnGatewaysStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonTargetVpnGatewaysStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListTargetVpnGatewaysRequest; import com.google.cloud.compute.v1.DeleteTargetVpnGatewayRequest; import com.google.cloud.compute.v1.GetTargetVpnGatewayRequest; @@ -404,6 +405,21 @@ public class HttpJsonTargetVpnGatewaysStub extends TargetVpnGatewaysStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetVpnGateways/{target_vpn_gateway}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/regions/{region}/targetVpnGateways/{target_vpn_gateway}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/targetVpnGateways/{resource}"); + public static final HttpJsonTargetVpnGatewaysStub create(TargetVpnGatewaysStubSettings settings) throws IOException { return new HttpJsonTargetVpnGatewaysStub(settings, ClientContext.create(settings)); @@ -458,6 +474,13 @@ protected HttpJsonTargetVpnGatewaysStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -471,6 +494,15 @@ protected HttpJsonTargetVpnGatewaysStub( builder.add("target_vpn_gateway", String.valueOf(request.getTargetVpnGateway())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_vpn_gateway", String.valueOf(request.getTargetVpnGateway())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -484,6 +516,15 @@ protected HttpJsonTargetVpnGatewaysStub( builder.add("target_vpn_gateway", String.valueOf(request.getTargetVpnGateway())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "target_vpn_gateway", String.valueOf(request.getTargetVpnGateway())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -496,6 +537,13 @@ protected HttpJsonTargetVpnGatewaysStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -508,6 +556,13 @@ protected HttpJsonTargetVpnGatewaysStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -521,6 +576,14 @@ protected HttpJsonTargetVpnGatewaysStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonUrlMapsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonUrlMapsStub.java index 46d985041958..59f17179801f 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonUrlMapsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonUrlMapsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListUrlMapsRequest; import com.google.cloud.compute.v1.DeleteUrlMapRequest; import com.google.cloud.compute.v1.GetUrlMapRequest; @@ -577,6 +578,27 @@ public class HttpJsonUrlMapsStub extends UrlMapsStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/urlMaps/{url_map}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/urlMaps/{url_map}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate INVALIDATE_CACHE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/urlMaps/{url_map}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/urlMaps/{url_map}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/urlMaps/{resource}"); + private static final PathTemplate UPDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/urlMaps/{url_map}"); + private static final PathTemplate VALIDATE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/urlMaps/{url_map}"); + public static final HttpJsonUrlMapsStub create(UrlMapsStubSettings settings) throws IOException { return new HttpJsonUrlMapsStub(settings, ClientContext.create(settings)); } @@ -626,6 +648,13 @@ protected HttpJsonUrlMapsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -638,6 +667,13 @@ protected HttpJsonUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -650,6 +686,13 @@ protected HttpJsonUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -661,6 +704,12 @@ protected HttpJsonUrlMapsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings invalidateCacheTransportSettings = HttpJsonCallSettings.newBuilder() @@ -673,6 +722,13 @@ protected HttpJsonUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return INVALIDATE_CACHE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -684,6 +740,12 @@ protected HttpJsonUrlMapsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -696,6 +758,13 @@ protected HttpJsonUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -710,6 +779,14 @@ protected HttpJsonUrlMapsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings updateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -722,6 +799,13 @@ protected HttpJsonUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return UPDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings validateTransportSettings = HttpJsonCallSettings.newBuilder() @@ -734,6 +818,13 @@ protected HttpJsonUrlMapsStub( builder.add("url_map", String.valueOf(request.getUrlMap())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("url_map", String.valueOf(request.getUrlMap())); + return VALIDATE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonVpnGatewaysStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonVpnGatewaysStub.java index 0aa6a7169070..8393bba72cd5 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonVpnGatewaysStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonVpnGatewaysStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListVpnGatewaysRequest; import com.google.cloud.compute.v1.DeleteVpnGatewayRequest; import com.google.cloud.compute.v1.GetStatusVpnGatewayRequest; @@ -484,6 +485,23 @@ public class HttpJsonVpnGatewaysStub extends VpnGatewaysStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/vpnGateways/{vpn_gateway}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/vpnGateways/{vpn_gateway}"); + private static final PathTemplate GET_STATUS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/vpnGateways/{vpn_gateway}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/vpnGateways/{resource}"); + private static final PathTemplate TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/vpnGateways/{resource}"); + public static final HttpJsonVpnGatewaysStub create(VpnGatewaysStubSettings settings) throws IOException { return new HttpJsonVpnGatewaysStub(settings, ClientContext.create(settings)); @@ -536,6 +554,13 @@ protected HttpJsonVpnGatewaysStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -549,6 +574,14 @@ protected HttpJsonVpnGatewaysStub( builder.add("vpn_gateway", String.valueOf(request.getVpnGateway())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("vpn_gateway", String.valueOf(request.getVpnGateway())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -562,6 +595,14 @@ protected HttpJsonVpnGatewaysStub( builder.add("vpn_gateway", String.valueOf(request.getVpnGateway())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("vpn_gateway", String.valueOf(request.getVpnGateway())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getStatusTransportSettings = @@ -577,6 +618,15 @@ protected HttpJsonVpnGatewaysStub( builder.add("vpn_gateway", String.valueOf(request.getVpnGateway())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put( + "vpn_gateway", String.valueOf(request.getVpnGateway())); + return GET_STATUS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -589,6 +639,13 @@ protected HttpJsonVpnGatewaysStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -601,6 +658,13 @@ protected HttpJsonVpnGatewaysStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -614,6 +678,14 @@ protected HttpJsonVpnGatewaysStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -629,6 +701,15 @@ protected HttpJsonVpnGatewaysStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return TEST_IAM_PERMISSIONS_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonVpnTunnelsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonVpnTunnelsStub.java index fa05696d4d4e..b7a087f4fdc6 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonVpnTunnelsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonVpnTunnelsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.AggregatedListVpnTunnelsRequest; import com.google.cloud.compute.v1.DeleteVpnTunnelRequest; import com.google.cloud.compute.v1.GetVpnTunnelRequest; @@ -396,6 +397,19 @@ public class HttpJsonVpnTunnelsStub extends VpnTunnelsStub { private final HttpJsonRegionOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/vpnTunnels/{vpn_tunnel}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/vpnTunnels/{vpn_tunnel}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}"); + private static final PathTemplate SET_LABELS_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/regions/{region}/vpnTunnels/{resource}"); + public static final HttpJsonVpnTunnelsStub create(VpnTunnelsStubSettings settings) throws IOException { return new HttpJsonVpnTunnelsStub(settings, ClientContext.create(settings)); @@ -448,6 +462,13 @@ protected HttpJsonVpnTunnelsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return AGGREGATED_LIST_RESOURCE_NAME_TEMPLATE.instantiate( + resourceNameSegments); + }) .build(); HttpJsonCallSettings deleteTransportSettings = HttpJsonCallSettings.newBuilder() @@ -461,6 +482,14 @@ protected HttpJsonVpnTunnelsStub( builder.add("vpn_tunnel", String.valueOf(request.getVpnTunnel())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("vpn_tunnel", String.valueOf(request.getVpnTunnel())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -474,6 +503,14 @@ protected HttpJsonVpnTunnelsStub( builder.add("vpn_tunnel", String.valueOf(request.getVpnTunnel())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("vpn_tunnel", String.valueOf(request.getVpnTunnel())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -486,6 +523,13 @@ protected HttpJsonVpnTunnelsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -498,6 +542,13 @@ protected HttpJsonVpnTunnelsStub( builder.add("region", String.valueOf(request.getRegion())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings setLabelsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -511,6 +562,14 @@ protected HttpJsonVpnTunnelsStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("region", String.valueOf(request.getRegion())); + resourceNameSegments.put("resource", String.valueOf(request.getResource())); + return SET_LABELS_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.aggregatedListCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonWireGroupsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonWireGroupsStub.java index de209744cb85..147ccfc8a123 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonWireGroupsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonWireGroupsStub.java @@ -32,6 +32,7 @@ import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteWireGroupRequest; import com.google.cloud.compute.v1.GetWireGroupRequest; import com.google.cloud.compute.v1.InsertWireGroupRequest; @@ -336,6 +337,20 @@ public class HttpJsonWireGroupsStub extends WireGroupsStub { private final HttpJsonGlobalOperationsStub httpJsonOperationsStub; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/crossSiteNetworks/{cross_site_network}/wireGroups/{wire_group}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/crossSiteNetworks/{cross_site_network}/wireGroups/{wire_group}"); + private static final PathTemplate INSERT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/crossSiteNetworks/{cross_site_network}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/global/crossSiteNetworks/{cross_site_network}"); + private static final PathTemplate PATCH_RESOURCE_NAME_TEMPLATE = + PathTemplate.create( + "projects/{project}/global/crossSiteNetworks/{cross_site_network}/wireGroups/{wire_group}"); + public static final HttpJsonWireGroupsStub create(WireGroupsStubSettings settings) throws IOException { return new HttpJsonWireGroupsStub(settings, ClientContext.create(settings)); @@ -388,6 +403,15 @@ protected HttpJsonWireGroupsStub( builder.add("wire_group", String.valueOf(request.getWireGroup())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "cross_site_network", String.valueOf(request.getCrossSiteNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("wire_group", String.valueOf(request.getWireGroup())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -401,6 +425,15 @@ protected HttpJsonWireGroupsStub( builder.add("wire_group", String.valueOf(request.getWireGroup())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "cross_site_network", String.valueOf(request.getCrossSiteNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("wire_group", String.valueOf(request.getWireGroup())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings insertTransportSettings = HttpJsonCallSettings.newBuilder() @@ -413,6 +446,14 @@ protected HttpJsonWireGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "cross_site_network", String.valueOf(request.getCrossSiteNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return INSERT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -425,6 +466,14 @@ protected HttpJsonWireGroupsStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "cross_site_network", String.valueOf(request.getCrossSiteNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings patchTransportSettings = HttpJsonCallSettings.newBuilder() @@ -438,6 +487,15 @@ protected HttpJsonWireGroupsStub( builder.add("wire_group", String.valueOf(request.getWireGroup())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put( + "cross_site_network", String.valueOf(request.getCrossSiteNetwork())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("wire_group", String.valueOf(request.getWireGroup())); + return PATCH_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonZoneOperationsStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonZoneOperationsStub.java index 135c8d4ce6fd..494c3a4665c7 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonZoneOperationsStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonZoneOperationsStub.java @@ -33,6 +33,7 @@ import com.google.api.gax.rpc.LongRunningClient; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.DeleteZoneOperationRequest; import com.google.cloud.compute.v1.DeleteZoneOperationResponse; import com.google.cloud.compute.v1.GetZoneOperationRequest; @@ -249,6 +250,15 @@ public class HttpJsonZoneOperationsStub extends ZoneOperationsStub { private final LongRunningClient longRunningClient; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate DELETE_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/operations/{operation}"); + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/operations/{operation}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate WAIT_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}/operations/{operation}"); + public static final HttpJsonZoneOperationsStub create(ZoneOperationsStubSettings settings) throws IOException { return new HttpJsonZoneOperationsStub(settings, ClientContext.create(settings)); @@ -302,6 +312,14 @@ protected HttpJsonZoneOperationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return DELETE_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings getTransportSettings = HttpJsonCallSettings.newBuilder() @@ -315,6 +333,14 @@ protected HttpJsonZoneOperationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -327,6 +353,13 @@ protected HttpJsonZoneOperationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings waitTransportSettings = HttpJsonCallSettings.newBuilder() @@ -340,6 +373,14 @@ protected HttpJsonZoneOperationsStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("operation", String.valueOf(request.getOperation())); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return WAIT_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.deleteCallable = diff --git a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonZonesStub.java b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonZonesStub.java index 269dba1b7427..b62cf2ac3092 100644 --- a/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonZonesStub.java +++ b/java-compute/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/stub/HttpJsonZonesStub.java @@ -30,6 +30,7 @@ import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.compute.v1.GetZoneRequest; import com.google.cloud.compute.v1.ListZonesRequest; import com.google.cloud.compute.v1.Zone; @@ -141,6 +142,11 @@ public class HttpJsonZonesStub extends ZonesStub { private final BackgroundResource backgroundResources; private final HttpJsonStubCallableFactory callableFactory; + private static final PathTemplate GET_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}/zones/{zone}"); + private static final PathTemplate LIST_RESOURCE_NAME_TEMPLATE = + PathTemplate.create("projects/{project}"); + public static final HttpJsonZonesStub create(ZonesStubSettings settings) throws IOException { return new HttpJsonZonesStub(settings, ClientContext.create(settings)); } @@ -188,6 +194,13 @@ protected HttpJsonZonesStub( builder.add("zone", String.valueOf(request.getZone())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + resourceNameSegments.put("zone", String.valueOf(request.getZone())); + return GET_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); HttpJsonCallSettings listTransportSettings = HttpJsonCallSettings.newBuilder() @@ -199,6 +212,12 @@ protected HttpJsonZonesStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor( + request -> { + Map resourceNameSegments = new HashMap(); + resourceNameSegments.put("project", String.valueOf(request.getProject())); + return LIST_RESOURCE_NAME_TEMPLATE.instantiate(resourceNameSegments); + }) .build(); this.getCallable = diff --git a/java-dlp/google-cloud-dlp/src/main/resources/META-INF/native-image/com.google.cloud.dlp.v2/reflect-config.json b/java-dlp/google-cloud-dlp/src/main/resources/META-INF/native-image/com.google.cloud.dlp.v2/reflect-config.json index 78beca5cae86..199859dcbdaf 100644 --- a/java-dlp/google-cloud-dlp/src/main/resources/META-INF/native-image/com.google.cloud.dlp.v2/reflect-config.json +++ b/java-dlp/google-cloud-dlp/src/main/resources/META-INF/native-image/com.google.cloud.dlp.v2/reflect-config.json @@ -1889,6 +1889,24 @@ "allDeclaredClasses": true, "allPublicClasses": true }, + { + "name": "com.google.privacy.dlp.v2.ContentMetadata", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.privacy.dlp.v2.ContentMetadata$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, { "name": "com.google.privacy.dlp.v2.ContentOption", "queryAllDeclaredConstructors": true, @@ -5219,6 +5237,24 @@ "allDeclaredClasses": true, "allPublicClasses": true }, + { + "name": "com.google.privacy.dlp.v2.KeyValueMetadataProperty", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "com.google.privacy.dlp.v2.KeyValueMetadataProperty$Builder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, { "name": "com.google.privacy.dlp.v2.KindExpression", "queryAllDeclaredConstructors": true, diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java index b11d6b826814..1b5238eb3cc9 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java @@ -6731,7 +6731,7 @@ public com.google.privacy.dlp.v2.Action.PublishSummaryToCscc getPublishSummaryTo * * * @deprecated google.privacy.dlp.v2.Action.publish_findings_to_cloud_data_catalog is deprecated. - * See google/privacy/dlp/v2/dlp.proto;l=4543 + * See google/privacy/dlp/v2/dlp.proto;l=4561 * @return Whether the publishFindingsToCloudDataCatalog field is set. */ @java.lang.Override @@ -6754,7 +6754,7 @@ public boolean hasPublishFindingsToCloudDataCatalog() { * * * @deprecated google.privacy.dlp.v2.Action.publish_findings_to_cloud_data_catalog is deprecated. - * See google/privacy/dlp/v2/dlp.proto;l=4543 + * See google/privacy/dlp/v2/dlp.proto;l=4561 * @return The publishFindingsToCloudDataCatalog. */ @java.lang.Override @@ -8291,7 +8291,7 @@ public Builder clearPublishSummaryToCscc() { * * * @deprecated google.privacy.dlp.v2.Action.publish_findings_to_cloud_data_catalog is - * deprecated. See google/privacy/dlp/v2/dlp.proto;l=4543 + * deprecated. See google/privacy/dlp/v2/dlp.proto;l=4561 * @return Whether the publishFindingsToCloudDataCatalog field is set. */ @java.lang.Override @@ -8314,7 +8314,7 @@ public boolean hasPublishFindingsToCloudDataCatalog() { * * * @deprecated google.privacy.dlp.v2.Action.publish_findings_to_cloud_data_catalog is - * deprecated. See google/privacy/dlp/v2/dlp.proto;l=4543 + * deprecated. See google/privacy/dlp/v2/dlp.proto;l=4561 * @return The publishFindingsToCloudDataCatalog. */ @java.lang.Override diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActionOrBuilder.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActionOrBuilder.java index 8fa061b3da7c..22305b8e8935 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActionOrBuilder.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActionOrBuilder.java @@ -151,7 +151,7 @@ public interface ActionOrBuilder * * * @deprecated google.privacy.dlp.v2.Action.publish_findings_to_cloud_data_catalog is deprecated. - * See google/privacy/dlp/v2/dlp.proto;l=4543 + * See google/privacy/dlp/v2/dlp.proto;l=4561 * @return Whether the publishFindingsToCloudDataCatalog field is set. */ @java.lang.Deprecated @@ -171,7 +171,7 @@ public interface ActionOrBuilder * * * @deprecated google.privacy.dlp.v2.Action.publish_findings_to_cloud_data_catalog is deprecated. - * See google/privacy/dlp/v2/dlp.proto;l=4543 + * See google/privacy/dlp/v2/dlp.proto;l=4561 * @return The publishFindingsToCloudDataCatalog. */ @java.lang.Deprecated diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java index 456f9b3e7636..99c037c43d72 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java @@ -68,6 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.privacy.dlp.v2.ContentItem.Builder.class); } + private int bitField0_; private int dataItemCase_ = 0; @SuppressWarnings("serial") @@ -308,6 +309,59 @@ public com.google.privacy.dlp.v2.ByteContentItemOrBuilder getByteItemOrBuilder() return com.google.privacy.dlp.v2.ByteContentItem.getDefaultInstance(); } + public static final int CONTENT_METADATA_FIELD_NUMBER = 6; + private com.google.privacy.dlp.v2.ContentMetadata contentMetadata_; + + /** + * + * + *
+   * User provided metadata for the content.
+   * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + * + * @return Whether the contentMetadata field is set. + */ + @java.lang.Override + public boolean hasContentMetadata() { + return ((bitField0_ & 0x00000001) != 0); + } + + /** + * + * + *
+   * User provided metadata for the content.
+   * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + * + * @return The contentMetadata. + */ + @java.lang.Override + public com.google.privacy.dlp.v2.ContentMetadata getContentMetadata() { + return contentMetadata_ == null + ? com.google.privacy.dlp.v2.ContentMetadata.getDefaultInstance() + : contentMetadata_; + } + + /** + * + * + *
+   * User provided metadata for the content.
+   * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + */ + @java.lang.Override + public com.google.privacy.dlp.v2.ContentMetadataOrBuilder getContentMetadataOrBuilder() { + return contentMetadata_ == null + ? com.google.privacy.dlp.v2.ContentMetadata.getDefaultInstance() + : contentMetadata_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -331,6 +385,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (dataItemCase_ == 5) { output.writeMessage(5, (com.google.privacy.dlp.v2.ByteContentItem) dataItem_); } + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(6, getContentMetadata()); + } getUnknownFields().writeTo(output); } @@ -353,6 +410,9 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 5, (com.google.privacy.dlp.v2.ByteContentItem) dataItem_); } + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getContentMetadata()); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -368,6 +428,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.ContentItem other = (com.google.privacy.dlp.v2.ContentItem) obj; + if (hasContentMetadata() != other.hasContentMetadata()) return false; + if (hasContentMetadata()) { + if (!getContentMetadata().equals(other.getContentMetadata())) return false; + } if (!getDataItemCase().equals(other.getDataItemCase())) return false; switch (dataItemCase_) { case 3: @@ -393,6 +457,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (hasContentMetadata()) { + hash = (37 * hash) + CONTENT_METADATA_FIELD_NUMBER; + hash = (53 * hash) + getContentMetadata().hashCode(); + } switch (dataItemCase_) { case 3: hash = (37 * hash) + VALUE_FIELD_NUMBER; @@ -538,10 +606,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.privacy.dlp.v2.ContentItem.newBuilder() - private Builder() {} + private Builder() { + maybeForceBuilderInitialization(); + } private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); + maybeForceBuilderInitialization(); + } + + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + internalGetContentMetadataFieldBuilder(); + } } @java.lang.Override @@ -554,6 +631,11 @@ public Builder clear() { if (byteItemBuilder_ != null) { byteItemBuilder_.clear(); } + contentMetadata_ = null; + if (contentMetadataBuilder_ != null) { + contentMetadataBuilder_.dispose(); + contentMetadataBuilder_ = null; + } dataItemCase_ = 0; dataItem_ = null; return this; @@ -593,6 +675,13 @@ public com.google.privacy.dlp.v2.ContentItem buildPartial() { private void buildPartial0(com.google.privacy.dlp.v2.ContentItem result) { int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000008) != 0)) { + result.contentMetadata_ = + contentMetadataBuilder_ == null ? contentMetadata_ : contentMetadataBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + result.bitField0_ |= to_bitField0_; } private void buildPartialOneofs(com.google.privacy.dlp.v2.ContentItem result) { @@ -618,6 +707,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.privacy.dlp.v2.ContentItem other) { if (other == com.google.privacy.dlp.v2.ContentItem.getDefaultInstance()) return this; + if (other.hasContentMetadata()) { + mergeContentMetadata(other.getContentMetadata()); + } switch (other.getDataItemCase()) { case VALUE: { @@ -687,6 +779,13 @@ public Builder mergeFrom( dataItemCase_ = 5; break; } // case 42 + case 50: + { + input.readMessage( + internalGetContentMetadataFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000008; + break; + } // case 50 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -1309,6 +1408,201 @@ public com.google.privacy.dlp.v2.ByteContentItemOrBuilder getByteItemOrBuilder() return byteItemBuilder_; } + private com.google.privacy.dlp.v2.ContentMetadata contentMetadata_; + private com.google.protobuf.SingleFieldBuilder< + com.google.privacy.dlp.v2.ContentMetadata, + com.google.privacy.dlp.v2.ContentMetadata.Builder, + com.google.privacy.dlp.v2.ContentMetadataOrBuilder> + contentMetadataBuilder_; + + /** + * + * + *
+     * User provided metadata for the content.
+     * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + * + * @return Whether the contentMetadata field is set. + */ + public boolean hasContentMetadata() { + return ((bitField0_ & 0x00000008) != 0); + } + + /** + * + * + *
+     * User provided metadata for the content.
+     * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + * + * @return The contentMetadata. + */ + public com.google.privacy.dlp.v2.ContentMetadata getContentMetadata() { + if (contentMetadataBuilder_ == null) { + return contentMetadata_ == null + ? com.google.privacy.dlp.v2.ContentMetadata.getDefaultInstance() + : contentMetadata_; + } else { + return contentMetadataBuilder_.getMessage(); + } + } + + /** + * + * + *
+     * User provided metadata for the content.
+     * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + */ + public Builder setContentMetadata(com.google.privacy.dlp.v2.ContentMetadata value) { + if (contentMetadataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + contentMetadata_ = value; + } else { + contentMetadataBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + + /** + * + * + *
+     * User provided metadata for the content.
+     * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + */ + public Builder setContentMetadata( + com.google.privacy.dlp.v2.ContentMetadata.Builder builderForValue) { + if (contentMetadataBuilder_ == null) { + contentMetadata_ = builderForValue.build(); + } else { + contentMetadataBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + + /** + * + * + *
+     * User provided metadata for the content.
+     * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + */ + public Builder mergeContentMetadata(com.google.privacy.dlp.v2.ContentMetadata value) { + if (contentMetadataBuilder_ == null) { + if (((bitField0_ & 0x00000008) != 0) + && contentMetadata_ != null + && contentMetadata_ != com.google.privacy.dlp.v2.ContentMetadata.getDefaultInstance()) { + getContentMetadataBuilder().mergeFrom(value); + } else { + contentMetadata_ = value; + } + } else { + contentMetadataBuilder_.mergeFrom(value); + } + if (contentMetadata_ != null) { + bitField0_ |= 0x00000008; + onChanged(); + } + return this; + } + + /** + * + * + *
+     * User provided metadata for the content.
+     * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + */ + public Builder clearContentMetadata() { + bitField0_ = (bitField0_ & ~0x00000008); + contentMetadata_ = null; + if (contentMetadataBuilder_ != null) { + contentMetadataBuilder_.dispose(); + contentMetadataBuilder_ = null; + } + onChanged(); + return this; + } + + /** + * + * + *
+     * User provided metadata for the content.
+     * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + */ + public com.google.privacy.dlp.v2.ContentMetadata.Builder getContentMetadataBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return internalGetContentMetadataFieldBuilder().getBuilder(); + } + + /** + * + * + *
+     * User provided metadata for the content.
+     * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + */ + public com.google.privacy.dlp.v2.ContentMetadataOrBuilder getContentMetadataOrBuilder() { + if (contentMetadataBuilder_ != null) { + return contentMetadataBuilder_.getMessageOrBuilder(); + } else { + return contentMetadata_ == null + ? com.google.privacy.dlp.v2.ContentMetadata.getDefaultInstance() + : contentMetadata_; + } + } + + /** + * + * + *
+     * User provided metadata for the content.
+     * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + */ + private com.google.protobuf.SingleFieldBuilder< + com.google.privacy.dlp.v2.ContentMetadata, + com.google.privacy.dlp.v2.ContentMetadata.Builder, + com.google.privacy.dlp.v2.ContentMetadataOrBuilder> + internalGetContentMetadataFieldBuilder() { + if (contentMetadataBuilder_ == null) { + contentMetadataBuilder_ = + new com.google.protobuf.SingleFieldBuilder< + com.google.privacy.dlp.v2.ContentMetadata, + com.google.privacy.dlp.v2.ContentMetadata.Builder, + com.google.privacy.dlp.v2.ContentMetadataOrBuilder>( + getContentMetadata(), getParentForChildren(), isClean()); + contentMetadata_ = null; + } + return contentMetadataBuilder_; + } + // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2.ContentItem) } diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItemOrBuilder.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItemOrBuilder.java index 6d0434d8bfe8..8a2f68f70521 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItemOrBuilder.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItemOrBuilder.java @@ -145,5 +145,42 @@ public interface ContentItemOrBuilder */ com.google.privacy.dlp.v2.ByteContentItemOrBuilder getByteItemOrBuilder(); + /** + * + * + *
+   * User provided metadata for the content.
+   * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + * + * @return Whether the contentMetadata field is set. + */ + boolean hasContentMetadata(); + + /** + * + * + *
+   * User provided metadata for the content.
+   * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + * + * @return The contentMetadata. + */ + com.google.privacy.dlp.v2.ContentMetadata getContentMetadata(); + + /** + * + * + *
+   * User provided metadata for the content.
+   * 
+ * + * .google.privacy.dlp.v2.ContentMetadata content_metadata = 6; + */ + com.google.privacy.dlp.v2.ContentMetadataOrBuilder getContentMetadataOrBuilder(); + com.google.privacy.dlp.v2.ContentItem.DataItemCase getDataItemCase(); } diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentMetadata.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentMetadata.java new file mode 100644 index 000000000000..bb6bbae89deb --- /dev/null +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentMetadata.java @@ -0,0 +1,931 @@ +/* + * Copyright 2026 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. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE +// source: google/privacy/dlp/v2/dlp.proto +// Protobuf Java Version: 4.33.2 + +package com.google.privacy.dlp.v2; + +/** + * + * + *
+ * Metadata on content to be scanned.
+ * 
+ * + * Protobuf type {@code google.privacy.dlp.v2.ContentMetadata} + */ +@com.google.protobuf.Generated +public final class ContentMetadata extends com.google.protobuf.GeneratedMessage + implements + // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2.ContentMetadata) + ContentMetadataOrBuilder { + private static final long serialVersionUID = 0L; + + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 33, + /* patch= */ 2, + /* suffix= */ "", + "ContentMetadata"); + } + + // Use ContentMetadata.newBuilder() to construct. + private ContentMetadata(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + } + + private ContentMetadata() { + properties_ = java.util.Collections.emptyList(); + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_ContentMetadata_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_ContentMetadata_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.privacy.dlp.v2.ContentMetadata.class, + com.google.privacy.dlp.v2.ContentMetadata.Builder.class); + } + + public static final int PROPERTIES_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") + private java.util.List properties_; + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + @java.lang.Override + public java.util.List getPropertiesList() { + return properties_; + } + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + @java.lang.Override + public java.util.List + getPropertiesOrBuilderList() { + return properties_; + } + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + @java.lang.Override + public int getPropertiesCount() { + return properties_.size(); + } + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + @java.lang.Override + public com.google.privacy.dlp.v2.KeyValueMetadataProperty getProperties(int index) { + return properties_.get(index); + } + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + @java.lang.Override + public com.google.privacy.dlp.v2.KeyValueMetadataPropertyOrBuilder getPropertiesOrBuilder( + int index) { + return properties_.get(index); + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + for (int i = 0; i < properties_.size(); i++) { + output.writeMessage(2, properties_.get(i)); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < properties_.size(); i++) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, properties_.get(i)); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.privacy.dlp.v2.ContentMetadata)) { + return super.equals(obj); + } + com.google.privacy.dlp.v2.ContentMetadata other = + (com.google.privacy.dlp.v2.ContentMetadata) obj; + + if (!getPropertiesList().equals(other.getPropertiesList())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getPropertiesCount() > 0) { + hash = (37 * hash) + PROPERTIES_FIELD_NUMBER; + hash = (53 * hash) + getPropertiesList().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom(java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom( + java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input); + } + + public static com.google.privacy.dlp.v2.ContentMetadata parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.privacy.dlp.v2.ContentMetadata prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + + /** + * + * + *
+   * Metadata on content to be scanned.
+   * 
+ * + * Protobuf type {@code google.privacy.dlp.v2.ContentMetadata} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder + implements + // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2.ContentMetadata) + com.google.privacy.dlp.v2.ContentMetadataOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_ContentMetadata_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_ContentMetadata_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.privacy.dlp.v2.ContentMetadata.class, + com.google.privacy.dlp.v2.ContentMetadata.Builder.class); + } + + // Construct using com.google.privacy.dlp.v2.ContentMetadata.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + if (propertiesBuilder_ == null) { + properties_ = java.util.Collections.emptyList(); + } else { + properties_ = null; + propertiesBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_ContentMetadata_descriptor; + } + + @java.lang.Override + public com.google.privacy.dlp.v2.ContentMetadata getDefaultInstanceForType() { + return com.google.privacy.dlp.v2.ContentMetadata.getDefaultInstance(); + } + + @java.lang.Override + public com.google.privacy.dlp.v2.ContentMetadata build() { + com.google.privacy.dlp.v2.ContentMetadata result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.privacy.dlp.v2.ContentMetadata buildPartial() { + com.google.privacy.dlp.v2.ContentMetadata result = + new com.google.privacy.dlp.v2.ContentMetadata(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.privacy.dlp.v2.ContentMetadata result) { + if (propertiesBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + properties_ = java.util.Collections.unmodifiableList(properties_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.properties_ = properties_; + } else { + result.properties_ = propertiesBuilder_.build(); + } + } + + private void buildPartial0(com.google.privacy.dlp.v2.ContentMetadata result) { + int from_bitField0_ = bitField0_; + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.privacy.dlp.v2.ContentMetadata) { + return mergeFrom((com.google.privacy.dlp.v2.ContentMetadata) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.privacy.dlp.v2.ContentMetadata other) { + if (other == com.google.privacy.dlp.v2.ContentMetadata.getDefaultInstance()) return this; + if (propertiesBuilder_ == null) { + if (!other.properties_.isEmpty()) { + if (properties_.isEmpty()) { + properties_ = other.properties_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensurePropertiesIsMutable(); + properties_.addAll(other.properties_); + } + onChanged(); + } + } else { + if (!other.properties_.isEmpty()) { + if (propertiesBuilder_.isEmpty()) { + propertiesBuilder_.dispose(); + propertiesBuilder_ = null; + properties_ = other.properties_; + bitField0_ = (bitField0_ & ~0x00000001); + propertiesBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders + ? internalGetPropertiesFieldBuilder() + : null; + } else { + propertiesBuilder_.addAllMessages(other.properties_); + } + } + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 18: + { + com.google.privacy.dlp.v2.KeyValueMetadataProperty m = + input.readMessage( + com.google.privacy.dlp.v2.KeyValueMetadataProperty.parser(), + extensionRegistry); + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.add(m); + } else { + propertiesBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int bitField0_; + + private java.util.List properties_ = + java.util.Collections.emptyList(); + + private void ensurePropertiesIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + properties_ = + new java.util.ArrayList( + properties_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + com.google.privacy.dlp.v2.KeyValueMetadataProperty, + com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder, + com.google.privacy.dlp.v2.KeyValueMetadataPropertyOrBuilder> + propertiesBuilder_; + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public java.util.List getPropertiesList() { + if (propertiesBuilder_ == null) { + return java.util.Collections.unmodifiableList(properties_); + } else { + return propertiesBuilder_.getMessageList(); + } + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public int getPropertiesCount() { + if (propertiesBuilder_ == null) { + return properties_.size(); + } else { + return propertiesBuilder_.getCount(); + } + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public com.google.privacy.dlp.v2.KeyValueMetadataProperty getProperties(int index) { + if (propertiesBuilder_ == null) { + return properties_.get(index); + } else { + return propertiesBuilder_.getMessage(index); + } + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public Builder setProperties( + int index, com.google.privacy.dlp.v2.KeyValueMetadataProperty value) { + if (propertiesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePropertiesIsMutable(); + properties_.set(index, value); + onChanged(); + } else { + propertiesBuilder_.setMessage(index, value); + } + return this; + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public Builder setProperties( + int index, com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder builderForValue) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.set(index, builderForValue.build()); + onChanged(); + } else { + propertiesBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public Builder addProperties(com.google.privacy.dlp.v2.KeyValueMetadataProperty value) { + if (propertiesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePropertiesIsMutable(); + properties_.add(value); + onChanged(); + } else { + propertiesBuilder_.addMessage(value); + } + return this; + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public Builder addProperties( + int index, com.google.privacy.dlp.v2.KeyValueMetadataProperty value) { + if (propertiesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePropertiesIsMutable(); + properties_.add(index, value); + onChanged(); + } else { + propertiesBuilder_.addMessage(index, value); + } + return this; + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public Builder addProperties( + com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder builderForValue) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.add(builderForValue.build()); + onChanged(); + } else { + propertiesBuilder_.addMessage(builderForValue.build()); + } + return this; + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public Builder addProperties( + int index, com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder builderForValue) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.add(index, builderForValue.build()); + onChanged(); + } else { + propertiesBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public Builder addAllProperties( + java.lang.Iterable values) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll(values, properties_); + onChanged(); + } else { + propertiesBuilder_.addAllMessages(values); + } + return this; + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public Builder clearProperties() { + if (propertiesBuilder_ == null) { + properties_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + propertiesBuilder_.clear(); + } + return this; + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public Builder removeProperties(int index) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.remove(index); + onChanged(); + } else { + propertiesBuilder_.remove(index); + } + return this; + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder getPropertiesBuilder( + int index) { + return internalGetPropertiesFieldBuilder().getBuilder(index); + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public com.google.privacy.dlp.v2.KeyValueMetadataPropertyOrBuilder getPropertiesOrBuilder( + int index) { + if (propertiesBuilder_ == null) { + return properties_.get(index); + } else { + return propertiesBuilder_.getMessageOrBuilder(index); + } + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public java.util.List + getPropertiesOrBuilderList() { + if (propertiesBuilder_ != null) { + return propertiesBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(properties_); + } + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder addPropertiesBuilder() { + return internalGetPropertiesFieldBuilder() + .addBuilder(com.google.privacy.dlp.v2.KeyValueMetadataProperty.getDefaultInstance()); + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder addPropertiesBuilder( + int index) { + return internalGetPropertiesFieldBuilder() + .addBuilder( + index, com.google.privacy.dlp.v2.KeyValueMetadataProperty.getDefaultInstance()); + } + + /** + * + * + *
+     * User provided key-value pairs of content metadata.
+     * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + public java.util.List + getPropertiesBuilderList() { + return internalGetPropertiesFieldBuilder().getBuilderList(); + } + + private com.google.protobuf.RepeatedFieldBuilder< + com.google.privacy.dlp.v2.KeyValueMetadataProperty, + com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder, + com.google.privacy.dlp.v2.KeyValueMetadataPropertyOrBuilder> + internalGetPropertiesFieldBuilder() { + if (propertiesBuilder_ == null) { + propertiesBuilder_ = + new com.google.protobuf.RepeatedFieldBuilder< + com.google.privacy.dlp.v2.KeyValueMetadataProperty, + com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder, + com.google.privacy.dlp.v2.KeyValueMetadataPropertyOrBuilder>( + properties_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + properties_ = null; + } + return propertiesBuilder_; + } + + // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2.ContentMetadata) + } + + // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2.ContentMetadata) + private static final com.google.privacy.dlp.v2.ContentMetadata DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.privacy.dlp.v2.ContentMetadata(); + } + + public static com.google.privacy.dlp.v2.ContentMetadata getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public ContentMetadata parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.privacy.dlp.v2.ContentMetadata getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentMetadataOrBuilder.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentMetadataOrBuilder.java new file mode 100644 index 000000000000..0f266fc7f650 --- /dev/null +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentMetadataOrBuilder.java @@ -0,0 +1,84 @@ +/* + * Copyright 2026 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. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE +// source: google/privacy/dlp/v2/dlp.proto +// Protobuf Java Version: 4.33.2 + +package com.google.privacy.dlp.v2; + +@com.google.protobuf.Generated +public interface ContentMetadataOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2.ContentMetadata) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + java.util.List getPropertiesList(); + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + com.google.privacy.dlp.v2.KeyValueMetadataProperty getProperties(int index); + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + int getPropertiesCount(); + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + java.util.List + getPropertiesOrBuilderList(); + + /** + * + * + *
+   * User provided key-value pairs of content metadata.
+   * 
+ * + * repeated .google.privacy.dlp.v2.KeyValueMetadataProperty properties = 2; + */ + com.google.privacy.dlp.v2.KeyValueMetadataPropertyOrBuilder getPropertiesOrBuilder(int index); +} diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DataProfileConfigSnapshot.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DataProfileConfigSnapshot.java index 3d285d9120e0..4b626a0d8196 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DataProfileConfigSnapshot.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DataProfileConfigSnapshot.java @@ -145,7 +145,7 @@ public com.google.privacy.dlp.v2.InspectConfigOrBuilder getInspectConfigOrBuilde * * * @deprecated google.privacy.dlp.v2.DataProfileConfigSnapshot.data_profile_job is deprecated. See - * google/privacy/dlp/v2/dlp.proto;l=7873 + * google/privacy/dlp/v2/dlp.proto;l=7894 * @return Whether the dataProfileJob field is set. */ @java.lang.Override @@ -169,7 +169,7 @@ public boolean hasDataProfileJob() { * * * @deprecated google.privacy.dlp.v2.DataProfileConfigSnapshot.data_profile_job is deprecated. See - * google/privacy/dlp/v2/dlp.proto;l=7873 + * google/privacy/dlp/v2/dlp.proto;l=7894 * @return The dataProfileJob. */ @java.lang.Override @@ -1053,7 +1053,7 @@ public com.google.privacy.dlp.v2.InspectConfigOrBuilder getInspectConfigOrBuilde * * * @deprecated google.privacy.dlp.v2.DataProfileConfigSnapshot.data_profile_job is deprecated. - * See google/privacy/dlp/v2/dlp.proto;l=7873 + * See google/privacy/dlp/v2/dlp.proto;l=7894 * @return Whether the dataProfileJob field is set. */ @java.lang.Deprecated @@ -1076,7 +1076,7 @@ public boolean hasDataProfileJob() { * * * @deprecated google.privacy.dlp.v2.DataProfileConfigSnapshot.data_profile_job is deprecated. - * See google/privacy/dlp/v2/dlp.proto;l=7873 + * See google/privacy/dlp/v2/dlp.proto;l=7894 * @return The dataProfileJob. */ @java.lang.Deprecated diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DataProfileConfigSnapshotOrBuilder.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DataProfileConfigSnapshotOrBuilder.java index 2e0827c0d967..eadcd246092e 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DataProfileConfigSnapshotOrBuilder.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DataProfileConfigSnapshotOrBuilder.java @@ -81,7 +81,7 @@ public interface DataProfileConfigSnapshotOrBuilder * * * @deprecated google.privacy.dlp.v2.DataProfileConfigSnapshot.data_profile_job is deprecated. See - * google/privacy/dlp/v2/dlp.proto;l=7873 + * google/privacy/dlp/v2/dlp.proto;l=7894 * @return Whether the dataProfileJob field is set. */ @java.lang.Deprecated @@ -102,7 +102,7 @@ public interface DataProfileConfigSnapshotOrBuilder * * * @deprecated google.privacy.dlp.v2.DataProfileConfigSnapshot.data_profile_job is deprecated. See - * google/privacy/dlp/v2/dlp.proto;l=7873 + * google/privacy/dlp/v2/dlp.proto;l=7894 * @return The dataProfileJob. */ @java.lang.Deprecated diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java index 5ea791aef618..74b57bb2fe7f 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java @@ -100,6 +100,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r internal_static_google_privacy_dlp_v2_ContentItem_descriptor; static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_google_privacy_dlp_v2_ContentItem_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_privacy_dlp_v2_ContentMetadata_descriptor; + static final com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_google_privacy_dlp_v2_ContentMetadata_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_google_privacy_dlp_v2_Table_descriptor; static final com.google.protobuf.GeneratedMessage.FieldAccessorTable @@ -108,6 +112,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r internal_static_google_privacy_dlp_v2_Table_Row_descriptor; static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_google_privacy_dlp_v2_Table_Row_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_descriptor; + static final com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_google_privacy_dlp_v2_InspectResult_descriptor; static final com.google.protobuf.GeneratedMessage.FieldAccessorTable @@ -1553,17 +1561,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\005AUDIO\020\017\022\t\n" + "\005VIDEO\020\020\022\016\n\n" + "EXECUTABLE\020\021\022\014\n" - + "\010AI_MODEL\020\022\"\227\001\n" + + "\010AI_MODEL\020\022\"\331\001\n" + "\013ContentItem\022\017\n" + "\005value\030\003 \001(\tH\000\022-\n" + "\005table\030\004 \001(\0132\034.google.privacy.dlp.v2.TableH\000\022;\n" - + "\tbyte_item\030\005 \001(\0132&.google.privacy.dlp.v2.ByteContentItemH\000B\013\n" - + "\tdata_item\"\235\001\n" + + "\tbyte_item\030\005 \001(\0132&.google.privacy.dlp.v2.ByteContentItemH\000\022@\n" + + "\020content_metadata\030\006 \001(\0132&.google.privacy.dlp.v2.ContentMetadataB\013\n" + + "\tdata_item\"V\n" + + "\017ContentMetadata\022C\n\n" + + "properties\030\002" + + " \003(\0132/.google.privacy.dlp.v2.KeyValueMetadataProperty\"\235\001\n" + "\005Table\022/\n" + "\007headers\030\001 \003(\0132\036.google.privacy.dlp.v2.FieldId\022.\n" + "\004rows\030\002 \003(\0132 .google.privacy.dlp.v2.Table.Row\0323\n" + "\003Row\022,\n" - + "\006values\030\001 \003(\0132\034.google.privacy.dlp.v2.Value\"]\n\r" + + "\006values\030\001 \003(\0132\034.google.privacy.dlp.v2.Value\"6\n" + + "\030KeyValueMetadataProperty\022\013\n" + + "\003key\030\001 \001(\t\022\r\n" + + "\005value\030\002 \001(\t\"]\n\r" + "InspectResult\0220\n" + "\010findings\030\001 \003(\0132\036.google.privacy.dlp.v2.Finding\022\032\n" + "\022findings_truncated\030\002 \001(\010\"\337\005\n" @@ -1589,8 +1604,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\013LabelsEntry\022\013\n" + "\003key\030\001 \001(\t\022\r\n" + "\005value\030\002 \001(\t:\0028\001:[\352AX\n" - + "\032dlp.googleapis.com/Findi" - + "ng\022:projects/{project}/locations/{location}/findings/{finding}\"\353\001\n" + + "\032dlp.googleapis" + + ".com/Finding\022:projects/{project}/locations/{location}/findings/{finding}\"\353\001\n" + "\010Location\0220\n\n" + "byte_range\030\001 \001(\0132\034.google.privacy.dlp.v2.Range\0225\n" + "\017codepoint_range\030\002 \001(\0132\034.google.privacy.dlp.v2.Range\022A\n" @@ -1649,8 +1664,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\006parent\030\001 \001(\tB\"\372A\037\022\035dlp.googleapis.com/DlpContent\022\023\n" + "\013location_id\030\010 \001(\t\022<\n" + "\016inspect_config\030\002 \001(\0132$.google.privacy.dlp.v2.InspectConfig\022_\n" - + "\027image_redaction_configs\030\005 \003(\0132>.goog" - + "le.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfig\022\030\n" + + "\027image_redaction_configs\030\005 " + + "\003(\0132>.google.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfig\022\030\n" + "\020include_findings\030\006 \001(\010\0229\n" + "\tbyte_item\030\007 \001(\0132&.google.privacy.dlp.v2.ByteContentItem\022\030\n" + "\020inspect_template\030\t \001(\t\022\033\n" @@ -1680,8 +1695,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\013location_id\030\007 \001(\t\"\216\001\n" + "\031DeidentifyContentResponse\0220\n" + "\004item\030\001 \001(\0132\".google.privacy.dlp.v2.ContentItem\022?\n" - + "\010overview\030\002 \001(\0132-" - + ".google.privacy.dlp.v2.TransformationOverview\"\333\002\n" + + "\010overview\030\002" + + " \001(\0132-.google.privacy.dlp.v2.TransformationOverview\"\333\002\n" + "\030ReidentifyContentRequest\0225\n" + "\006parent\030\001 \001(" + "\tB%\340A\002\372A\037\022\035dlp.googleapis.com/DlpContent\022B\n" @@ -1706,10 +1721,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\006result\030\001 \001(\0132$.google.privacy.dlp.v2.InspectResult\"\370\002\n" + "\023OutputStorageConfig\0225\n" + "\005table\030\001 \001(\0132$.google.privacy.dlp.v2.BigQueryTableH\000\022?\n" - + "\014storage_path\030\005 " - + "\001(\0132\'.google.privacy.dlp.v2.CloudStoragePathH\000\022N\n\r" - + "output_schema\030\003 \001(\01627.google.p" - + "rivacy.dlp.v2.OutputStorageConfig.OutputSchema\"\220\001\n" + + "\014storage_path\030\005" + + " \001(\0132\'.google.privacy.dlp.v2.CloudStoragePathH\000\022N\n\r" + + "output_schema\030\003 \001(\0162" + + "7.google.privacy.dlp.v2.OutputStorageConfig.OutputSchema\"\220\001\n" + "\014OutputSchema\022\035\n" + "\031OUTPUT_SCHEMA_UNSPECIFIED\020\000\022\021\n\r" + "BASIC_COLUMNS\020\001\022\017\n" @@ -1722,10 +1737,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\tinfo_type\030\001 \001(\0132\037.google.privacy.dlp.v2.InfoType\022\r\n" + "\005count\030\002 \001(\003\"\300\004\n" + "\030InspectDataSourceDetails\022[\n" - + "\021requested_options\030\002 \001(\0132@.google.privacy.d" - + "lp.v2.InspectDataSourceDetails.RequestedOptions\022F\n" - + "\006result\030\003 \001(\01326.google.privacy" - + ".dlp.v2.InspectDataSourceDetails.Result\032\232\001\n" + + "\021requested_options\030\002 \001(\0132@.google" + + ".privacy.dlp.v2.InspectDataSourceDetails.RequestedOptions\022F\n" + + "\006result\030\003 \001(\01326.goog" + + "le.privacy.dlp.v2.InspectDataSourceDetails.Result\032\232\001\n" + "\020RequestedOptions\022I\n" + "\031snapshot_inspect_template\030\001" + " \001(\0132&.google.privacy.dlp.v2.InspectTemplate\022;\n\n" @@ -1739,36 +1754,35 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + " \001(\0132..google.privacy.dlp.v2.HybridInspectStatistics\"\377\001\n" + "\034DataProfileBigQueryRowSchema\022@\n\r" + "table_profile\030\001 \001(\0132\'.google.privacy.dlp.v2.TableDataProfileH\000\022B\n" - + "\016column_profile\030\002" - + " \001(\0132(.google.privacy.dlp.v2.ColumnDataProfileH\000\022I\n" + + "\016column_profile\030\002 \001(\0132(." + + "google.privacy.dlp.v2.ColumnDataProfileH\000\022I\n" + "\022file_store_profile\030\003" + " \001(\0132+.google.privacy.dlp.v2.FileStoreDataProfileH\000B\016\n" + "\014data_profile\"`\n" + "\027HybridInspectStatistics\022\027\n" + "\017processed_count\030\001 \001(\003\022\025\n\r" - + "aborted_count\030\002 \001(\003\022\025\n" - + "\r" + + "aborted_count\030\002 \001(\003\022\025\n\r" + "pending_count\030\003 \001(\003\"l\n\r" + "ActionDetails\022P\n" - + "\022deidentify_details\030\001 \001(\01322.google.priva" - + "cy.dlp.v2.DeidentifyDataSourceDetailsH\000B\t\n" + + "\022deidentify_details\030\001 \001(\01322.go" + + "ogle.privacy.dlp.v2.DeidentifyDataSourceDetailsH\000B\t\n" + "\007details\"x\n" + "\031DeidentifyDataSourceStats\022\031\n" + "\021transformed_bytes\030\001 \001(\003\022\034\n" + "\024transformation_count\030\002 \001(\003\022\"\n" + "\032transformation_error_count\030\003 \001(\003\"\362\003\n" + "\033DeidentifyDataSourceDetails\022h\n" - + "\021requested_options\030\001 \001(\0132M.google" - + ".privacy.dlp.v2.DeidentifyDataSourceDetails.RequestedDeidentifyOptions\022J\n" + + "\021requested_options\030\001 \001(\0132M.google.privacy.dlp.v2.DeidentifyData" + + "SourceDetails.RequestedDeidentifyOptions\022J\n" + "\020deidentify_stats\030\002" + " \001(\01320.google.privacy.dlp.v2.DeidentifyDataSourceStats\032\234\002\n" + "\032RequestedDeidentifyOptions\022O\n" + "\034snapshot_deidentify_template\030\001" + " \001(\0132).google.privacy.dlp.v2.DeidentifyTemplate\022Z\n" - + "\'snapshot_structured_deidentify_template\030\002" - + " \001(\0132).google.privacy.dlp.v2.DeidentifyTemplate\022Q\n" - + "\036snapshot_image_redact_template\030\003" - + " \001(\0132).google.privacy.dlp.v2.DeidentifyTemplate\"\337\001\n" + + "\'snapshot_structured_deidentify_template\030\002 \001(\0132)." + + "google.privacy.dlp.v2.DeidentifyTemplate\022Q\n" + + "\036snapshot_image_redact_template\030\003 \001(\013" + + "2).google.privacy.dlp.v2.DeidentifyTemplate\"\337\001\n" + "\017LocationSupport\022Z\n" + "\025regionalization_scope\030\001" + " \001(\0162;.google.privacy.dlp.v2.LocationSupport.RegionalizationScope\022\021\n" @@ -1783,29 +1797,30 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\014supported_by\030\003" + " \003(\0162*.google.privacy.dlp.v2.InfoTypeSupportedBy\022\023\n" + "\013description\030\004 \001(\t\022@\n" - + "\020location_support\030\006" - + " \001(\0132&.google.privacy.dlp.v2.LocationSupport\022\017\n" + + "\020location_support\030\006 \001" + + "(\0132&.google.privacy.dlp.v2.LocationSupport\022\017\n" + "\007example\030\010 \001(\t\022;\n" + "\010versions\030\t \003(\0132).google.privacy.dlp.v2.VersionDescription\022;\n\n" + "categories\030\n" + " \003(\0132\'.google.privacy.dlp.v2.InfoTypeCategory\022B\n" - + "\021sensitivity_score\030\013 \001(\0132\'" - + ".google.privacy.dlp.v2.SensitivityScore\022\033\n" + + "\021sensitivity_score\030\013" + + " \001(\0132\'.google.privacy.dlp.v2.SensitivityScore\022\033\n" + "\023specific_info_types\030\014 \003(\t\022V\n\r" + "launch_status\030\r" - + " \001(\0162?.google.privacy.dlp.v2.InfoTypeDescription.InfoTypeLaunchStatus\"\202\001\n" + + " \001(\0162?.google.privacy.d" + + "lp.v2.InfoTypeDescription.InfoTypeLaunchStatus\"\202\001\n" + "\024InfoTypeLaunchStatus\022\'\n" + "#INFO_TYPE_LAUNCH_STATUS_UNSPECIFIED\020\000\022\030\n" + "\024GENERAL_AVAILABILITY\020\001\022\022\n" + "\016PUBLIC_PREVIEW\020\002\022\023\n" + "\017PRIVATE_PREVIEW\020\003\"\220\n\n" + "\020InfoTypeCategory\022U\n" - + "\021location_category\030\001" - + " \001(\01628.google.privacy.dlp.v2.InfoTypeCategory.LocationCategoryH\000\022U\n" - + "\021industry_category\030\002 \001(\01628.google.privac" - + "y.dlp.v2.InfoTypeCategory.IndustryCategoryH\000\022M\n\r" - + "type_category\030\003 \001(\01624.google.pri" - + "vacy.dlp.v2.InfoTypeCategory.TypeCategoryH\000\"\357\005\n" + + "\021location_category\030\001 \001(\01628.google.pri" + + "vacy.dlp.v2.InfoTypeCategory.LocationCategoryH\000\022U\n" + + "\021industry_category\030\002 \001(\01628.goo" + + "gle.privacy.dlp.v2.InfoTypeCategory.IndustryCategoryH\000\022M\n\r" + + "type_category\030\003 \001(\01624." + + "google.privacy.dlp.v2.InfoTypeCategory.TypeCategoryH\000\"\357\005\n" + "\020LocationCategory\022\030\n" + "\024LOCATION_UNSPECIFIED\020\000\022\n\n" + "\006GLOBAL\020\001\022\r\n" @@ -1900,26 +1915,26 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\003tag\"\276\002\n" + "\020StatisticalTable\0228\n" + "\005table\030\003 \001(\0132$.google.privacy.dlp.v2.BigQueryTableB\003\340A\002\022T\n" - + "\tquasi_ids\030\001 \003" - + "(\0132<.google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierFieldB\003\340A\002\022?\n" + + "\tquasi_ids\030\001 \003(\0132<.google.privacy.dlp.v2.Sta" + + "tisticalTable.QuasiIdentifierFieldB\003\340A\002\022?\n" + "\022relative_frequency\030\002" + " \001(\0132\036.google.privacy.dlp.v2.FieldIdB\003\340A\002\032Y\n" + "\024QuasiIdentifierField\022-\n" + "\005field\030\001 \001(\0132\036.google.privacy.dlp.v2.FieldId\022\022\n\n" + "custom_tag\030\002 \001(\t\"\223\017\n\r" + "PrivacyMetric\022[\n" - + "\026numerical_stats_config\030\001 \001(\01329.go" - + "ogle.privacy.dlp.v2.PrivacyMetric.NumericalStatsConfigH\000\022_\n" - + "\030categorical_stats_config\030\002" - + " \001(\0132;.google.privacy.dlp.v2.PrivacyMetric.CategoricalStatsConfigH\000\022S\n" - + "\022k_anonymity_config\030\003 \001(\01325.google.privacy.d" - + "lp.v2.PrivacyMetric.KAnonymityConfigH\000\022S\n" - + "\022l_diversity_config\030\004 \001(\01325.google.priv" - + "acy.dlp.v2.PrivacyMetric.LDiversityConfigH\000\022\\\n" - + "\027k_map_estimation_config\030\005 \001(\01329.g" - + "oogle.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfigH\000\022n\n" - + " delta_presence_estimation_config\030\006 \001(\0132B.google.privacy.dlp" - + ".v2.PrivacyMetric.DeltaPresenceEstimationConfigH\000\032E\n" + + "\026numerical_stats_config\030\001" + + " \001(\01329.google.privacy.dlp.v2.PrivacyMetric.NumericalStatsConfigH\000\022_\n" + + "\030categorical_stats_config\030\002 \001(\0132;.google.privacy.dl" + + "p.v2.PrivacyMetric.CategoricalStatsConfigH\000\022S\n" + + "\022k_anonymity_config\030\003 \001(\01325.google" + + ".privacy.dlp.v2.PrivacyMetric.KAnonymityConfigH\000\022S\n" + + "\022l_diversity_config\030\004 \001(\01325.g" + + "oogle.privacy.dlp.v2.PrivacyMetric.LDiversityConfigH\000\022\\\n" + + "\027k_map_estimation_config\030\005" + + " \001(\01329.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfigH\000\022n\n" + + " delta_presence_estimation_config\030\006 \001(\0132B.google.p" + + "rivacy.dlp.v2.PrivacyMetric.DeltaPresenceEstimationConfigH\000\032E\n" + "\024NumericalStatsConfig\022-\n" + "\005field\030\001 \001(\0132\036.google.privacy.dlp.v2.FieldId\032G\n" + "\026CategoricalStatsConfig\022-\n" @@ -1932,11 +1947,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\023sensitive_attribute\030\002" + " \001(\0132\036.google.privacy.dlp.v2.FieldId\032\201\006\n" + "\024KMapEstimationConfig\022]\n" - + "\tquasi_ids\030\001 \003(\0132E.google.privacy.dlp.v2.Pr" - + "ivacyMetric.KMapEstimationConfig.TaggedFieldB\003\340A\002\022\023\n" + + "\tquasi_ids\030\001 \003(\0132E.google.privacy" + + ".dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedFieldB\003\340A\002\022\023\n" + "\013region_code\030\002 \001(\t\022b\n" - + "\020auxiliary_tables\030\003 \003(\0132H.google.privacy.dlp.v2" - + ".PrivacyMetric.KMapEstimationConfig.AuxiliaryTable\032\300\001\n" + + "\020auxiliary_tables\030\003 \003(\0132H.google.priv" + + "acy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable\032\300\001\n" + "\013TaggedField\0222\n" + "\005field\030\001 \001(\0132\036.google.privacy.dlp.v2.FieldIdB\003\340A\002\0224\n" + "\tinfo_type\030\002 \001(\0132\037.google.privacy.dlp.v2.InfoTypeH\000\022\024\n\n" @@ -1945,8 +1960,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\003tag\032\315\002\n" + "\016AuxiliaryTable\0228\n" + "\005table\030\003 \001(\0132$.google.privacy.dlp.v2.BigQueryTableB\003\340A\002\022m\n" - + "\tquasi_ids\030\001 \003(\0132U.google.privacy.d" - + "lp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable.QuasiIdFieldB\003\340A\002\022?\n" + + "\tquasi_ids\030\001 \003(\0132U.google.privacy.dlp.v2.PrivacyMetric.KMapEstima" + + "tionConfig.AuxiliaryTable.QuasiIdFieldB\003\340A\002\022?\n" + "\022relative_frequency\030\002" + " \001(\0132\036.google.privacy.dlp.v2.FieldIdB\003\340A\002\032Q\n" + "\014QuasiIdField\022-\n" @@ -1956,39 +1971,36 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\tquasi_ids\030\001" + " \003(\0132\036.google.privacy.dlp.v2.QuasiIdB\003\340A\002\022\023\n" + "\013region_code\030\002 \001(\t\022A\n" - + "\020auxiliary_tables\030\003 \003(\0132\'" - + ".google.privacy.dlp.v2.StatisticalTableB\006\n" + + "\020auxiliary_tables\030\003" + + " \003(\0132\'.google.privacy.dlp.v2.StatisticalTableB\006\n" + "\004type\"\301\037\n" + "\034AnalyzeDataSourceRiskDetails\022F\n" - + "\030requested_privacy_metric\030\001" - + " \001(\0132$.google.privacy.dlp.v2.PrivacyMetric\022D\n" + + "\030requested_privacy_metric\030\001", + " \001(\0132$.google.privacy.dlp.v2.PrivacyMetric\022D\n" + "\026requested_source_table\030\002" + " \001(\0132$.google.privacy.dlp.v2.BigQueryTable\022j\n" - + "\026numerical_stats_result\030\003 \001(\0132H.google.privacy.dlp.v2.A" - + "nalyzeDataSourceRiskDetails.NumericalSta", - "tsResultH\000\022n\n" - + "\030categorical_stats_result\030\004 \001(\0132J.google.privacy.dlp.v2.AnalyzeData" - + "SourceRiskDetails.CategoricalStatsResultH\000\022b\n" - + "\022k_anonymity_result\030\005 \001(\0132D.google." - + "privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResultH\000\022b\n" - + "\022l_diversity_result\030\006 \001(\0132D.google.privacy.dlp.v2.Analy" - + "zeDataSourceRiskDetails.LDiversityResultH\000\022k\n" - + "\027k_map_estimation_result\030\007 \001(\0132H.go" - + "ogle.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResultH\000\022}\n" - + " delta_presence_estimation_result\030\t \001(\0132Q.goog" - + "le.privacy.dlp.v2.AnalyzeDataSourceRiskD" - + "etails.DeltaPresenceEstimationResultH\000\022k\n" + + "\026numerical_stats_result\030\003 \001(\0132H.google.privac" + + "y.dlp.v2.AnalyzeDataSourceRiskDetails.NumericalStatsResultH\000\022n\n" + + "\030categorical_stats_result\030\004 \001(\0132J.google.privacy.dlp.v2.A" + + "nalyzeDataSourceRiskDetails.CategoricalStatsResultH\000\022b\n" + + "\022k_anonymity_result\030\005 \001(\013" + + "2D.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResultH\000\022b\n" + + "\022l_diversity_result\030\006 \001(\0132D.google.privacy.dl" + + "p.v2.AnalyzeDataSourceRiskDetails.LDiversityResultH\000\022k\n" + + "\027k_map_estimation_result\030\007 \001(\0132H.google.privacy.dlp.v2.AnalyzeDat" + + "aSourceRiskDetails.KMapEstimationResultH\000\022}\n" + + " delta_presence_estimation_result\030\t \001(\0132Q.google.privacy.dlp.v2.AnalyzeDataS" + + "ourceRiskDetails.DeltaPresenceEstimationResultH\000\022k\n" + "\021requested_options\030\n" - + " \001(\0132P.google.priva" - + "cy.dlp.v2.AnalyzeDataSourceRiskDetails.RequestedRiskAnalysisOptions\032\257\001\n" + + " \001(\0132P.google.privacy.dlp.v2.AnalyzeDataSourceRis" + + "kDetails.RequestedRiskAnalysisOptions\032\257\001\n" + "\024NumericalStatsResult\022/\n" + "\tmin_value\030\001 \001(\0132\034.google.privacy.dlp.v2.Value\022/\n" + "\tmax_value\030\002 \001(\0132\034.google.privacy.dlp.v2.Value\0225\n" + "\017quantile_values\030\004 \003(\0132\034.google.privacy.dlp.v2.Value\032\215\003\n" + "\026CategoricalStatsResult\022\225\001\n" - + "!value_frequency_histogram_buckets\030\005 \003(\0132j.g" - + "oogle.privacy.dlp.v2.AnalyzeDataSourceRi" - + "skDetails.CategoricalStatsResult.CategoricalStatsHistogramBucket\032\332\001\n" + + "!value_frequency_histogram_buckets\030\005 \003(\0132j.google.privacy.dlp.v2.AnalyzeDa" + + "taSourceRiskDetails.CategoricalStatsResult.CategoricalStatsHistogramBucket\032\332\001\n" + "\037CategoricalStatsHistogramBucket\022#\n" + "\033value_frequency_lower_bound\030\001 \001(\003\022#\n" + "\033value_frequency_upper_bound\030\002 \001(\003\022\023\n" @@ -1996,9 +2008,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "bucket_values\030\004 \003(\0132%.google.privacy.dlp.v2.ValueFrequency\022\032\n" + "\022bucket_value_count\030\005 \001(\003\032\265\004\n" + "\020KAnonymityResult\022\213\001\n" - + "#equivalence_class_histogram_buckets\030\005 \003(\0132^.googl" - + "e.privacy.dlp.v2.AnalyzeDataSourceRiskDe" - + "tails.KAnonymityResult.KAnonymityHistogramBucket\032t\n" + + "#equivalence_class_histogram_buckets\030\005 \003" + + "(\0132^.google.privacy.dlp.v2.AnalyzeDataSo" + + "urceRiskDetails.KAnonymityResult.KAnonymityHistogramBucket\032t\n" + "\032KAnonymityEquivalenceClass\0226\n" + "\020quasi_ids_values\030\001 \003(\0132\034.google.privacy.dlp.v2.Value\022\036\n" + "\026equivalence_class_size\030\002 \001(\003\032\234\002\n" @@ -2006,13 +2018,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\"equivalence_class_size_lower_bound\030\001 \001(\003\022*\n" + "\"equivalence_class_size_upper_bound\030\002 \001(\003\022\023\n" + "\013bucket_size\030\003 \001(\003\022v\n\r" - + "bucket_values\030\004 \003(\0132_.google.privacy.dlp.v2.Analyze" - + "DataSourceRiskDetails.KAnonymityResult.KAnonymityEquivalenceClass\022\032\n" + + "bucket_values\030\004 \003(\0132_.google.privacy.dlp." + + "v2.AnalyzeDataSourceRiskDetails.KAnonymityResult.KAnonymityEquivalenceClass\022\032\n" + "\022bucket_value_count\030\005 \001(\003\032\260\005\n" + "\020LDiversityResult\022\223\001\n" - + "+sensitive_value_frequency_histogram_buckets\030\005" - + " \003(\0132^.google.privacy.dlp.v2.Analyze" - + "DataSourceRiskDetails.LDiversityResult.LDiversityHistogramBucket\032\340\001\n" + + "+sensitive_value_frequency_histogram_buckets\030\005 \003(\0132^.google.privacy.dlp." + + "v2.AnalyzeDataSourceRiskDetails.LDiversityResult.LDiversityHistogramBucket\032\340\001\n" + "\032LDiversityEquivalenceClass\0226\n" + "\020quasi_ids_values\030\001 \003(\0132\034.google.privacy.dlp.v2.Value\022\036\n" + "\026equivalence_class_size\030\002 \001(\003\022%\n" @@ -2023,12 +2034,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "%sensitive_value_frequency_lower_bound\030\001 \001(\003\022-\n" + "%sensitive_value_frequency_upper_bound\030\002 \001(\003\022\023\n" + "\013bucket_size\030\003 \001(\003\022v\n\r" - + "bucket_values\030\004 \003(\0132_.google.privacy.dlp" - + ".v2.AnalyzeDataSourceRiskDetails.LDiversityResult.LDiversityEquivalenceClass\022\032\n" + + "bucket_values\030\004 \003(\0132_.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetai" + + "ls.LDiversityResult.LDiversityEquivalenceClass\022\032\n" + "\022bucket_value_count\030\005 \001(\003\032\225\004\n" + "\024KMapEstimationResult\022\212\001\n" - + "\032k_map_estimation_histogram\030\001 \003(\0132f.google.privacy.dlp.v2.AnalyzeDa" - + "taSourceRiskDetails.KMapEstimationResult.KMapEstimationHistogramBucket\032r\n" + + "\032k_map_estimation_histogram\030\001 \003(\0132f.google.privacy.dlp.v2" + + ".AnalyzeDataSourceRiskDetails.KMapEstima" + + "tionResult.KMapEstimationHistogramBucket\032r\n" + "\033KMapEstimationQuasiIdValues\0226\n" + "\020quasi_ids_values\030\001 \003(\0132\034.google.privacy.dlp.v2.Value\022\033\n" + "\023estimated_anonymity\030\002 \001(\003\032\373\001\n" @@ -2036,13 +2048,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "min_anonymity\030\001 \001(\003\022\025\n\r" + "max_anonymity\030\002 \001(\003\022\023\n" + "\013bucket_size\030\005 \001(\003\022{\n\r" - + "bucket_values\030\006 \003(\0132d.google.privacy.dlp.v2.AnalyzeDataSourceRiskDeta" - + "ils.KMapEstimationResult.KMapEstimationQuasiIdValues\022\032\n" + + "bucket_values\030\006 \003(\0132d.google.privacy.dlp.v2.AnalyzeDataSour" + + "ceRiskDetails.KMapEstimationResult.KMapEstimationQuasiIdValues\022\032\n" + "\022bucket_value_count\030\007 \001(\003\032\344\004\n" + "\035DeltaPresenceEstimationResult\022\245\001\n" - + "#delta_presence_estimation_histogram\030\001 \003(\013" - + "2x.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.DeltaPresenceEstimationRes" - + "ult.DeltaPresenceEstimationHistogramBucket\032}\n" + + "#delta_presence_estimation_histogram\030\001 \003(\0132x.google.privacy.dlp.v2.Analy" + + "zeDataSourceRiskDetails.DeltaPresenceEst" + + "imationResult.DeltaPresenceEstimationHistogramBucket\032}\n" + "$DeltaPresenceEstimationQuasiIdValues\0226\n" + "\020quasi_ids_values\030\001 \003(\0132\034.google.privacy.dlp.v2.Value\022\035\n" + "\025estimated_probability\030\002 \001(\001\032\233\002\n" @@ -2050,8 +2062,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\017min_probability\030\001 \001(\001\022\027\n" + "\017max_probability\030\002 \001(\001\022\023\n" + "\013bucket_size\030\005 \001(\003\022\215\001\n\r" - + "bucket_values\030\006 \003(\0132v.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails" - + ".DeltaPresenceEstimationResult.DeltaPresenceEstimationQuasiIdValues\022\032\n" + + "bucket_values\030\006 \003(\0132v.google.privacy.dlp.v2.AnalyzeDataSourceR" + + "iskDetails.DeltaPresenceEstimationResult.DeltaPresenceEstimationQuasiIdValues\022\032\n" + "\022bucket_value_count\030\007 \001(\003\032`\n" + "\034RequestedRiskAnalysisOptions\022@\n\n" + "job_config\030\001 \001(\0132,.google.privacy.dlp.v2.RiskAnalysisJobConfigB\010\n" @@ -2080,25 +2092,25 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\010TimeZone\022\026\n" + "\016offset_minutes\030\001 \001(\005\"\362\002\n" + "\020DeidentifyConfig\022S\n" - + "\031info_type_transformations\030\001 \001(\0132..g" - + "oogle.privacy.dlp.v2.InfoTypeTransformationsH\000\022N\n" - + "\026record_transformations\030\002 \001(\0132," - + ".google.privacy.dlp.v2.RecordTransformationsH\000\022L\n" - + "\025image_transformations\030\004 \001(\0132+." - + "google.privacy.dlp.v2.ImageTransformationsH\000\022Y\n" - + "\035transformation_error_handling\030\003 " - + "\001(\01322.google.privacy.dlp.v2.TransformationErrorHandlingB\020\n" + + "\031info_type_transformations\030\001" + + " \001(\0132..google.privacy.dlp.v2.InfoTypeTransformationsH\000\022N\n" + + "\026record_transformations\030\002" + + " \001(\0132,.google.privacy.dlp.v2.RecordTransformationsH\000\022L\n" + + "\025image_transformations\030\004" + + " \001(\0132+.google.privacy.dlp.v2.ImageTransformationsH\000\022Y\n" + + "\035transformation_error_handling\030\003" + + " \001(\01322.google.privacy.dlp.v2.TransformationErrorHandlingB\020\n" + "\016transformation\"\345\004\n" + "\024ImageTransformations\022S\n\n" - + "transforms\030\002 \003(\0132?" - + ".google.privacy.dlp.v2.ImageTransformations.ImageTransformation\032\367\003\n" + + "transforms\030\002" + + " \003(\0132?.google.privacy.dlp.v2.ImageTransformations.ImageTransformation\032\367\003\n" + "\023ImageTransformation\022p\n" - + "\023selected_info_types\030\004 \001(\0132Q.google.privacy.dlp.v2.ImageTransformation" - + "s.ImageTransformation.SelectedInfoTypesH\000\022f\n" - + "\016all_info_types\030\005 \001(\0132L.google.priva" - + "cy.dlp.v2.ImageTransformations.ImageTransformation.AllInfoTypesH\000\022[\n" - + "\010all_text\030\006 \001(\0132G.google.privacy.dlp.v2.ImageTransfo" - + "rmations.ImageTransformation.AllTextH\000\0225\n" + + "\023selected_info_types\030\004 \001(\0132Q.google.privacy.dlp.v2.ImageTran" + + "sformations.ImageTransformation.SelectedInfoTypesH\000\022f\n" + + "\016all_info_types\030\005 \001(\0132L.go" + + "ogle.privacy.dlp.v2.ImageTransformations.ImageTransformation.AllInfoTypesH\000\022[\n" + + "\010all_text\030\006 \001(\0132G.google.privacy.dlp.v2.Im" + + "ageTransformations.ImageTransformation.AllTextH\000\0225\n" + "\017redaction_color\030\003 \001(\0132\034.google.privacy.dlp.v2.Color\032M\n" + "\021SelectedInfoTypes\0228\n\n" + "info_types\030\005" @@ -2107,10 +2119,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\007AllTextB\010\n" + "\006target\"\205\002\n" + "\033TransformationErrorHandling\022T\n" - + "\013throw_error\030\001 \001(\0132=.google.privacy." - + "dlp.v2.TransformationErrorHandling.ThrowErrorH\000\022d\n" - + "\023leave_untransformed\030\002 \001(\0132E.g" - + "oogle.privacy.dlp.v2.TransformationErrorHandling.LeaveUntransformedH\000\032\014\n\n" + + "\013throw_error\030\001 \001(\0132=.googl" + + "e.privacy.dlp.v2.TransformationErrorHandling.ThrowErrorH\000\022d\n" + + "\023leave_untransformed\030\002 \001(\0132E.google.privacy.dlp.v2.Transform" + + "ationErrorHandling.LeaveUntransformedH\000\032\014\n\n" + "ThrowError\032\024\n" + "\022LeaveUntransformedB\006\n" + "\004mode\"\312\007\n" @@ -2118,18 +2130,18 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\016replace_config\030\001" + " \001(\0132).google.privacy.dlp.v2.ReplaceValueConfigH\000\022<\n\r" + "redact_config\030\002 \001(\0132#.google.privacy.dlp.v2.RedactConfigH\000\022K\n" - + "\025character_mask_config\030\003" - + " \001(\0132*.google.privacy.dlp.v2.CharacterMaskConfigH\000\022Y\n" - + "\035crypto_replace_ffx_fpe_config\030\004 \001(\01320.google.pr" - + "ivacy.dlp.v2.CryptoReplaceFfxFpeConfigH\000\022V\n" - + "\033fixed_size_bucketing_config\030\005 \001(\0132/." - + "google.privacy.dlp.v2.FixedSizeBucketingConfigH\000\022B\n" + + "\025character_mask_config\030\003 \001(\0132*.goog" + + "le.privacy.dlp.v2.CharacterMaskConfigH\000\022Y\n" + + "\035crypto_replace_ffx_fpe_config\030\004 \001(\01320" + + ".google.privacy.dlp.v2.CryptoReplaceFfxFpeConfigH\000\022V\n" + + "\033fixed_size_bucketing_config\030\005" + + " \001(\0132/.google.privacy.dlp.v2.FixedSizeBucketingConfigH\000\022B\n" + "\020bucketing_config\030\006" + " \001(\0132&.google.privacy.dlp.v2.BucketingConfigH\000\022Y\n" - + "\035replace_with_info_type_config\030\007 \001(\01320.go" - + "ogle.privacy.dlp.v2.ReplaceWithInfoTypeConfigH\000\022A\n" - + "\020time_part_config\030\010" - + " \001(\0132%.google.privacy.dlp.v2.TimePartConfigH\000\022E\n" + + "\035replace_with_info_type_config\030\007" + + " \001(\01320.google.privacy.dlp.v2.ReplaceWithInfoTypeConfigH\000\022A\n" + + "\020time_part_config\030\010 " + + "\001(\0132%.google.privacy.dlp.v2.TimePartConfigH\000\022E\n" + "\022crypto_hash_config\030\t" + " \001(\0132\'.google.privacy.dlp.v2.CryptoHashConfigH\000\022C\n" + "\021date_shift_config\030\013" @@ -2159,15 +2171,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\022ReplaceValueConfig\022/\n" + "\tnew_value\030\001 \001(\0132\034.google.privacy.dlp.v2.Value\"q\n" + "\027ReplaceDictionaryConfig\022N\n" - + "\tword_list\030\001" - + " \001(\01329.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordListH\000B\006\n" + + "\tword_list\030\001 \001(\01329.google.priva" + + "cy.dlp.v2.CustomInfoType.Dictionary.WordListH\000B\006\n" + "\004type\"\033\n" + "\031ReplaceWithInfoTypeConfig\"\016\n" + "\014RedactConfig\"\266\002\n\r" + "CharsToIgnore\022\034\n" + "\022characters_to_skip\030\001 \001(\tH\000\022_\n" - + "\033common_characters_to_ignore\030\002" - + " \001(\01628.google.privacy.dlp.v2.CharsToIgnore.CommonCharsToIgnoreH\000\"\227\001\n" + + "\033common_characters_to_ignore\030\002 \001(\01628.google.privac" + + "y.dlp.v2.CharsToIgnore.CommonCharsToIgnoreH\000\"\227\001\n" + "\023CommonCharsToIgnore\022&\n" + "\"COMMON_CHARS_TO_IGNORE_UNSPECIFIED\020\000\022\013\n" + "\007NUMERIC\020\001\022\024\n" @@ -2178,8 +2190,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "characters\"\243\001\n" + "\023CharacterMaskConfig\022\031\n" + "\021masking_character\030\001 \001(\t\022\026\n" - + "\016number_to_mask\030\002 \001(\005\022\025\n" - + "\r" + + "\016number_to_mask\030\002 \001(\005\022\025\n\r" + "reverse_order\030\003 \001(\010\022B\n" + "\024characters_to_ignore\030\004" + " \003(\0132$.google.privacy.dlp.v2.CharsToIgnore\"\244\001\n" @@ -2200,8 +2211,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\031CryptoReplaceFfxFpeConfig\0229\n\n" + "crypto_key\030\001 \001(\0132 .google.privacy.dlp.v2.CryptoKeyB\003\340A\002\022/\n" + "\007context\030\002 \001(\0132\036.google.privacy.dlp.v2.FieldId\022c\n" - + "\017common_alphabet\030\004 \001(\0162H.google.privacy.d" - + "lp.v2.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabetH\000\022\031\n" + + "\017common_alphabet\030\004 \001(\0162H.google" + + ".privacy.dlp.v2.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabetH\000\022\031\n" + "\017custom_alphabet\030\005 \001(\tH\000\022\017\n" + "\005radix\030\006 \001(\005H\000\022<\n" + "\023surrogate_info_type\030\010" @@ -2233,12 +2244,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "crypto_key\030\004 \001(\0132 .google.privacy.dlp.v2.CryptoKeyH\000B\010\n" + "\006method\"\245\002\n" + "\027InfoTypeTransformations\022c\n" - + "\017transformations\030\001 \003(\0132E.go" - + "ogle.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformationB\003\340A\002\032\244\001\n" + + "\017transformations\030\001 \003(\0132E.google.privacy.dlp.v2.InfoTypeTr" + + "ansformations.InfoTypeTransformationB\003\340A\002\032\244\001\n" + "\026InfoTypeTransformation\0223\n\n" + "info_types\030\001 \003(\0132\037.google.privacy.dlp.v2.InfoType\022U\n" - + "\030primitive_transformation\030\002 \001(\0132..google.priva" - + "cy.dlp.v2.PrimitiveTransformationB\003\340A\002\"\300\002\n" + + "\030primitive_transformation\030\002 \001(\0132..go" + + "ogle.privacy.dlp.v2.PrimitiveTransformationB\003\340A\002\"\300\002\n" + "\023FieldTransformation\0223\n" + "\006fields\030\001 \003(\0132\036.google.privacy.dlp.v2.FieldIdB\003\340A\002\0229\n" + "\tcondition\030\003 \001(\0132&.google.privacy.dlp.v2.RecordCondition\022R\n" @@ -2259,41 +2270,40 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + " \001(\01322.google.privacy.dlp.v2.RecordCondition.Expressions\032\256\001\n" + "\tCondition\0222\n" + "\005field\030\001 \001(\0132\036.google.privacy.dlp.v2.FieldIdB\003\340A\002\022@\n" - + "\010operator\030\003 \001(\0162).google." - + "privacy.dlp.v2.RelationalOperatorB\003\340A\002\022+\n" + + "\010operator\030\003 \001(\016" + + "2).google.privacy.dlp.v2.RelationalOperatorB\003\340A\002\022+\n" + "\005value\030\004 \001(\0132\034.google.privacy.dlp.v2.Value\032R\n\n" + "Conditions\022D\n\n" - + "conditions\030\001 \003(\01320." - + "google.privacy.dlp.v2.RecordCondition.Condition\032\372\001\n" + + "conditions\030\001" + + " \003(\01320.google.privacy.dlp.v2.RecordCondition.Condition\032\372\001\n" + "\013Expressions\022\\\n" - + "\020logical_operator\030\001" - + " \001(\0162B.google.privacy.dlp.v2.RecordCondition.Expressions.LogicalOperator\022G\n" - + "\n" - + "conditions\030\003" - + " \001(\01321.google.privacy.dlp.v2.RecordCondition.ConditionsH\000\"<\n" + + "\020logical_operator\030\001 \001(\0162B.google.privacy.dlp" + + ".v2.RecordCondition.Expressions.LogicalOperator\022G\n\n" + + "conditions\030\003 \001(\01321.google.pri" + + "vacy.dlp.v2.RecordCondition.ConditionsH\000\"<\n" + "\017LogicalOperator\022 \n" + "\034LOGICAL_OPERATOR_UNSPECIFIED\020\000\022\007\n" + "\003AND\020\001B\006\n" + "\004type\"\203\001\n" + "\026TransformationOverview\022\031\n" + "\021transformed_bytes\030\002 \001(\003\022N\n" - + "\030transformation_summaries\030\003" - + " \003(\0132,.google.privacy.dlp.v2.TransformationSummary\"\237\005\n" + + "\030transformation_summaries\030\003 \003(\0132," + + ".google.privacy.dlp.v2.TransformationSummary\"\237\005\n" + "\025TransformationSummary\0222\n" + "\tinfo_type\030\001 \001(\0132\037.google.privacy.dlp.v2.InfoType\022-\n" + "\005field\030\002 \001(\0132\036.google.privacy.dlp.v2.FieldId\022F\n" - + "\016transformation\030\003" - + " \001(\0132..google.privacy.dlp.v2.PrimitiveTransformation\022I\n" + + "\016transformation\030\003 \001(\0132..goog" + + "le.privacy.dlp.v2.PrimitiveTransformation\022I\n" + "\025field_transformations\030\005" + " \003(\0132*.google.privacy.dlp.v2.FieldTransformation\022A\n" + "\017record_suppress\030\006 \001(\0132(.google.privacy.dlp.v2.RecordSuppression\022K\n" - + "\007results\030\004 \003(\0132:.google." - + "privacy.dlp.v2.TransformationSummary.SummaryResult\022\031\n" + + "\007results\030\004 \003(\013" + + "2:.google.privacy.dlp.v2.TransformationSummary.SummaryResult\022\031\n" + "\021transformed_bytes\030\007 \001(\003\032\204\001\n\r" + "SummaryResult\022\r\n" + "\005count\030\001 \001(\003\022S\n" - + "\004code\030\002" - + " \001(\0162E.google.privacy.dlp.v2.TransformationSummary.TransformationResultCode\022\017\n" + + "\004code\030\002 \001(\0162E.google.privacy.dlp.v2.T" + + "ransformationSummary.TransformationResultCode\022\017\n" + "\007details\030\003 \001(\t\"^\n" + "\030TransformationResultCode\022*\n" + "&TRANSFORMATION_RESULT_CODE_UNSPECIFIED\020\000\022\013\n" @@ -2307,10 +2317,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\025TransformationDetails\022\025\n\r" + "resource_name\030\001 \001(\t\022\026\n" + "\016container_name\030\002 \001(\t\022H\n" - + "\016transformation\030\003" - + " \003(\01320.google.privacy.dlp.v2.TransformationDescription\022I\n" - + "\016status_details\030\004" - + " \001(\01321.google.privacy.dlp.v2.TransformationResultStatus\022\031\n" + + "\016transformation\030\003 \003(\01320.goo" + + "gle.privacy.dlp.v2.TransformationDescription\022I\n" + + "\016status_details\030\004 \001(\01321.google.pr" + + "ivacy.dlp.v2.TransformationResultStatus\022\031\n" + "\021transformed_bytes\030\005 \001(\003\022N\n" + "\027transformation_location\030\006" + " \001(\0132-.google.privacy.dlp.v2.TransformationLocation\"\331\001\n" @@ -2326,8 +2336,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\023container_timestamp\030\002 \001(\0132\032.google.protobuf.Timestamp\022\031\n" + "\021container_version\030\003 \001(\t\"\224\001\n" + "\032TransformationResultStatus\022Q\n" - + "\022result_status_type\030\001" - + " \001(\01625.google.privacy.dlp.v2.TransformationResultStatusType\022#\n" + + "\022result_status_type\030\001 \001(\01625.google.privac" + + "y.dlp.v2.TransformationResultStatusType\022#\n" + "\007details\030\002 \001(\0132\022.google.rpc.Status\"c\n" + "\"TransformationDetailsStorageConfig\0225\n" + "\005table\030\001 \001(\0132$.google.privacy.dlp.v2.BigQueryTableH\000B\006\n" @@ -2343,30 +2353,29 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\013description\030\003 \001(\t\0224\n" + "\013create_time\030\004 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n" + "\013update_time\030\005 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\022<\n" - + "\016inspect_config\030\006 \001(\0132$" - + ".google.privacy.dlp.v2.InspectConfig:\306\002\352A\302\002\n" - + "\"dlp.googleapis.com/InspectTemplate\022@organizations/{organization}/inspectTem" - + "plates/{inspect_template}\0226projects/{project}/inspectTemplates/{inspect_template" - + "}\022Uorganizations/{organization}/locations/{location}/inspectTemplates/{inspect_t" - + "emplate}\022Kprojects/{project}/locations/{" - + "location}/inspectTemplates/{inspect_template}\"\346\004\n" + + "\016inspect_config\030\006" + + " \001(\0132$.google.privacy.dlp.v2.InspectConfig:\306\002\352A\302\002\n" + + "\"dlp.googleapis.com/InspectTemplate\022@organizations/{organization}/" + + "inspectTemplates/{inspect_template}\0226projects/{project}/inspectTemplates/{inspec" + + "t_template}\022Uorganizations/{organization}/locations/{location}/inspectTemplates/" + + "{inspect_template}\022Kprojects/{project}/l" + + "ocations/{location}/inspectTemplates/{inspect_template}\"\346\004\n" + "\022DeidentifyTemplate\022\021\n" + "\004name\030\001 \001(\tB\003\340A\003\022\024\n" + "\014display_name\030\002 \001(\t\022\023\n" + "\013description\030\003 \001(\t\0224\n" + "\013create_time\030\004 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n" + "\013update_time\030\005 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\022B\n" - + "\021deidentify_config\030\006" - + " \001(\0132\'.google.privacy.dlp.v2.DeidentifyConfig:\341\002\352A\335\002\n" - + "%dlp.googleapis.com/DeidentifyTemplate\022Forgani" - + "zations/{organization}/deidentifyTemplates/{deidentify_template}\022\n" - + "\013inspect_job\030\004 \001(\0132\'.go" - + "ogle.privacy.dlp.v2.InspectJobConfigH\000\022;\n" + + "\013inspect_job\030\004" + + " \001(\0132\'.google.privacy.dlp.v2.InspectJobConfigH\000\022;\n" + "\010triggers\030\005 \003(\0132).google.privacy.dlp.v2.JobTrigger.Trigger\0221\n" + "\006errors\030\006 \003(\0132\034.google.privacy.dlp.v2.ErrorB\003\340A\003\0224\n" + "\013create_time\030\007 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n" @@ -2392,33 +2401,33 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\007trigger\"H\n" + "\006Status\022\026\n" + "\022STATUS_UNSPECIFIED\020\000\022\013\n" - + "\007HEALTHY\020\001\022\n\n" + + "\007HEALTHY\020\001\022\n" + + "\n" + "\006PAUSED\020\002\022\r\n" + "\tCANCELLED\020\003:\224\001\352A\220\001\n" - + "\035dlp.googleapis.com/JobTrigger\022,projects/{project}/jobTri" - + "ggers/{job_trigger}\022Aprojects/{project}/" - + "locations/{location}/jobTriggers/{job_trigger}B\005\n" + + "\035dlp.googleapis.com/JobTrigger\022,projects/{proje" + + "ct}/jobTriggers/{job_trigger}\022Aprojects/" + + "{project}/locations/{location}/jobTriggers/{job_trigger}B\005\n" + "\003job\"\202\n\n" + "\006Action\022C\n\r" + "save_findings\030\001" + " \001(\0132*.google.privacy.dlp.v2.Action.SaveFindingsH\000\022@\n" - + "\007pub_sub\030\002 \001(\0132-.google." - + "privacy.dlp.v2.Action.PublishToPubSubH\000\022U\n" - + "\027publish_summary_to_cscc\030\003 \001(\01322.googl" - + "e.privacy.dlp.v2.Action.PublishSummaryToCsccH\000\022u\n" - + "&publish_findings_to_cloud_data_catalog\030\005 \001(\0132?.google.privacy.dlp.v2.A" - + "ction.PublishFindingsToCloudDataCatalogB\002\030\001H\000\022n\n" + + "\007pub_sub\030\002 \001(\013" + + "2-.google.privacy.dlp.v2.Action.PublishToPubSubH\000\022U\n" + + "\027publish_summary_to_cscc\030\003 \001" + + "(\01322.google.privacy.dlp.v2.Action.PublishSummaryToCsccH\000\022u\n" + + "&publish_findings_to_cloud_data_catalog\030\005 \001(\0132?.google.privac" + + "y.dlp.v2.Action.PublishFindingsToCloudDataCatalogB\002\030\001H\000\022n\n" + "$publish_findings_to_dataplex_catalog\030\n" - + " \001(\0132>.google.privacy.dlp.v2.Action.PublishFindingsToDataplexCatalogH\000\022>\n" - + "\n" + + " \001(\0132>.google.privacy.d" + + "lp.v2.Action.PublishFindingsToDataplexCatalogH\000\022>\n\n" + "deidentify\030\007 \001(\0132(.google.privacy.dlp.v2.Action.DeidentifyH\000\022V\n" - + "\027job_notification_emails\030\010" - + " \001(\01323.google.privacy.dlp.v2.Action.JobNotificationEmailsH\000\022T\n" - + "\026publish_to_stackdriver\030\t" - + " \001(\01322.google.privacy.dlp.v2.Action.PublishToStackdriverH\000\032Q\n" + + "\027job_notification_emails\030\010 \001(\01323.google.privac", + "y.dlp.v2.Action.JobNotificationEmailsH\000\022T\n" + + "\026publish_to_stackdriver\030\t \001(\01322.google" + + ".privacy.dlp.v2.Action.PublishToStackdriverH\000\032Q\n" + "\014SaveFindings\022A\n\r" - + "output_config\030\001 \001(\0132*.google.privacy.dlp.v2.OutputStorageConfig\032 ", - "\n" + + "output_config\030\001 \001(\0132*.google.privacy.dlp.v2.OutputStorageConfig\032 \n" + "\017PublishToPubSub\022\r\n" + "\005topic\030\001 \001(\t\032\026\n" + "\024PublishSummaryToCscc\032#\n" @@ -2427,8 +2436,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "Deidentify\022J\n" + "\025transformation_config\030\007" + " \001(\0132+.google.privacy.dlp.v2.TransformationConfig\022h\n" - + "%transformation_details_storage_config\030\003 \001(\01329.google.pri" - + "vacy.dlp.v2.TransformationDetailsStorageConfig\022#\n" + + "%transformation_details_storage_config\030\003 \001(\01329." + + "google.privacy.dlp.v2.TransformationDetailsStorageConfig\022#\n" + "\024cloud_storage_output\030\t \001(\tB\003\340A\002H\000\022@\n" + "\027file_types_to_transform\030\010" + " \003(\0162\037.google.privacy.dlp.v2.FileTypeB\010\n" @@ -2463,15 +2472,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\010order_by\030\004 \001(\t\022\023\n" + "\013location_id\030\005 \001(\t\"z\n" + "\034ListInspectTemplatesResponse\022A\n" - + "\021inspect_templates\030\001" - + " \003(\0132&.google.privacy.dlp.v2.InspectTemplate\022\027\n" + + "\021inspect_templates\030\001 \003(\013" + + "2&.google.privacy.dlp.v2.InspectTemplate\022\027\n" + "\017next_page_token\030\002 \001(\t\"X\n" + "\034DeleteInspectTemplateRequest\0228\n" + "\004name\030\001 \001(\tB*\340A\002\372A$\n" + "\"dlp.googleapis.com/InspectTemplate\"\266\001\n" + "\027CreateJobTriggerRequest\0225\n" - + "\006parent\030\001 \001(" - + "\tB%\340A\002\372A\037\022\035dlp.googleapis.com/JobTrigger\022;\n" + + "\006parent\030\001 \001(\tB" + + "%\340A\002\372A\037\022\035dlp.googleapis.com/JobTrigger\022;\n" + "\013job_trigger\030\002" + " \001(\0132!.google.privacy.dlp.v2.JobTriggerB\003\340A\002\022\022\n\n" + "trigger_id\030\003 \001(\t\022\023\n" @@ -2490,8 +2499,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\034CreateDiscoveryConfigRequest\022:\n" + "\006parent\030\001 \001(" + "\tB*\340A\002\372A$\022\"dlp.googleapis.com/DiscoveryConfig\022E\n" - + "\020discovery_config\030\002 \001(\0132&.goo" - + "gle.privacy.dlp.v2.DiscoveryConfigB\003\340A\002\022\021\n" + + "\020discovery_config\030\002" + + " \001(\0132&.google.privacy.dlp.v2.DiscoveryConfigB\003\340A\002\022\021\n" + "\tconfig_id\030\003 \001(\t\"\320\001\n" + "\034UpdateDiscoveryConfigRequest\0228\n" + "\004name\030\001 \001(\tB*\340A\002\372A$\n" @@ -2519,8 +2528,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\006parent\030\001 \001(\tB!\340A\002\372A\033\022\031dlp.googleapis.com/DlpJob\022>\n" + "\013inspect_job\030\002" + " \001(\0132\'.google.privacy.dlp.v2.InspectJobConfigH\000\022@\n" - + "\010risk_job\030\003 \001(\0132,.g" - + "oogle.privacy.dlp.v2.RiskAnalysisJobConfigH\000\022\016\n" + + "\010risk_job\030\003" + + " \001(\0132,.google.privacy.dlp.v2.RiskAnalysisJobConfigH\000\022\016\n" + "\006job_id\030\004 \001(\t\022\023\n" + "\013location_id\030\005 \001(\tB\005\n" + "\003job\"\336\001\n" @@ -2547,16 +2556,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\021DataProfileAction\022F\n" + "\013export_data\030\001" + " \001(\0132/.google.privacy.dlp.v2.DataProfileAction.ExportH\000\022[\n" - + "\024pub_sub_notification\030\002" - + " \001(\0132;.google.privacy.dlp.v2.DataProfileAction.PubSubNotificationH\000\022[\n" - + "\024publish_to_chronicle\030\003 \001(\0132;.google.privacy" - + ".dlp.v2.DataProfileAction.PublishToChronicleH\000\022a\n" - + "\016publish_to_scc\030\004 \001(\0132G.google." - + "privacy.dlp.v2.DataProfileAction.PublishToSecurityCommandCenterH\000\022N\n\r" + + "\024pub_sub_notification\030\002 \001(\0132;.google.privacy.dl" + + "p.v2.DataProfileAction.PubSubNotificationH\000\022[\n" + + "\024publish_to_chronicle\030\003 \001(\0132;.goog" + + "le.privacy.dlp.v2.DataProfileAction.PublishToChronicleH\000\022a\n" + + "\016publish_to_scc\030\004 \001(\013" + + "2G.google.privacy.dlp.v2.DataProfileAction.PublishToSecurityCommandCenterH\000\022N\n\r" + "tag_resources\030\010" + " \001(\01325.google.privacy.dlp.v2.DataProfileAction.TagResourcesH\000\022h\n" - + "\033publish_to_dataplex_catalog\030\t \001(\0132A.google.privacy." - + "dlp.v2.DataProfileAction.PublishToDataplexCatalogH\000\032\212\001\n" + + "\033publish_to_dataplex_catalog\030\t \001(\0132A.googl" + + "e.privacy.dlp.v2.DataProfileAction.PublishToDataplexCatalogH\000\032\212\001\n" + "\006Export\022;\n\r" + "profile_table\030\001 \001(\0132$.google.privacy.dlp.v2.BigQueryTable\022C\n" + "\025sample_findings_table\030\002" @@ -2564,10 +2573,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\022PubSubNotification\022\r\n" + "\005topic\030\001 \001(\t\022A\n" + "\005event\030\002 \001(\01622.google.privacy.dlp.v2.DataProfileAction.EventType\022K\n" - + "\020pubsub_condition\030\003 " - + "\001(\01321.google.privacy.dlp.v2.DataProfilePubSubCondition\022b\n" - + "\021detail_of_message\030\004 \001(" - + "\0162G.google.privacy.dlp.v2.DataProfileAction.PubSubNotification.DetailLevel\"i\n" + + "\020pubsub_condition\030\003" + + " \001(\01321.google.privacy.dlp.v2.DataProfilePubSubCondition\022b\n" + + "\021detail_of_message\030\004 \001(\0162G.google.privacy.dlp.v2.Data" + + "ProfileAction.PubSubNotification.DetailLevel\"i\n" + "\013DetailLevel\022\034\n" + "\030DETAIL_LEVEL_UNSPECIFIED\020\000\022\021\n\r" + "TABLE_PROFILE\020\001\022\021\n\r" @@ -2578,16 +2587,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\030PublishToDataplexCatalog\022\036\n" + "\026lower_data_risk_to_low\030\001 \001(\010\032\266\003\n" + "\014TagResources\022Z\n" - + "\016tag_conditions\030\001 \003(\0132B.google.privacy.dlp." - + "v2.DataProfileAction.TagResources.TagCondition\022L\n" - + "\032profile_generations_to_tag\030\002 \003" - + "(\0162(.google.privacy.dlp.v2.ProfileGeneration\022\036\n" + + "\016tag_conditions\030\001 \003(\0132B.google.pr" + + "ivacy.dlp.v2.DataProfileAction.TagResources.TagCondition\022L\n" + + "\032profile_generations_to_tag\030\002" + + " \003(\0162(.google.privacy.dlp.v2.ProfileGeneration\022\036\n" + "\026lower_data_risk_to_low\030\003 \001(\010\032\251\001\n" + "\014TagCondition\022K\n" - + "\003tag\030\001 \001(\0132>.google.priv" - + "acy.dlp.v2.DataProfileAction.TagResources.TagValue\022D\n" - + "\021sensitivity_score\030\002 \001(\0132\'." - + "google.privacy.dlp.v2.SensitivityScoreH\000B\006\n" + + "\003tag\030\001 \001(\0132>.g" + + "oogle.privacy.dlp.v2.DataProfileAction.TagResources.TagValue\022D\n" + + "\021sensitivity_score\030\002" + + " \001(\0132\'.google.privacy.dlp.v2.SensitivityScoreH\000B\006\n" + "\004type\0320\n" + "\010TagValue\022\032\n" + "\020namespaced_value\030\001 \001(\tH\000B\010\n" @@ -2623,11 +2632,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\024DataProfileJobConfig\022<\n" + "\010location\030\001 \001(\0132*.google.privacy.dlp.v2.DataProfileLocation\022\022\n\n" + "project_id\030\005 \001(\t\022a\n" - + "\035other_cloud_starting_location\030\010 \001" - + "(\0132:.google.privacy.dlp.v2.OtherCloudDiscoveryStartingLocation\022\031\n" + + "\035other_cloud_starting_location\030\010" + + " \001(\0132:.google.privacy.dlp.v2.OtherCloudDiscoveryStartingLocation\022\031\n" + "\021inspect_templates\030\007 \003(\t\022F\n" - + "\024data_profile_actions\030\006 \003(\0132" - + "(.google.privacy.dlp.v2.DataProfileAction\"[\n\r" + + "\024data_profile_actions\030\006" + + " \003(\0132(.google.privacy.dlp.v2.DataProfileAction\"[\n\r" + "BigQueryRegex\022\030\n" + "\020project_id_regex\030\001 \001(\t\022\030\n" + "\020dataset_id_regex\030\002 \001(\t\022\026\n" @@ -2645,8 +2654,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\004name\030\001 \001(\t\022\024\n" + "\014display_name\030\013 \001(\t\022D\n\n" + "org_config\030\002 \001(\01320.google.privacy.dlp.v2.DiscoveryConfig.OrgConfig\022a\n" - + "\035other_cloud_starting_location\030\014 \001(\0132:.google.pr" - + "ivacy.dlp.v2.OtherCloudDiscoveryStartingLocation\022\031\n" + + "\035other_cloud_starting_location\030\014 \001(\0132:" + + ".google.privacy.dlp.v2.OtherCloudDiscoveryStartingLocation\022\031\n" + "\021inspect_templates\030\003 \003(\t\0229\n" + "\007actions\030\004 \003(\0132(.google.privacy.dlp.v2.DataProfileAction\0227\n" + "\007targets\030\005 \003(\0132&.google.privacy.dlp.v2.DiscoveryTarget\0221\n" @@ -2660,43 +2669,43 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\023processing_location\030\r" + " \001(\0132).google.privacy.dlp.v2.ProcessingLocationB\003\340A\001\032c\n" + "\tOrgConfig\022B\n" - + "\010location\030\001" - + " \001(\01320.google.privacy.dlp.v2.DiscoveryStartingLocation\022\022\n\n" + + "\010location\030\001 \001(\01320.googl" + + "e.privacy.dlp.v2.DiscoveryStartingLocation\022\022\n\n" + "project_id\030\002 \001(\t\"9\n" + "\006Status\022\026\n" + "\022STATUS_UNSPECIFIED\020\000\022\013\n" + "\007RUNNING\020\001\022\n\n" + "\006PAUSED\020\002:t\352Aq\n" - + "\"dlp.googleapis.com/DiscoveryConfig\022Kprojec" - + "ts/{project}/locations/{location}/discoveryConfigs/{discovery_config}\"\366\003\n" + + "\"dlp.googleapis.com/DiscoveryConfig\022Kprojects/{project}/locations/{locati" + + "on}/discoveryConfigs/{discovery_config}\"\366\003\n" + "\017DiscoveryTarget\022J\n" - + "\020big_query_target\030\001 \001(\0132..go" - + "ogle.privacy.dlp.v2.BigQueryDiscoveryTargetH\000\022J\n" - + "\020cloud_sql_target\030\002 \001(\0132..google" - + ".privacy.dlp.v2.CloudSqlDiscoveryTargetH\000\022G\n" - + "\016secrets_target\030\003" - + " \001(\0132-.google.privacy.dlp.v2.SecretsDiscoveryTargetH\000\022R\n" - + "\024cloud_storage_target\030\004 \001(\01322.google.privac" - + "y.dlp.v2.CloudStorageDiscoveryTargetH\000\022N\n" - + "\022other_cloud_target\030\005 \001(\01320.google.priv" - + "acy.dlp.v2.OtherCloudDiscoveryTargetH\000\022T\n" - + "\025vertex_dataset_target\030\007 \001(\01323.google.p" - + "rivacy.dlp.v2.VertexDatasetDiscoveryTargetH\000B\010\n" + + "\020big_query_target\030\001" + + " \001(\0132..google.privacy.dlp.v2.BigQueryDiscoveryTargetH\000\022J\n" + + "\020cloud_sql_target\030\002 \001(" + + "\0132..google.privacy.dlp.v2.CloudSqlDiscoveryTargetH\000\022G\n" + + "\016secrets_target\030\003 \001(\0132-.go" + + "ogle.privacy.dlp.v2.SecretsDiscoveryTargetH\000\022R\n" + + "\024cloud_storage_target\030\004 \001(\01322.goo" + + "gle.privacy.dlp.v2.CloudStorageDiscoveryTargetH\000\022N\n" + + "\022other_cloud_target\030\005 \001(\01320.g" + + "oogle.privacy.dlp.v2.OtherCloudDiscoveryTargetH\000\022T\n" + + "\025vertex_dataset_target\030\007 \001(\0132" + + "3.google.privacy.dlp.v2.VertexDatasetDiscoveryTargetH\000B\010\n" + "\006target\"\256\002\n" + "\027BigQueryDiscoveryTarget\022C\n" - + "\006filter\030\001" - + " \001(\0132..google.privacy.dlp.v2.DiscoveryBigQueryFilterB\003\340A\002\022F\n\n" + + "\006filter\030\001 \001(\0132..google.pr" + + "ivacy.dlp.v2.DiscoveryBigQueryFilterB\003\340A\002\022F\n\n" + "conditions\030\002" + " \001(\01322.google.privacy.dlp.v2.DiscoveryBigQueryConditions\022D\n" - + "\007cadence\030\003 \001(\013" - + "21.google.privacy.dlp.v2.DiscoveryGenerationCadenceH\000\0223\n" + + "\007cadence\030\003" + + " \001(\01321.google.privacy.dlp.v2.DiscoveryGenerationCadenceH\000\0223\n" + "\010disabled\030\004 \001(\0132\037.google.privacy.dlp.v2.DisabledH\000B\013\n" + "\tfrequency\"\240\002\n" + "\027DiscoveryBigQueryFilter\022@\n" - + "\006tables\030\001 " - + "\001(\0132..google.privacy.dlp.v2.BigQueryTableCollectionH\000\022]\n" - + "\014other_tables\030\002 \001(\0132E.go" - + "ogle.privacy.dlp.v2.DiscoveryBigQueryFilter.AllOtherBigQueryTablesH\000\022@\n" + + "\006tables\030\001" + + " \001(\0132..google.privacy.dlp.v2.BigQueryTableCollectionH\000\022]\n" + + "\014other_tables\030\002 \001(\0132E.google.privacy.dlp.v2.DiscoveryB" + + "igQueryFilter.AllOtherBigQueryTablesH\000\022@\n" + "\017table_reference\030\003" + " \001(\0132%.google.privacy.dlp.v2.TableReferenceH\000\032\030\n" + "\026AllOtherBigQueryTablesB\010\n" @@ -2705,36 +2714,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\017include_regexes\030\001 \001(\0132&.google.privacy.dlp.v2.BigQueryRegexesH\000B" + "\t\n" + "\007pattern\"\230\003\n" - + "\033DiscoveryBigQueryConditions\0221\n\r" + + "\033DiscoveryBigQueryConditions\0221\n" + + "\r" + "created_after\030\001 \001(\0132\032.google.protobuf.Timestamp\022:\n" + "\005types\030\002 \001(\0132).google.privacy.dlp.v2.BigQueryTableTypesH\000\022M\n" - + "\017type_collection\030\003 " - + "\001(\01622.google.privacy.dlp.v2.BigQueryTableTypeCollectionH\000\022V\n\r" - + "or_conditions\030\004 \001(\013" - + "2?.google.privacy.dlp.v2.DiscoveryBigQueryConditions.OrConditions\032Q\n" + + "\017type_collection\030\003" + + " \001(\01622.google.privacy.dlp.v2.BigQueryTableTypeCollectionH\000\022V\n\r" + + "or_conditions\030\004" + + " \001(\0132?.google.privacy.dlp.v2.DiscoveryBigQueryConditions.OrConditions\032Q\n" + "\014OrConditions\022\025\n\r" + "min_row_count\030\001 \001(\005\022*\n" + "\007min_age\030\002 \001(\0132\031.google.protobuf.DurationB\020\n" + "\016included_types\"\203\003\n" + "\032DiscoveryGenerationCadence\022V\n" - + "\027schema_modified_cadence\030\001 \001(\01325.google." - + "privacy.dlp.v2.DiscoverySchemaModifiedCadence\022T\n" - + "\026table_modified_cadence\030\002 \001(\01324." - + "google.privacy.dlp.v2.DiscoveryTableModifiedCadence\022i\n" - + "!inspect_template_modified_cadence\030\003 \001(\0132>.google.privacy.dlp.v2.D" - + "iscoveryInspectTemplateModifiedCadence\022L\n" - + "\021refresh_frequency\030\004" - + " \001(\01621.google.privacy.dlp.v2.DataProfileUpdateFrequency\"\246\001\n" + + "\027schema_modified_cadence\030\001 \001(\013" + + "25.google.privacy.dlp.v2.DiscoverySchemaModifiedCadence\022T\n" + + "\026table_modified_cadence\030\002" + + " \001(\01324.google.privacy.dlp.v2.DiscoveryTableModifiedCadence\022i\n" + + "!inspect_template_modified_cadence\030\003 \001(\0132>.google.privac" + + "y.dlp.v2.DiscoveryInspectTemplateModifiedCadence\022L\n" + + "\021refresh_frequency\030\004 \001(\01621.go" + + "ogle.privacy.dlp.v2.DataProfileUpdateFrequency\"\246\001\n" + "\035DiscoveryTableModifiedCadence\022?\n" + "\005types\030\001 \003(\01620.google.privacy.dlp.v2.BigQueryTableModification\022D\n" - + "\tfrequency\030\002 \001(\01621.goo" - + "gle.privacy.dlp.v2.DataProfileUpdateFrequency\"\250\001\n" + + "\tfrequency\030\002" + + " \001(\01621.google.privacy.dlp.v2.DataProfileUpdateFrequency\"\250\001\n" + "\036DiscoverySchemaModifiedCadence\022@\n" + "\005types\030\001 \003(\01621.google.privacy.dlp.v2.BigQuerySchemaModification\022D\n" + "\tfrequency\030\002 \001(\01621.google.privacy.dlp.v2.DataProfileUpdateFrequency\"o\n" + "\'DiscoveryInspectTemplateModifiedCadence\022D\n" - + "\tfrequency\030\001 \001(\01621" - + ".google.privacy.dlp.v2.DataProfileUpdateFrequency\"\277\002\n" + + "\tfrequency\030\001" + + " \001(\01621.google.privacy.dlp.v2.DataProfileUpdateFrequency\"\277\002\n" + "\027CloudSqlDiscoveryTarget\022C\n" + "\006filter\030\001" + " \001(\0132..google.privacy.dlp.v2.DiscoveryCloudSqlFilterB\003\340A\002\022F\n\n" @@ -2745,20 +2755,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\010disabled\030\004 \001(\0132\037.google.privacy.dlp.v2.DisabledH\000B\t\n" + "\007cadence\"\211\002\n" + "\027DiscoveryCloudSqlFilter\022G\n\n" - + "collection\030\001" - + " \001(\01321.google.privacy.dlp.v2.DatabaseResourceCollectionH\000\022B\n" + + "collection\030\001 \001(\01321.google.p" + + "rivacy.dlp.v2.DatabaseResourceCollectionH\000\022B\n" + "\006others\030\002" + " \001(\01320.google.privacy.dlp.v2.AllOtherDatabaseResourcesH\000\022W\n" - + "\033database_resource_reference\030\003" - + " \001(\01320.google.privacy.dlp.v2.DatabaseResourceReferenceH\000B\010\n" + + "\033database_resource_reference\030\003 \001(\01320.google.pri" + + "vacy.dlp.v2.DatabaseResourceReferenceH\000B\010\n" + "\006filter\"r\n" + "\032DatabaseResourceCollection\022I\n" + "\017include_regexes\030\001" + " \001(\0132..google.privacy.dlp.v2.DatabaseResourceRegexesH\000B\t\n" + "\007pattern\"Y\n" + "\027DatabaseResourceRegexes\022>\n" - + "\010patterns\030\001 \003(\013" - + "2,.google.privacy.dlp.v2.DatabaseResourceRegex\"\207\001\n" + + "\010patterns\030\001" + + " \003(\0132,.google.privacy.dlp.v2.DatabaseResourceRegex\"\207\001\n" + "\025DatabaseResourceRegex\022\030\n" + "\020project_id_regex\030\001 \001(\t\022\026\n" + "\016instance_regex\030\002 \001(\t\022\026\n" @@ -2771,10 +2781,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\010database\030\003 \001(\tB\003\340A\002\022\036\n" + "\021database_resource\030\004 \001(\tB\003\340A\002\"\332\003\n" + "\033DiscoveryCloudSqlConditions\022`\n" - + "\020database_engines\030\001" - + " \003(\0162A.google.privacy.dlp.v2.DiscoveryCloudSqlConditions.DatabaseEngineB\003\340A\001\022V\n" - + "\005types\030\003 \003(\0162G.google.privacy.dlp.v2.Disc" - + "overyCloudSqlConditions.DatabaseResourceType\"n\n" + + "\020database_engines\030\001 \003(\0162A.google.privacy.dlp.v2.D" + + "iscoveryCloudSqlConditions.DatabaseEngineB\003\340A\001\022V\n" + + "\005types\030\003 \003(\0162G.google.privacy.d" + + "lp.v2.DiscoveryCloudSqlConditions.DatabaseResourceType\"n\n" + "\016DatabaseEngine\022\037\n" + "\033DATABASE_ENGINE_UNSPECIFIED\020\000\022\"\n" + "\036ALL_SUPPORTED_DATABASE_ENGINES\020\001\022\t\n" @@ -2785,15 +2795,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "*DATABASE_RESOURCE_TYPE_ALL_SUPPORTED_TYPES\020\001\022 \n" + "\034DATABASE_RESOURCE_TYPE_TABLE\020\002\"\227\005\n" + "\"DiscoveryCloudSqlGenerationCadence\022p\n" - + "\027schema_modified_cadence\030\001 \001(\0132O.google.privacy.dlp.v2." - + "DiscoveryCloudSqlGenerationCadence.SchemaModifiedCadence\022L\n" - + "\021refresh_frequency\030\002 " - + "\001(\01621.google.privacy.dlp.v2.DataProfileUpdateFrequency\022i\n" - + "!inspect_template_modified_cadence\030\003 \001(\0132>.google.privacy.dlp.v" - + "2.DiscoveryInspectTemplateModifiedCadence\032\305\002\n" + + "\027schema_modified_cadence\030\001 \001(\0132O.google.priva" + + "cy.dlp.v2.DiscoveryCloudSqlGenerationCadence.SchemaModifiedCadence\022L\n" + + "\021refresh_frequency\030\002" + + " \001(\01621.google.privacy.dlp.v2.DataProfileUpdateFrequency\022i\n" + + "!inspect_template_modified_cadence\030\003 \001(\0132>.google.pri" + + "vacy.dlp.v2.DiscoveryInspectTemplateModifiedCadence\032\305\002\n" + "\025SchemaModifiedCadence\022y\n" - + "\005types\030\001 \003(\0162j.google.privacy.dlp.v2.DiscoveryClou" - + "dSqlGenerationCadence.SchemaModifiedCadence.CloudSqlSchemaModification\022D\n" + + "\005types\030\001 \003(\0162j.google.privacy.dlp.v2.Dis" + + "coveryCloudSqlGenerationCadence.SchemaMo" + + "difiedCadence.CloudSqlSchemaModification\022D\n" + "\tfrequency\030\002 \001(\01621.google.privacy.dlp.v2.DataProfileUpdateFrequency\"k\n" + "\032CloudSqlSchemaModification\022\'\n" + "#SQL_SCHEMA_MODIFICATION_UNSPECIFIED\020\000\022\017\n" @@ -2801,32 +2812,32 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\017REMOVED_COLUMNS\020\002\"\030\n" + "\026SecretsDiscoveryTarget\"\333\002\n" + "\033CloudStorageDiscoveryTarget\022G\n" - + "\006filter\030\001 " - + "\001(\01322.google.privacy.dlp.v2.DiscoveryCloudStorageFilterB\003\340A\002\022L\n\n" - + "conditions\030\004 \001(\013" - + "23.google.privacy.dlp.v2.DiscoveryFileStoreConditionsB\003\340A\001\022`\n" - + "\022generation_cadence\030\002" - + " \001(\0132=.google.privacy.dlp.v2.DiscoveryCloudStorageGenerationCadenceB\003\340A\001H\000\0228\n" + + "\006filter\030\001" + + " \001(\01322.google.privacy.dlp.v2.DiscoveryCloudStorageFilterB\003\340A\002\022L\n\n" + + "conditions\030\004" + + " \001(\01323.google.privacy.dlp.v2.DiscoveryFileStoreConditionsB\003\340A\001\022`\n" + + "\022generation_cadence\030\002 \001(\0132=.google.privacy.dlp.v2" + + ".DiscoveryCloudStorageGenerationCadenceB\003\340A\001H\000\0228\n" + "\010disabled\030\003 \001(\0132\037.google.privacy.dlp.v2.DisabledB\003\340A\001H\000B" + "\t\n" + "\007cadence\"\226\002\n" + "\033DiscoveryCloudStorageFilter\022E\n\n" - + "collection\030\001 \001(\0132*." - + "google.privacy.dlp.v2.FileStoreCollectionB\003\340A\001H\000\022e\n" - + " cloud_storage_resource_reference\030\002" - + " \001(\01324.google.privacy.dlp.v2.CloudStorageResourceReferenceB\003\340A\001H\000\022?\n" + + "collection\030\001" + + " \001(\0132*.google.privacy.dlp.v2.FileStoreCollectionB\003\340A\001H\000\022e\n" + + " cloud_storage_resource_reference\030\002 \001(\01324.google.privacy.dl" + + "p.v2.CloudStorageResourceReferenceB\003\340A\001H\000\022?\n" + "\006others\030d" + " \001(\0132(.google.privacy.dlp.v2.AllOtherResourcesB\003\340A\001H\000B\010\n" + "\006filter\"\247\001\n" + "\023FileStoreCollection\022G\n" - + "\017include_regexes\030\001 \001(\0132\'.go" - + "ogle.privacy.dlp.v2.FileStoreRegexesB\003\340A\001H\000\022<\n" + + "\017include_regexes\030\001" + + " \001(\0132\'.google.privacy.dlp.v2.FileStoreRegexesB\003\340A\001H\000\022<\n" + "\014include_tags\030\002 \001(\0132!.google.privacy.dlp.v2.TagFiltersB\003\340A\001B" + "\t\n" + "\007pattern\"P\n" + "\020FileStoreRegexes\022<\n" - + "\010patterns\030\001 \003(\0132%.goo" - + "gle.privacy.dlp.v2.FileStoreRegexB\003\340A\002\"p\n" + + "\010patterns\030\001" + + " \003(\0132%.google.privacy.dlp.v2.FileStoreRegexB\003\340A\002\"p\n" + "\016FileStoreRegex\022L\n" + "\023cloud_storage_regex\030\001" + " \001(\0132(.google.privacy.dlp.v2.CloudStorageRegexB\003\340A\001H\000B\020\n" @@ -2838,17 +2849,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\013bucket_name\030\001 \001(\tB\003\340A\002\022\027\n\n" + "project_id\030\002 \001(\tB\003\340A\002\"\353\001\n" + "&DiscoveryCloudStorageGenerationCadence\022Q\n" - + "\021refresh_frequency\030\001 \001(\01621.google." - + "privacy.dlp.v2.DataProfileUpdateFrequencyB\003\340A\001\022n\n" - + "!inspect_template_modified_cadence\030\002 \001(\0132>.google.privacy.dlp.v2.Discov" - + "eryInspectTemplateModifiedCadenceB\003\340A\001\"\233\005\n" + + "\021refresh_frequency\030\001 \001(\016" + + "21.google.privacy.dlp.v2.DataProfileUpdateFrequencyB\003\340A\001\022n\n" + + "!inspect_template_modified_cadence\030\002 \001(\0132>.google.privacy.dlp" + + ".v2.DiscoveryInspectTemplateModifiedCadenceB\003\340A\001\"\233\005\n" + "\037DiscoveryCloudStorageConditions\022{\n" - + "\032included_object_attributes\030\001 \003(\0162R.google." - + "privacy.dlp.v2.DiscoveryCloudStorageCond" - + "itions.CloudStorageObjectAttributeB\003\340A\002\022{\n" - + "\032included_bucket_attributes\030\002 \003(\0162R.go" - + "ogle.privacy.dlp.v2.DiscoveryCloudStorag" - + "eConditions.CloudStorageBucketAttributeB\003\340A\002\"\343\001\n" + + "\032included_object_attributes\030\001 \003(\016" + + "2R.google.privacy.dlp.v2.DiscoveryCloudS" + + "torageConditions.CloudStorageObjectAttributeB\003\340A\002\022{\n" + + "\032included_bucket_attributes\030\002 \003(\0162R.google.privacy.dlp.v2.DiscoveryC" + + "loudStorageConditions.CloudStorageBucketAttributeB\003\340A\002\"\343\001\n" + "\033CloudStorageObjectAttribute\022.\n" + "*CLOUD_STORAGE_OBJECT_ATTRIBUTE_UNSPECIFIED\020\000\022\031\n" + "\025ALL_SUPPORTED_OBJECTS\020\001\022\014\n" @@ -2867,531 +2877,437 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\034DiscoveryFileStoreConditions\0226\n\r" + "created_after\030\001 \001(\0132\032.google.protobuf.TimestampB\003\340A\001\022/\n" + "\007min_age\030\002 \001(\0132\031.google.protobuf.DurationB\003\340A\001\022_\n" - + "\030cloud_storage_conditions\030\003 \001(\013" - + "26.google.privacy.dlp.v2.DiscoveryCloudStorageConditionsB\003\340A\001H\000B\014\n\n" + + "\030cloud_storage_conditions\030\003" + + " \001(\01326.google.privacy.dlp.v2.DiscoveryCloudStorageConditionsB\003\340A\001H\000B\014\n\n" + "conditions\"\222\003\n" + "\031OtherCloudDiscoveryTarget\022D\n" + "\020data_source_type\030\001" + " \001(\0132%.google.privacy.dlp.v2.DataSourceTypeB\003\340A\002\022E\n" - + "\006filter\030\002 \001(\01320.goog" - + "le.privacy.dlp.v2.DiscoveryOtherCloudFilterB\003\340A\002\022M\n\n" - + "conditions\030\003 \001(\01324.google.pr" - + "ivacy.dlp.v2.DiscoveryOtherCloudConditionsB\003\340A\001\022Y\n" - + "\022generation_cadence\030\004 \001(\0132;.go" - + "ogle.privacy.dlp.v2.DiscoveryOtherCloudGenerationCadenceH\000\0223\n" + + "\006filter\030\002 " + + "\001(\01320.google.privacy.dlp.v2.DiscoveryOtherCloudFilterB\003\340A\002\022M\n\n" + + "conditions\030\003 \001(\01324" + + ".google.privacy.dlp.v2.DiscoveryOtherCloudConditionsB\003\340A\001\022Y\n" + + "\022generation_cadence\030\004" + + " \001(\0132;.google.privacy.dlp.v2.DiscoveryOtherCloudGenerationCadenceH\000\0223\n" + "\010disabled\030\005 \001(\0132\037.google.privacy.dlp.v2.DisabledH\000B\t\n" + "\007cadence\"\206\002\n" + "\031DiscoveryOtherCloudFilter\022I\n\n" + "collection\030\001" + " \001(\01323.google.privacy.dlp.v2.OtherCloudResourceCollectionH\000\022S\n" - + "\017single_resource\030\002" - + " \001(\01328.google.privacy.dlp.v2.OtherCloudSingleResourceReferenceH\000\022?\n" + + "\017single_resource\030\002 \001(\01328.google.privacy." + + "dlp.v2.OtherCloudSingleResourceReferenceH\000\022?\n" + "\006others\030d" + " \001(\0132(.google.privacy.dlp.v2.AllOtherResourcesB\003\340A\001H\000B\010\n" + "\006filter\"v\n" + "\034OtherCloudResourceCollection\022K\n" + "\017include_regexes\030\001" + " \001(\01320.google.privacy.dlp.v2.OtherCloudResourceRegexesH\000B\t\n" - + "\007pattern\"]\n" - + "\031OtherCloudResourceRegexes\022@\n" - + "\010patterns\030\001 \003(\0132..google.privacy.dlp.v2.OtherCloudResourceRegex\"y\n" - + "\027OtherCloudResourceRegex\022L\n" - + "\026amazon_s3_bucket_regex\030\001" - + " \001(\0132*.google.privacy.dlp.v2.AmazonS3BucketRegexH\000B\020\n" - + "\016resource_", - "regex\"0\n" - + "\017AwsAccountRegex\022\035\n" - + "\020account_id_regex\030\001 \001(\tB\003\340A\001\"x\n" - + "\023AmazonS3BucketRegex\022A\n" - + "\021aws_account_regex\030\001" - + " \001(\0132&.google.privacy.dlp.v2.AwsAccountRegex\022\036\n" - + "\021bucket_name_regex\030\002 \001(\tB\003\340A\001\"r\n" - + "!OtherCloudSingleResourceReference\022A\n" - + "\020amazon_s3_bucket\030\001 \001(\013" - + "2%.google.privacy.dlp.v2.AmazonS3BucketH\000B\n\n" - + "\010resource\"%\n\n" - + "AwsAccount\022\027\n\n" - + "account_id\030\001 \001(\tB\003\340A\002\"b\n" - + "\016AmazonS3Bucket\0226\n" - + "\013aws_account\030\001 \001(\0132!.google.privacy.dlp.v2.AwsAccount\022\030\n" - + "\013bucket_name\030\002 \001(\tB\003\340A\002\"\261\001\n" - + "\035DiscoveryOtherCloudConditions\022*\n" - + "\007min_age\030\001 \001(\0132\031.google.protobuf.Duration\022V\n" - + "\033amazon_s3_bucket_conditions\030\002 \001(\0132/.google.pri" - + "vacy.dlp.v2.AmazonS3BucketConditionsH\000B\014\n\n" - + "conditions\"\331\003\n" - + "\030AmazonS3BucketConditions\022U\n" - + "\014bucket_types\030\001 \003(\0162:.google.privacy" - + ".dlp.v2.AmazonS3BucketConditions.BucketTypeB\003\340A\001\022g\n" - + "\026object_storage_classes\030\002 \003(\016" - + "2B.google.privacy.dlp.v2.AmazonS3BucketConditions.ObjectStorageClassB\003\340A\001\"T\n\n" - + "BucketType\022\024\n" - + "\020TYPE_UNSPECIFIED\020\000\022\026\n" - + "\022TYPE_ALL_SUPPORTED\020\001\022\030\n" - + "\024TYPE_GENERAL_PURPOSE\020\002\"\246\001\n" - + "\022ObjectStorageClass\022\017\n" - + "\013UNSPECIFIED\020\000\022\031\n" - + "\025ALL_SUPPORTED_CLASSES\020\001\022\014\n" - + "\010STANDARD\020\002\022\036\n" - + "\032STANDARD_INFREQUENT_ACCESS\020\004\022\035\n" - + "\031GLACIER_INSTANT_RETRIEVAL\020\006\022\027\n" - + "\023INTELLIGENT_TIERING\020\007\"\351\001\n" - + "$DiscoveryOtherCloudGenerationCadence\022Q\n" - + "\021refresh_frequency\030\001 \001(\01621.g" - + "oogle.privacy.dlp.v2.DataProfileUpdateFrequencyB\003\340A\001\022n\n" - + "!inspect_template_modified_cadence\030\002 \001(\0132>.google.privacy.dlp.v2." - + "DiscoveryInspectTemplateModifiedCadenceB\003\340A\001\"W\n" - + "\031DiscoveryStartingLocation\022\031\n" - + "\017organization_id\030\001 \001(\003H\000\022\023\n" - + "\tfolder_id\030\002 \001(\003H\000B\n\n" - + "\010location\"\207\002\n" - + "#OtherCloudDiscoveryStartingLocation\022o\n" - + "\014aws_location\030\001 \001(\0132W.google.privacy.dlp.v2.OtherCloudDiscoveryS" - + "tartingLocation.AwsDiscoveryStartingLocationH\000\032c\n" - + "\034AwsDiscoveryStartingLocation\022\024\n\n" - + "account_id\030\002 \001(\tH\000\022$\n" - + "\032all_asset_inventory_assets\030\003 \001(\010H\000B\007\n" - + "\005scopeB\n\n" - + "\010location\"\023\n" - + "\021AllOtherResources\"\323\002\n" - + "\034VertexDatasetDiscoveryTarget\022H\n" - + "\006filter\030\001 \001(\01323.google.p" - + "rivacy.dlp.v2.DiscoveryVertexDatasetFilterB\003\340A\002\022K\n\n" - + "conditions\030\002 \001(\01327.google.pri" - + "vacy.dlp.v2.DiscoveryVertexDatasetConditions\022\\\n" - + "\022generation_cadence\030\003 \001(\0132>.googl" - + "e.privacy.dlp.v2.DiscoveryVertexDatasetGenerationCadenceH\000\0223\n" - + "\010disabled\030\004 \001(\0132\037.google.privacy.dlp.v2.DisabledH\000B\t\n" - + "\007cadence\"\216\002\n" - + "\034DiscoveryVertexDatasetFilter\022D\n\n" - + "collection\030\001" - + " \001(\0132..google.privacy.dlp.v2.VertexDatasetCollectionH\000\022b\n" - + "!vertex_dataset_resource_reference\030\002 \001(\01325.google.pr" - + "ivacy.dlp.v2.VertexDatasetResourceReferenceH\000\022:\n" - + "\006others\030d \001(\0132(.google.privacy.dlp.v2.AllOtherResourcesH\000B\010\n" - + "\006filter\"s\n" - + "\027VertexDatasetCollection\022M\n" - + "\026vertex_dataset_regexes\030\001" - + " \001(\0132+.google.privacy.dlp.v2.VertexDatasetRegexesH\000B\t\n" - + "\007pattern\"X\n" - + "\024VertexDatasetRegexes\022@\n" - + "\010patterns\030\001 \003(\0132).goo" - + "gle.privacy.dlp.v2.VertexDatasetRegexB\003\340A\002\".\n" - + "\022VertexDatasetRegex\022\030\n" - + "\020project_id_regex\030\001 \001(\t\"D\n" - + "\036VertexDatasetResourceReference\022\"\n" - + "\025dataset_resource_name\030\001 \001(\tB\003\340A\002\"\201\001\n" - + " DiscoveryVertexDatasetConditions\0221\n" - + "\r" - + "created_after\030\001 \001(\0132\032.google.protobuf.Timestamp\022*\n" - + "\007min_age\030\002 \001(\0132\031.google.protobuf.Duration\"\342\001\n" - + "\'DiscoveryVertexDatasetGenerationCadence\022L\n" - + "\021refresh_frequency\030\001 " - + "\001(\01621.google.privacy.dlp.v2.DataProfileUpdateFrequency\022i\n" - + "!inspect_template_modified_cadence\030\002 \001(\0132>.google.privacy.dlp.v" - + "2.DiscoveryInspectTemplateModifiedCadence\"\334\006\n" - + "\006DlpJob\022\014\n" - + "\004name\030\001 \001(\t\022/\n" - + "\004type\030\002 \001(\0162!.google.privacy.dlp.v2.DlpJobType\0225\n" - + "\005state\030\003 \001(\0162&.google.privacy.dlp.v2.DlpJob.JobState\022K\n" - + "\014risk_details\030\004 \001(\01323.googl" - + "e.privacy.dlp.v2.AnalyzeDataSourceRiskDetailsH\000\022J\n" - + "\017inspect_details\030\005 \001(\0132/.googl" - + "e.privacy.dlp.v2.InspectDataSourceDetailsH\000\022/\n" - + "\013create_time\030\006 \001(\0132\032.google.protobuf.Timestamp\022.\n\n" - + "start_time\030\007 \001(\0132\032.google.protobuf.Timestamp\022,\n" - + "\010end_time\030\010 \001(\0132\032.google.protobuf.Timestamp\0221\n\r" - + "last_modified\030\017 \001(\0132\032.google.protobuf.Timestamp\022\030\n" - + "\020job_trigger_name\030\n" - + " \001(\t\022,\n" - + "\006errors\030\013 \003(\0132\034.google.privacy.dlp.v2.Error\022<\n" - + "\016action_details\030\014 \003(\0132$.google.privacy.dlp.v2.ActionDetails\"o\n" - + "\010JobState\022\031\n" - + "\025JOB_STATE_UNSPECIFIED\020\000\022\013\n" - + "\007PENDING\020\001\022\013\n" - + "\007RUNNING\020\002\022\010\n" - + "\004DONE\020\003\022\014\n" - + "\010CANCELED\020\004\022\n\n" - + "\006FAILED\020\005\022\n\n" - + "\006ACTIVE\020\006:\177\352A|\n" - + "\031dlp.googleapis.com/DlpJob\022$projects/{project}/dlpJobs/{dlp_job}\0229proj" - + "ects/{project}/locations/{location}/dlpJobs/{dlp_job}B\t\n" - + "\007details\"C\n" - + "\020GetDlpJobRequest\022/\n" - + "\004name\030\001 \001(\tB!\340A\002\372A\033\n" - + "\031dlp.googleapis.com/DlpJob\"\326\001\n" - + "\022ListDlpJobsRequest\0221\n" - + "\006parent\030\004 \001(" - + "\tB!\340A\002\372A\033\022\031dlp.googleapis.com/DlpJob\022\016\n" - + "\006filter\030\001 \001(\t\022\021\n" - + "\tpage_size\030\002 \001(\005\022\022\n\n" - + "page_token\030\003 \001(\t\022/\n" - + "\004type\030\005 \001(\0162!.google.privacy.dlp.v2.DlpJobType\022\020\n" - + "\010order_by\030\006 \001(\t\022\023\n" - + "\013location_id\030\007 \001(\t\"[\n" - + "\023ListDlpJobsResponse\022+\n" - + "\004jobs\030\001 \003(\0132\035.google.privacy.dlp.v2.DlpJob\022\027\n" - + "\017next_page_token\030\002 \001(\t\"F\n" - + "\023CancelDlpJobRequest\022/\n" - + "\004name\030\001 \001(\tB!\340A\002\372A\033\n" - + "\031dlp.googleapis.com/DlpJob\"F\n" - + "\023FinishDlpJobRequest\022/\n" - + "\004name\030\001 \001(\tB!\340A\002\372A\033\n" - + "\031dlp.googleapis.com/DlpJob\"F\n" - + "\023DeleteDlpJobRequest\022/\n" - + "\004name\030\001 \001(\tB!\340A\002\372A\033\n" - + "\031dlp.googleapis.com/DlpJob\"\327\001\n" - + "\037CreateDeidentifyTemplateRequest\022=\n" - + "\006parent\030\001 \001(\tB-\340A\002\372A\'\022" - + "%dlp.googleapis.com/DeidentifyTemplate\022K\n" - + "\023deidentify_template\030\002" - + " \001(\0132).google.privacy.dlp.v2.DeidentifyTemplateB\003\340A\002\022\023\n" - + "\013template_id\030\003 \001(\t\022\023\n" - + "\013location_id\030\004 \001(\t\"\327\001\n" - + "\037UpdateDeidentifyTemplateRequest\022;\n" - + "\004name\030\001 \001(\tB-\340A\002\372A\'\n" - + "%dlp.googleapis.com/DeidentifyTemplate\022F\n" - + "\023deidentify_template\030\002 " - + "\001(\0132).google.privacy.dlp.v2.DeidentifyTemplate\022/\n" - + "\013update_mask\030\003 \001(\0132\032.google.protobuf.FieldMask\"[\n" - + "\034GetDeidentifyTemplateRequest\022;\n" - + "\004name\030\001 \001(\tB-\340A\002\372A\'\n" - + "%dlp.googleapis.com/DeidentifyTemplate\"\255\001\n" - + "\036ListDeidentifyTemplatesRequest\022=\n" - + "\006parent\030\001 \001(\tB" - + "-\340A\002\372A\'\022%dlp.googleapis.com/DeidentifyTemplate\022\022\n\n" - + "page_token\030\002 \001(\t\022\021\n" - + "\tpage_size\030\003 \001(\005\022\020\n" - + "\010order_by\030\004 \001(\t\022\023\n" - + "\013location_id\030\005 \001(\t\"\203\001\n" - + "\037ListDeidentifyTemplatesResponse\022G\n" - + "\024deidentify_templates\030\001" - + " \003(\0132).google.privacy.dlp.v2.DeidentifyTemplate\022\027\n" - + "\017next_page_token\030\002 \001(\t\"^\n" - + "\037DeleteDeidentifyTemplateRequest\022;\n" - + "\004name\030\001 \001(\tB-\340A\002\372A\'\n" - + "%dlp.googleapis.com/DeidentifyTemplate\"\364\001\n" - + "\033LargeCustomDictionaryConfig\022<\n" - + "\013output_path\030\001 \001(\0132\'.google.privacy.dlp.v2.CloudStoragePath\022L\n" - + "\026cloud_storage_file_set\030\002 \001(\013" - + "2*.google.privacy.dlp.v2.CloudStorageFileSetH\000\022?\n" - + "\017big_query_field\030\003" - + " \001(\0132$.google.privacy.dlp.v2.BigQueryFieldH\000B\010\n" - + "\006source\"8\n" - + "\032LargeCustomDictionaryStats\022\032\n" - + "\022approx_num_phrases\030\001 \001(\003\"\246\002\n" - + "\024StoredInfoTypeConfig\022\024\n" - + "\014display_name\030\001 \001(\t\022\023\n" - + "\013description\030\002 \001(\t\022U\n" - + "\027large_custom_dictionary\030\003 \001(\013" - + "22.google.privacy.dlp.v2.LargeCustomDictionaryConfigH\000\022F\n\n" - + "dictionary\030\004 \001(\01320.goo" - + "gle.privacy.dlp.v2.CustomInfoType.DictionaryH\000\022<\n" - + "\005regex\030\005 \001(\0132+.google.privacy.dlp.v2.CustomInfoType.RegexH\000B\006\n" - + "\004type\"s\n" - + "\023StoredInfoTypeStats\022T\n" - + "\027large_custom_dictionary\030\001" - + " \001(\01321.google.privacy.dlp.v2.LargeCustomDictionaryStatsH\000B\006\n" - + "\004type\"\251\002\n" - + "\025StoredInfoTypeVersion\022;\n" - + "\006config\030\001 \001(\0132+.google.privacy.dlp.v2.StoredInfoTypeConfig\022/\n" - + "\013create_time\030\002 \001(\0132\032.google.protobuf.Timestamp\0229\n" - + "\005state\030\003 \001(\0162*.google.privacy.dlp.v2.StoredInfoTypeState\022,\n" - + "\006errors\030\004 \003(\0132\034.google.privacy.dlp.v2.Error\0229\n" - + "\005stats\030\005 \001(\0132*.google.privacy.dlp.v2.StoredInfoTypeStats\"\361\003\n" - + "\016StoredInfoType\022\014\n" - + "\004name\030\001 \001(\t\022E\n" - + "\017current_version\030\002" - + " \001(\0132,.google.privacy.dlp.v2.StoredInfoTypeVersion\022F\n" - + "\020pending_versions\030\003" - + " \003(\0132,.google.privacy.dlp.v2.StoredInfoTypeVersion:\301\002\352A\275\002\n" - + "!dlp.googleapis.com/StoredInfoType\022?organizations/{organization}/storedInfoTypes/{s" - + "tored_info_type}\0225projects/{project}/storedInfoTypes/{stored_info_type}\022Torganiz" - + "ations/{organization}/locations/{location}/storedInfoTypes/{stored_info_type}\022Jp" - + "rojects/{project}/locations/{location}/storedInfoTypes/{stored_info_type}\"\314\001\n" - + "\033CreateStoredInfoTypeRequest\0229\n" - + "\006parent\030\001 \001(" - + "\tB)\340A\002\372A#\022!dlp.googleapis.com/StoredInfoType\022@\n" - + "\006config\030\002" - + " \001(\0132+.google.privacy.dlp.v2.StoredInfoTypeConfigB\003\340A\002\022\033\n" - + "\023stored_info_type_id\030\003 \001(\t\022\023\n" - + "\013location_id\030\004 \001(\t\"\304\001\n" - + "\033UpdateStoredInfoTypeRequest\0227\n" - + "\004name\030\001 \001(\tB)\340A\002\372A#\n" - + "!dlp.googleapis.com/StoredInfoType\022;\n" - + "\006config\030\002 \001(\0132+.google.privacy.dlp.v2.StoredInfoTypeConfig\022/\n" - + "\013update_mask\030\003 \001(\0132\032.google.protobuf.FieldMask\"S\n" - + "\030GetStoredInfoTypeRequest\0227\n" - + "\004name\030\001 \001(\tB)\340A\002\372A#\n" - + "!dlp.googleapis.com/StoredInfoType\"\245\001\n" - + "\032ListStoredInfoTypesRequest\0229\n" - + "\006parent\030\001 \001(" - + "\tB)\340A\002\372A#\022!dlp.googleapis.com/StoredInfoType\022\022\n\n" - + "page_token\030\002 \001(\t\022\021\n" - + "\tpage_size\030\003 \001(\005\022\020\n" - + "\010order_by\030\004 \001(\t\022\023\n" - + "\013location_id\030\005 \001(\t\"x\n" - + "\033ListStoredInfoTypesResponse\022@\n" - + "\021stored_info_types\030\001" - + " \003(\0132%.google.privacy.dlp.v2.StoredInfoType\022\027\n" - + "\017next_page_token\030\002 \001(\t\"V\n" - + "\033DeleteStoredInfoTypeRequest\0227\n" - + "\004name\030\001 \001(\tB)\340A\002\372A#\n" - + "!dlp.googleapis.com/StoredInfoType\"\224\001\n" - + "\036HybridInspectJobTriggerRequest\0223\n" - + "\004name\030\001 \001(\tB%\340A\002\372A\037\n" - + "\035dlp.googleapis.com/JobTrigger\022=\n" - + "\013hybrid_item\030\003" - + " \001(\0132(.google.privacy.dlp.v2.HybridContentItem\"\214\001\n" - + "\032HybridInspectDlpJobRequest\022/\n" - + "\004name\030\001 \001(\tB!\340A\002\372A\033\n" - + "\031dlp.googleapis.com/DlpJob\022=\n" - + "\013hybrid_item\030\003" - + " \001(\0132(.google.privacy.dlp.v2.HybridContentItem\"\213\001\n" - + "\021HybridContentItem\0220\n" - + "\004item\030\001 \001(\0132\".google.privacy.dlp.v2.ContentItem\022D\n" - + "\017finding_details\030\002" - + " \001(\0132+.google.privacy.dlp.v2.HybridFindingDetails\"\260\002\n" - + "\024HybridFindingDetails\022;\n" - + "\021container_details\030\001 \001(\0132 .google.privacy.dlp.v2.Container\022\023\n" - + "\013file_offset\030\002 \001(\003\022\022\n\n" - + "row_offset\030\003 \001(\003\022:\n\r" - + "table_options\030\004 \001(\0132#.google.privacy.dlp.v2.TableOptions\022G\n" - + "\006labels\030\005 \003(\01327.google.privacy.d" - + "lp.v2.HybridFindingDetails.LabelsEntry\032-\n" - + "\013LabelsEntry\022\013\n" - + "\003key\030\001 \001(\t\022\r\n" - + "\005value\030\002 \001(\t:\0028\001\"\027\n" - + "\025HybridInspectResponse\"\303\001\n" - + "\024ImageContainmentType\0223\n" - + "\010encloses\030\001 \001(\0132\037.google.privacy.dlp.v2.EnclosesH\000\022:\n" - + "\014fully_inside\030\002 \001(\0132\".google.privacy.dlp.v2.FullyInsideH\000\0222\n" - + "\010overlaps\030\003 \001(\0132\036.google.privacy.dlp.v2.OverlapH\000B\006\n" - + "\004type\"\t\n" - + "\007Overlap\"\n\n" - + "\010Encloses\"\r\n" - + "\013FullyInside\"\250\001\n" - + "\036ListProjectDataProfilesRequest\022=\n" - + "\006parent\030\001 \001(\tB-\340" - + "A\002\372A\'\022%dlp.googleapis.com/ProjectDataProfile\022\022\n\n" - + "page_token\030\002 \001(\t\022\021\n" - + "\tpage_size\030\003 \001(\005\022\020\n" - + "\010order_by\030\004 \001(\t\022\016\n" - + "\006filter\030\005 \001(\t\"\204\001\n" - + "\037ListProjectDataProfilesResponse\022H\n" - + "\025project_data_profiles\030\001" - + " \003(\0132).google.privacy.dlp.v2.ProjectDataProfile\022\027\n" - + "\017next_page_token\030\002 \001(\t\"\244\001\n" - + "\034ListTableDataProfilesRequest\022;\n" - + "\006parent\030\001 \001(" - + "\tB+\340A\002\372A%\022#dlp.googleapis.com/TableDataProfile\022\022\n\n" - + "page_token\030\002 \001(\t\022\021\n" - + "\tpage_size\030\003 \001(\005\022\020\n" - + "\010order_by\030\004 \001(\t\022\016\n" - + "\006filter\030\005 \001(\t\"~\n" - + "\035ListTableDataProfilesResponse\022D\n" - + "\023table_data_profiles\030\001 \003(" - + "\0132\'.google.privacy.dlp.v2.TableDataProfile\022\027\n" - + "\017next_page_token\030\002 \001(\t\"\246\001\n" - + "\035ListColumnDataProfilesRequest\022<\n" - + "\006parent\030\001 \001(\tB,\340" - + "A\002\372A&\022$dlp.googleapis.com/ColumnDataProfile\022\022\n\n" - + "page_token\030\002 \001(\t\022\021\n" - + "\tpage_size\030\003 \001(\005\022\020\n" - + "\010order_by\030\004 \001(\t\022\016\n" - + "\006filter\030\005 \001(\t\"\201\001\n" - + "\036ListColumnDataProfilesResponse\022F\n" - + "\024column_data_profiles\030\001" - + " \003(\0132(.google.privacy.dlp.v2.ColumnDataProfile\022\027\n" - + "\017next_page_token\030\002 \001(\t\"\313\001\n\r" - + "DataRiskLevel\022F\n" - + "\005score\030\001 \001(" - + "\01627.google.privacy.dlp.v2.DataRiskLevel.DataRiskLevelScore\"r\n" - + "\022DataRiskLevelScore\022\032\n" - + "\026RISK_SCORE_UNSPECIFIED\020\000\022\014\n" - + "\010RISK_LOW\020\n" - + "\022\020\n" - + "\014RISK_UNKNOWN\020\014\022\021\n\r" - + "RISK_MODERATE\020\024\022\r\n" - + "\tRISK_HIGH\020\036\"\334\004\n" - + "\022ProjectDataProfile\022\014\n" - + "\004name\030\001 \001(\t\022\022\n\n" - + "project_id\030\002 \001(\t\022:\n" - + "\026profile_last_generated\030\003 \001(\0132\032.google.protobuf.Timestamp\022B\n" - + "\021sensitivity_score\030\004 \001(\0132\'" - + ".google.privacy.dlp.v2.SensitivityScore\022=\n" - + "\017data_risk_level\030\005 \001(\0132$.google.privacy.dlp.v2.DataRiskLevel\022<\n" - + "\016profile_status\030\007 \001(\0132$.google.privacy.dlp.v2.ProfileStatus\022 \n" - + "\030table_data_profile_count\030\t \001(\003\022%\n" - + "\035file_store_data_profile_count\030\n" - + " \001(\003:\335\001\352A\331\001\n" - + "%dlp.googleapis.com/ProjectDataProfile\022\\organizations/{organization}/locati" - + "ons/{location}/projectDataProfiles/{project_data_profile}\022Rprojects/{project}/lo" - + "cations/{location}/projectDataProfiles/{project_data_profile}\"\311\002\n" - + "\031DataProfileConfigSnapshot\022<\n" - + "\016inspect_config\030\002 \001(\0132$.google.privacy.dlp.v2.InspectConfig\022I\n" - + "\020data_profile_job\030\003" - + " \001(\0132+.google.privacy.dlp.v2.DataProfileJobConfigB\002\030\001\022@\n" - + "\020discovery_config\030\004" - + " \001(\0132&.google.privacy.dlp.v2.DiscoveryConfig\022\035\n" - + "\025inspect_template_name\030\005 \001(\t\022B\n" - + "\036inspect_template_modified_time\030\006" - + " \001(\0132\032.google.protobuf.Timestamp\"\223\016\n" - + "\020TableDataProfile\022\014\n" - + "\004name\030\001 \001(\t\022?\n" - + "\020data_source_type\030$ \001(\0132%.google.privacy.dlp.v2.DataSourceType\022\034\n" - + "\024project_data_profile\030\002 \001(\t\022\032\n" - + "\022dataset_project_id\030\030 \001(\t\022\030\n" - + "\020dataset_location\030\035 \001(\t\022\022\n\n" - + "dataset_id\030\031 \001(\t\022\020\n" - + "\010table_id\030\032 \001(\t\022\025\n\r" - + "full_resource\030\003 \001(\t\022<\n" - + "\016profile_status\030\025 \001(\0132$.google.privacy.dlp.v2.ProfileStatus\022<\n" - + "\005state\030\026 \001(\0162-.google.privacy.dlp.v2.TableDataProfile.State\022B\n" - + "\021sensitivity_score\030\005" - + " \001(\0132\'.google.privacy.dlp.v2.SensitivityScore\022=\n" - + "\017data_risk_level\030\006 \001(\0132$.google.privacy.dlp.v2.DataRiskLevel\022D\n" - + "\024predicted_info_types\030\033 " - + "\003(\0132&.google.privacy.dlp.v2.InfoTypeSummary\022E\n" - + "\020other_info_types\030\034" - + " \003(\0132+.google.privacy.dlp.v2.OtherInfoTypeSummary\022I\n" - + "\017config_snapshot\030\007" - + " \001(\01320.google.privacy.dlp.v2.DataProfileConfigSnapshot\0226\n" - + "\022last_modified_time\030\010 \001(\0132\032.google.protobuf.Timestamp\0223\n" - + "\017expiration_time\030\t \001(\0132\032.google.protobuf.Timestamp\022\034\n" - + "\024scanned_column_count\030\n" - + " \001(\003\022\033\n" - + "\023failed_column_count\030\013 \001(\003\022\030\n" - + "\020table_size_bytes\030\014 \001(\003\022\021\n" - + "\trow_count\030\r" - + " \001(\003\022B\n" - + "\021encryption_status\030\016" - + " \001(\0162\'.google.privacy.dlp.v2.EncryptionStatus\022F\n" - + "\023resource_visibility\030\017" - + " \001(\0162).google.privacy.dlp.v2.ResourceVisibility\022:\n" - + "\026profile_last_generated\030\020 \001(\0132\032.google.protobuf.Timestamp\022T\n" - + "\017resource_labels\030\021 \003(\0132;.google.pri" - + "vacy.dlp.v2.TableDataProfile.ResourceLabelsEntry\022/\n" - + "\013create_time\030\027 \001(\0132\032.google.protobuf.Timestamp\022C\n" - + "\025sample_findings_table\030% \001(\0132$.google.privacy.dlp.v2.BigQueryTable\022(\n" - + "\004tags\030\' \003(\0132\032.google.privacy.dlp.v2.Tag\022A\n" - + "\021related_resources\030) \003(\0132&.google.privacy.dlp.v2.RelatedResource\022.\n" - + "\007domains\030/ \003(\0132\035.google.privacy.dlp.v2.Domain\0325\n" - + "\023ResourceLabelsEntry\022\013\n" - + "\003key\030\001 \001(\t\022\r\n" - + "\005value\030\002 \001(\t:\0028\001\"5\n" - + "\005State\022\025\n" - + "\021STATE_UNSPECIFIED\020\000\022\013\n" - + "\007RUNNING\020\001\022\010\n" - + "\004DONE\020\002:\323\001\352A\317\001\n" - + "#dlp.googleapis.com/TableDataProfile\022Xorganizations/{organization}/locations/{l" - + "ocation}/tableDataProfiles/{table_data_profile}\022Nprojects/{project}/locations/{l" - + "ocation}/tableDataProfiles/{table_data_profile}\"b\n\r" - + "ProfileStatus\022\"\n" - + "\006status\030\001 \001(\0132\022.google.rpc.Status\022-\n" - + "\ttimestamp\030\003 \001(\0132\032.google.protobuf.Timestamp\"g\n" - + "\017InfoTypeSummary\0222\n" - + "\tinfo_type\030\001 \001(\0132\037.google.privacy.dlp.v2.InfoType\022 \n" - + "\024estimated_prevalence\030\002 \001(\005B\002\030\001\"\210\001\n" - + "\024OtherInfoTypeSummary\0222\n" - + "\tinfo_type\030\001 \001(\0132\037.google.privacy.dlp.v2.InfoType\022\034\n" - + "\024estimated_prevalence\030\002 \001(\005\022\036\n" - + "\026excluded_from_analysis\030\003 \001(\010\"\311\r\n" - + "\021ColumnDataProfile\022\014\n" - + "\004name\030\001 \001(\t\022<\n" - + "\016profile_status\030\021 \001(\0132$.google.privacy.dlp.v2.ProfileStatus\022=\n" - + "\005state\030\022 \001(\0162..google.privacy.dlp.v2.ColumnDataProfile.State\022:\n" - + "\026profile_last_generated\030\003 \001(\0132\032.google.protobuf.Timestamp\022\032\n" - + "\022table_data_profile\030\004 \001(\t\022\033\n" - + "\023table_full_resource\030\005 \001(\t\022\032\n" - + "\022dataset_project_id\030\023 \001(\t\022\030\n" - + "\020dataset_location\030\024 \001(\t\022\022\n\n" - + "dataset_id\030\025 \001(\t\022\020\n" - + "\010table_id\030\026 \001(\t\022\016\n" - + "\006column\030\006 \001(\t\022B\n" - + "\021sensitivity_score\030\007" - + " \001(\0132\'.google.privacy.dlp.v2.SensitivityScore\022=\n" - + "\017data_risk_level\030\010 \001(\0132$.google.privacy.dlp.v2.DataRiskLevel\022@\n" - + "\020column_info_type\030\t \001(\0132&.google.privacy.dlp.v2.InfoTypeSummary\022B\n\r" - + "other_matches\030\n" - + " \003(\0132+.google.privacy.dlp.v2.OtherInfoTypeSummary\022M\n" - + "\031estimated_null_percentage\030\027 \001(\0162*." - + "google.privacy.dlp.v2.NullPercentageLevel\022O\n" - + "\032estimated_uniqueness_score\030\030 \001(\0162+." - + "google.privacy.dlp.v2.UniquenessScoreLevel\022\027\n" - + "\017free_text_score\030\r" - + " \001(\001\022L\n" - + "\013column_type\030\016" - + " \001(\01627.google.privacy.dlp.v2.ColumnDataProfile.ColumnDataType\022P\n" - + "\014policy_state\030\017" - + " \001(\0162:.google.privacy.dlp.v2.ColumnDataProfile.ColumnPolicyState\"5\n" - + "\005State\022\025\n" - + "\021STATE_UNSPECIFIED\020\000\022\013\n" - + "\007RUNNING\020\001\022\010\n" - + "\004DONE\020\002\"\377\002\n" - + "\016ColumnDataType\022 \n" - + "\034COLUMN_DATA_TYPE_UNSPECIFIED\020\000\022\016\n\n" - + "TYPE_INT64\020\001\022\r\n" - + "\tTYPE_BOOL\020\002\022\020\n" - + "\014TYPE_FLOAT64\020\003\022\017\n" - + "\013TYPE_STRING\020\004\022\016\n\n" - + "TYPE_BYTES\020\005\022\022\n" - + "\016TYPE_TIMESTAMP\020\006\022\r\n" - + "\tTYPE_DATE\020\007\022\r\n" - + "\tTYPE_TIME\020\010\022\021\n\r" - + "TYPE_DATETIME\020\t\022\022\n" - + "\016TYPE_GEOGRAPHY\020\n" - + "\022\020\n" - + "\014TYPE_NUMERIC\020\013\022\017\n" - + "\013TYPE_RECORD\020\014\022\023\n" - + "\017TYPE_BIGNUMERIC\020\r" - + "\022\r\n" - + "\tTYPE_JSON\020\016\022\021\n\r" - + "TYPE_INTERVAL\020\017\022\023\n" - + "\017TYPE_RANGE_DATE\020\020\022\027\n" - + "\023TYPE_RANGE_DATETIME\020\021\022\030\n" - + "\024TYPE_RANGE_TIMESTAMP\020\022\"R\n" - + "\021ColumnPolicyState\022#\n" - + "\037COLUMN_POLICY_STATE_UNSPECIFIED\020\000\022\030\n" - + "\024COLUMN_POLICY_TAGGED\020\001:\330\001\352A\324\001\n" - + "$dlp.googleapis.com/ColumnDataProfile\022Zorganizations/{organization}/locations/{l" - + "ocation}/columnDataProfiles/{column_data_profile}\022Pprojects/{project}/locations/" - + "{location}/columnDataProfiles/{column_data_profile}\"\350\016\n" - + "\024FileStoreDataProfile\022\014\n" - + "\004name\030\001 \001(\t\022?\n" - + "\020data_source_type\030\002" - + " \001(\0132%.google.privacy.dlp.v2.DataSourceType\022\034\n" - + "\024project_data_profile\030\003 \001(\t\022\022\n\n" - + "project_id\030\004 \001(\t\022\033\n" - + "\023file_store_location\030\005 \001(\t\022\036\n" - + "\026data_storage_locations\030\023 \003(\t\022\025\n\r" - + "location_type\030\024 \001(\t\022\027\n" - + "\017file_store_path\030\006 \001(\t\022\025\n\r" - + "full_resource\030\030 \001(\t\022I\n" - + "\017config_snapshot\030\007 \001" - + "(\01320.google.privacy.dlp.v2.DataProfileConfigSnapshot\022<\n" - + "\016profile_status\030\010 \001(\0132$.google.privacy.dlp.v2.ProfileStatus\022@\n" - + "\005state\030\t \001(\01621.google.privacy.dlp.v2.FileStoreDataProfile.State\022:\n" - + "\026profile_last_generated\030\n" - + " \001(\0132\032.google.protobuf.Timestamp\022F\n" - + "\023resource_visibility\030\013" - + " \001(\0162).google.privacy.dlp.v2.ResourceVisibility\022B\n" - + "\021sensitivity_score\030\014" - + " \001(\0132\'.google.privacy.dlp.v2.SensitivityScore\022=\n" - + "\017data_risk_level\030\r" - + " \001(\0132$.google.privacy.dlp.v2.DataRiskLevel\022/\n" - + "\013create_time\030\016 \001(\0132\032.google.protobuf.Timestamp\0226\n" - + "\022last_modified_time\030\017 \001(\0132\032.google.protobuf.Timestamp\022I\n" - + "\026file_cluster_summaries\030\020" - + " \003(\0132).google.privacy.dlp.v2.FileClusterSummary\022`\n" - + "\023resource_attributes\030\021 \003(\0132C.google.privacy.dlp.v2.Fil" - + "eStoreDataProfile.ResourceAttributesEntry\022X\n" - + "\017resource_labels\030\022 \003(\0132?.google.priv" - + "acy.dlp.v2.FileStoreDataProfile.ResourceLabelsEntry\022W\n" + + "\007pattern\"]\n", + "\031OtherCloudResourceRegexes\022@\n\010patterns\030\001" + + " \003(\0132..google.privacy.dlp.v2.OtherCloudR" + + "esourceRegex\"y\n\027OtherCloudResourceRegex\022" + + "L\n\026amazon_s3_bucket_regex\030\001 \001(\0132*.google" + + ".privacy.dlp.v2.AmazonS3BucketRegexH\000B\020\n" + + "\016resource_regex\"0\n\017AwsAccountRegex\022\035\n\020ac" + + "count_id_regex\030\001 \001(\tB\003\340A\001\"x\n\023AmazonS3Buc" + + "ketRegex\022A\n\021aws_account_regex\030\001 \001(\0132&.go" + + "ogle.privacy.dlp.v2.AwsAccountRegex\022\036\n\021b" + + "ucket_name_regex\030\002 \001(\tB\003\340A\001\"r\n!OtherClou" + + "dSingleResourceReference\022A\n\020amazon_s3_bu" + + "cket\030\001 \001(\0132%.google.privacy.dlp.v2.Amazo" + + "nS3BucketH\000B\n\n\010resource\"%\n\nAwsAccount\022\027\n" + + "\naccount_id\030\001 \001(\tB\003\340A\002\"b\n\016AmazonS3Bucket" + + "\0226\n\013aws_account\030\001 \001(\0132!.google.privacy.d" + + "lp.v2.AwsAccount\022\030\n\013bucket_name\030\002 \001(\tB\003\340" + + "A\002\"\261\001\n\035DiscoveryOtherCloudConditions\022*\n\007" + + "min_age\030\001 \001(\0132\031.google.protobuf.Duration" + + "\022V\n\033amazon_s3_bucket_conditions\030\002 \001(\0132/." + + "google.privacy.dlp.v2.AmazonS3BucketCond" + + "itionsH\000B\014\n\nconditions\"\331\003\n\030AmazonS3Bucke" + + "tConditions\022U\n\014bucket_types\030\001 \003(\0162:.goog" + + "le.privacy.dlp.v2.AmazonS3BucketConditio" + + "ns.BucketTypeB\003\340A\001\022g\n\026object_storage_cla" + + "sses\030\002 \003(\0162B.google.privacy.dlp.v2.Amazo" + + "nS3BucketConditions.ObjectStorageClassB\003" + + "\340A\001\"T\n\nBucketType\022\024\n\020TYPE_UNSPECIFIED\020\000\022" + + "\026\n\022TYPE_ALL_SUPPORTED\020\001\022\030\n\024TYPE_GENERAL_" + + "PURPOSE\020\002\"\246\001\n\022ObjectStorageClass\022\017\n\013UNSP" + + "ECIFIED\020\000\022\031\n\025ALL_SUPPORTED_CLASSES\020\001\022\014\n\010" + + "STANDARD\020\002\022\036\n\032STANDARD_INFREQUENT_ACCESS" + + "\020\004\022\035\n\031GLACIER_INSTANT_RETRIEVAL\020\006\022\027\n\023INT" + + "ELLIGENT_TIERING\020\007\"\351\001\n$DiscoveryOtherClo" + + "udGenerationCadence\022Q\n\021refresh_frequency" + + "\030\001 \001(\01621.google.privacy.dlp.v2.DataProfi" + + "leUpdateFrequencyB\003\340A\001\022n\n!inspect_templa" + + "te_modified_cadence\030\002 \001(\0132>.google.priva" + + "cy.dlp.v2.DiscoveryInspectTemplateModifi" + + "edCadenceB\003\340A\001\"W\n\031DiscoveryStartingLocat" + + "ion\022\031\n\017organization_id\030\001 \001(\003H\000\022\023\n\tfolder" + + "_id\030\002 \001(\003H\000B\n\n\010location\"\207\002\n#OtherCloudDi" + + "scoveryStartingLocation\022o\n\014aws_location\030" + + "\001 \001(\0132W.google.privacy.dlp.v2.OtherCloud" + + "DiscoveryStartingLocation.AwsDiscoverySt" + + "artingLocationH\000\032c\n\034AwsDiscoveryStarting" + + "Location\022\024\n\naccount_id\030\002 \001(\tH\000\022$\n\032all_as" + + "set_inventory_assets\030\003 \001(\010H\000B\007\n\005scopeB\n\n" + + "\010location\"\023\n\021AllOtherResources\"\323\002\n\034Verte" + + "xDatasetDiscoveryTarget\022H\n\006filter\030\001 \001(\0132" + + "3.google.privacy.dlp.v2.DiscoveryVertexD" + + "atasetFilterB\003\340A\002\022K\n\nconditions\030\002 \001(\01327." + + "google.privacy.dlp.v2.DiscoveryVertexDat" + + "asetConditions\022\\\n\022generation_cadence\030\003 \001" + + "(\0132>.google.privacy.dlp.v2.DiscoveryVert" + + "exDatasetGenerationCadenceH\000\0223\n\010disabled" + + "\030\004 \001(\0132\037.google.privacy.dlp.v2.DisabledH" + + "\000B\t\n\007cadence\"\216\002\n\034DiscoveryVertexDatasetF" + + "ilter\022D\n\ncollection\030\001 \001(\0132..google.priva" + + "cy.dlp.v2.VertexDatasetCollectionH\000\022b\n!v" + + "ertex_dataset_resource_reference\030\002 \001(\01325" + + ".google.privacy.dlp.v2.VertexDatasetReso" + + "urceReferenceH\000\022:\n\006others\030d \001(\0132(.google" + + ".privacy.dlp.v2.AllOtherResourcesH\000B\010\n\006f" + + "ilter\"s\n\027VertexDatasetCollection\022M\n\026vert" + + "ex_dataset_regexes\030\001 \001(\0132+.google.privac" + + "y.dlp.v2.VertexDatasetRegexesH\000B\t\n\007patte" + + "rn\"X\n\024VertexDatasetRegexes\022@\n\010patterns\030\001" + + " \003(\0132).google.privacy.dlp.v2.VertexDatas" + + "etRegexB\003\340A\002\".\n\022VertexDatasetRegex\022\030\n\020pr" + + "oject_id_regex\030\001 \001(\t\"D\n\036VertexDatasetRes" + + "ourceReference\022\"\n\025dataset_resource_name\030" + + "\001 \001(\tB\003\340A\002\"\201\001\n DiscoveryVertexDatasetCon" + + "ditions\0221\n\rcreated_after\030\001 \001(\0132\032.google." + + "protobuf.Timestamp\022*\n\007min_age\030\002 \001(\0132\031.go" + + "ogle.protobuf.Duration\"\342\001\n\'DiscoveryVert" + + "exDatasetGenerationCadence\022L\n\021refresh_fr" + + "equency\030\001 \001(\01621.google.privacy.dlp.v2.Da" + + "taProfileUpdateFrequency\022i\n!inspect_temp" + + "late_modified_cadence\030\002 \001(\0132>.google.pri" + + "vacy.dlp.v2.DiscoveryInspectTemplateModi" + + "fiedCadence\"\334\006\n\006DlpJob\022\014\n\004name\030\001 \001(\t\022/\n\004" + + "type\030\002 \001(\0162!.google.privacy.dlp.v2.DlpJo" + + "bType\0225\n\005state\030\003 \001(\0162&.google.privacy.dl" + + "p.v2.DlpJob.JobState\022K\n\014risk_details\030\004 \001" + + "(\01323.google.privacy.dlp.v2.AnalyzeDataSo" + + "urceRiskDetailsH\000\022J\n\017inspect_details\030\005 \001" + + "(\0132/.google.privacy.dlp.v2.InspectDataSo" + + "urceDetailsH\000\022/\n\013create_time\030\006 \001(\0132\032.goo" + + "gle.protobuf.Timestamp\022.\n\nstart_time\030\007 \001" + + "(\0132\032.google.protobuf.Timestamp\022,\n\010end_ti" + + "me\030\010 \001(\0132\032.google.protobuf.Timestamp\0221\n\r" + + "last_modified\030\017 \001(\0132\032.google.protobuf.Ti" + + "mestamp\022\030\n\020job_trigger_name\030\n \001(\t\022,\n\006err" + + "ors\030\013 \003(\0132\034.google.privacy.dlp.v2.Error\022" + + "<\n\016action_details\030\014 \003(\0132$.google.privacy" + + ".dlp.v2.ActionDetails\"o\n\010JobState\022\031\n\025JOB" + + "_STATE_UNSPECIFIED\020\000\022\013\n\007PENDING\020\001\022\013\n\007RUN" + + "NING\020\002\022\010\n\004DONE\020\003\022\014\n\010CANCELED\020\004\022\n\n\006FAILED" + + "\020\005\022\n\n\006ACTIVE\020\006:\177\352A|\n\031dlp.googleapis.com/" + + "DlpJob\022$projects/{project}/dlpJobs/{dlp_" + + "job}\0229projects/{project}/locations/{loca" + + "tion}/dlpJobs/{dlp_job}B\t\n\007details\"C\n\020Ge" + + "tDlpJobRequest\022/\n\004name\030\001 \001(\tB!\340A\002\372A\033\n\031dl" + + "p.googleapis.com/DlpJob\"\326\001\n\022ListDlpJobsR" + + "equest\0221\n\006parent\030\004 \001(\tB!\340A\002\372A\033\022\031dlp.goog" + + "leapis.com/DlpJob\022\016\n\006filter\030\001 \001(\t\022\021\n\tpag" + + "e_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022/\n\004type" + + "\030\005 \001(\0162!.google.privacy.dlp.v2.DlpJobTyp" + + "e\022\020\n\010order_by\030\006 \001(\t\022\023\n\013location_id\030\007 \001(\t" + + "\"[\n\023ListDlpJobsResponse\022+\n\004jobs\030\001 \003(\0132\035." + + "google.privacy.dlp.v2.DlpJob\022\027\n\017next_pag" + + "e_token\030\002 \001(\t\"F\n\023CancelDlpJobRequest\022/\n\004" + + "name\030\001 \001(\tB!\340A\002\372A\033\n\031dlp.googleapis.com/D" + + "lpJob\"F\n\023FinishDlpJobRequest\022/\n\004name\030\001 \001" + + "(\tB!\340A\002\372A\033\n\031dlp.googleapis.com/DlpJob\"F\n" + + "\023DeleteDlpJobRequest\022/\n\004name\030\001 \001(\tB!\340A\002\372" + + "A\033\n\031dlp.googleapis.com/DlpJob\"\327\001\n\037Create" + + "DeidentifyTemplateRequest\022=\n\006parent\030\001 \001(" + + "\tB-\340A\002\372A\'\022%dlp.googleapis.com/Deidentify" + + "Template\022K\n\023deidentify_template\030\002 \001(\0132)." + + "google.privacy.dlp.v2.DeidentifyTemplate" + + "B\003\340A\002\022\023\n\013template_id\030\003 \001(\t\022\023\n\013location_i" + + "d\030\004 \001(\t\"\327\001\n\037UpdateDeidentifyTemplateRequ" + + "est\022;\n\004name\030\001 \001(\tB-\340A\002\372A\'\n%dlp.googleapi" + + "s.com/DeidentifyTemplate\022F\n\023deidentify_t" + + "emplate\030\002 \001(\0132).google.privacy.dlp.v2.De" + + "identifyTemplate\022/\n\013update_mask\030\003 \001(\0132\032." + + "google.protobuf.FieldMask\"[\n\034GetDeidenti" + + "fyTemplateRequest\022;\n\004name\030\001 \001(\tB-\340A\002\372A\'\n" + + "%dlp.googleapis.com/DeidentifyTemplate\"\255" + + "\001\n\036ListDeidentifyTemplatesRequest\022=\n\006par" + + "ent\030\001 \001(\tB-\340A\002\372A\'\022%dlp.googleapis.com/De" + + "identifyTemplate\022\022\n\npage_token\030\002 \001(\t\022\021\n\t" + + "page_size\030\003 \001(\005\022\020\n\010order_by\030\004 \001(\t\022\023\n\013loc" + + "ation_id\030\005 \001(\t\"\203\001\n\037ListDeidentifyTemplat" + + "esResponse\022G\n\024deidentify_templates\030\001 \003(\013" + + "2).google.privacy.dlp.v2.DeidentifyTempl" + + "ate\022\027\n\017next_page_token\030\002 \001(\t\"^\n\037DeleteDe" + + "identifyTemplateRequest\022;\n\004name\030\001 \001(\tB-\340" + + "A\002\372A\'\n%dlp.googleapis.com/DeidentifyTemp" + + "late\"\364\001\n\033LargeCustomDictionaryConfig\022<\n\013" + + "output_path\030\001 \001(\0132\'.google.privacy.dlp.v" + + "2.CloudStoragePath\022L\n\026cloud_storage_file" + + "_set\030\002 \001(\0132*.google.privacy.dlp.v2.Cloud" + + "StorageFileSetH\000\022?\n\017big_query_field\030\003 \001(" + + "\0132$.google.privacy.dlp.v2.BigQueryFieldH" + + "\000B\010\n\006source\"8\n\032LargeCustomDictionaryStat" + + "s\022\032\n\022approx_num_phrases\030\001 \001(\003\"\246\002\n\024Stored" + + "InfoTypeConfig\022\024\n\014display_name\030\001 \001(\t\022\023\n\013" + + "description\030\002 \001(\t\022U\n\027large_custom_dictio" + + "nary\030\003 \001(\01322.google.privacy.dlp.v2.Large" + + "CustomDictionaryConfigH\000\022F\n\ndictionary\030\004" + + " \001(\01320.google.privacy.dlp.v2.CustomInfoT" + + "ype.DictionaryH\000\022<\n\005regex\030\005 \001(\0132+.google" + + ".privacy.dlp.v2.CustomInfoType.RegexH\000B\006" + + "\n\004type\"s\n\023StoredInfoTypeStats\022T\n\027large_c" + + "ustom_dictionary\030\001 \001(\01321.google.privacy." + + "dlp.v2.LargeCustomDictionaryStatsH\000B\006\n\004t" + + "ype\"\251\002\n\025StoredInfoTypeVersion\022;\n\006config\030" + + "\001 \001(\0132+.google.privacy.dlp.v2.StoredInfo" + + "TypeConfig\022/\n\013create_time\030\002 \001(\0132\032.google" + + ".protobuf.Timestamp\0229\n\005state\030\003 \001(\0162*.goo" + + "gle.privacy.dlp.v2.StoredInfoTypeState\022," + + "\n\006errors\030\004 \003(\0132\034.google.privacy.dlp.v2.E" + + "rror\0229\n\005stats\030\005 \001(\0132*.google.privacy.dlp" + + ".v2.StoredInfoTypeStats\"\361\003\n\016StoredInfoTy" + + "pe\022\014\n\004name\030\001 \001(\t\022E\n\017current_version\030\002 \001(" + + "\0132,.google.privacy.dlp.v2.StoredInfoType" + + "Version\022F\n\020pending_versions\030\003 \003(\0132,.goog" + + "le.privacy.dlp.v2.StoredInfoTypeVersion:" + + "\301\002\352A\275\002\n!dlp.googleapis.com/StoredInfoTyp" + + "e\022?organizations/{organization}/storedIn" + + "foTypes/{stored_info_type}\0225projects/{pr" + + "oject}/storedInfoTypes/{stored_info_type" + + "}\022Torganizations/{organization}/location" + + "s/{location}/storedInfoTypes/{stored_inf" + + "o_type}\022Jprojects/{project}/locations/{l" + + "ocation}/storedInfoTypes/{stored_info_ty" + + "pe}\"\314\001\n\033CreateStoredInfoTypeRequest\0229\n\006p" + + "arent\030\001 \001(\tB)\340A\002\372A#\022!dlp.googleapis.com/" + + "StoredInfoType\022@\n\006config\030\002 \001(\0132+.google." + + "privacy.dlp.v2.StoredInfoTypeConfigB\003\340A\002" + + "\022\033\n\023stored_info_type_id\030\003 \001(\t\022\023\n\013locatio" + + "n_id\030\004 \001(\t\"\304\001\n\033UpdateStoredInfoTypeReque" + + "st\0227\n\004name\030\001 \001(\tB)\340A\002\372A#\n!dlp.googleapis" + + ".com/StoredInfoType\022;\n\006config\030\002 \001(\0132+.go" + + "ogle.privacy.dlp.v2.StoredInfoTypeConfig" + + "\022/\n\013update_mask\030\003 \001(\0132\032.google.protobuf." + + "FieldMask\"S\n\030GetStoredInfoTypeRequest\0227\n" + + "\004name\030\001 \001(\tB)\340A\002\372A#\n!dlp.googleapis.com/" + + "StoredInfoType\"\245\001\n\032ListStoredInfoTypesRe" + + "quest\0229\n\006parent\030\001 \001(\tB)\340A\002\372A#\022!dlp.googl" + + "eapis.com/StoredInfoType\022\022\n\npage_token\030\002" + + " \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\020\n\010order_by\030\004 \001(" + + "\t\022\023\n\013location_id\030\005 \001(\t\"x\n\033ListStoredInfo" + + "TypesResponse\022@\n\021stored_info_types\030\001 \003(\013" + + "2%.google.privacy.dlp.v2.StoredInfoType\022" + + "\027\n\017next_page_token\030\002 \001(\t\"V\n\033DeleteStored" + + "InfoTypeRequest\0227\n\004name\030\001 \001(\tB)\340A\002\372A#\n!d" + + "lp.googleapis.com/StoredInfoType\"\224\001\n\036Hyb" + + "ridInspectJobTriggerRequest\0223\n\004name\030\001 \001(" + + "\tB%\340A\002\372A\037\n\035dlp.googleapis.com/JobTrigger" + + "\022=\n\013hybrid_item\030\003 \001(\0132(.google.privacy.d" + + "lp.v2.HybridContentItem\"\214\001\n\032HybridInspec" + + "tDlpJobRequest\022/\n\004name\030\001 \001(\tB!\340A\002\372A\033\n\031dl" + + "p.googleapis.com/DlpJob\022=\n\013hybrid_item\030\003" + + " \001(\0132(.google.privacy.dlp.v2.HybridConte" + + "ntItem\"\213\001\n\021HybridContentItem\0220\n\004item\030\001 \001" + + "(\0132\".google.privacy.dlp.v2.ContentItem\022D" + + "\n\017finding_details\030\002 \001(\0132+.google.privacy" + + ".dlp.v2.HybridFindingDetails\"\260\002\n\024HybridF" + + "indingDetails\022;\n\021container_details\030\001 \001(\013" + + "2 .google.privacy.dlp.v2.Container\022\023\n\013fi" + + "le_offset\030\002 \001(\003\022\022\n\nrow_offset\030\003 \001(\003\022:\n\rt" + + "able_options\030\004 \001(\0132#.google.privacy.dlp." + + "v2.TableOptions\022G\n\006labels\030\005 \003(\01327.google" + + ".privacy.dlp.v2.HybridFindingDetails.Lab" + + "elsEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" + + "value\030\002 \001(\t:\0028\001\"\027\n\025HybridInspectResponse" + + "\"\303\001\n\024ImageContainmentType\0223\n\010encloses\030\001 " + + "\001(\0132\037.google.privacy.dlp.v2.EnclosesH\000\022:" + + "\n\014fully_inside\030\002 \001(\0132\".google.privacy.dl" + + "p.v2.FullyInsideH\000\0222\n\010overlaps\030\003 \001(\0132\036.g" + + "oogle.privacy.dlp.v2.OverlapH\000B\006\n\004type\"\t" + + "\n\007Overlap\"\n\n\010Encloses\"\r\n\013FullyInside\"\250\001\n" + + "\036ListProjectDataProfilesRequest\022=\n\006paren" + + "t\030\001 \001(\tB-\340A\002\372A\'\022%dlp.googleapis.com/Proj" + + "ectDataProfile\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpa" + + "ge_size\030\003 \001(\005\022\020\n\010order_by\030\004 \001(\t\022\016\n\006filte" + + "r\030\005 \001(\t\"\204\001\n\037ListProjectDataProfilesRespo" + + "nse\022H\n\025project_data_profiles\030\001 \003(\0132).goo" + + "gle.privacy.dlp.v2.ProjectDataProfile\022\027\n" + + "\017next_page_token\030\002 \001(\t\"\244\001\n\034ListTableData" + + "ProfilesRequest\022;\n\006parent\030\001 \001(\tB+\340A\002\372A%\022" + + "#dlp.googleapis.com/TableDataProfile\022\022\n\n" + + "page_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\020\n\010o" + + "rder_by\030\004 \001(\t\022\016\n\006filter\030\005 \001(\t\"~\n\035ListTab" + + "leDataProfilesResponse\022D\n\023table_data_pro" + + "files\030\001 \003(\0132\'.google.privacy.dlp.v2.Tabl" + + "eDataProfile\022\027\n\017next_page_token\030\002 \001(\t\"\246\001" + + "\n\035ListColumnDataProfilesRequest\022<\n\006paren" + + "t\030\001 \001(\tB,\340A\002\372A&\022$dlp.googleapis.com/Colu" + + "mnDataProfile\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpag" + + "e_size\030\003 \001(\005\022\020\n\010order_by\030\004 \001(\t\022\016\n\006filter" + + "\030\005 \001(\t\"\201\001\n\036ListColumnDataProfilesRespons" + + "e\022F\n\024column_data_profiles\030\001 \003(\0132(.google" + + ".privacy.dlp.v2.ColumnDataProfile\022\027\n\017nex" + + "t_page_token\030\002 \001(\t\"\313\001\n\rDataRiskLevel\022F\n\005" + + "score\030\001 \001(\01627.google.privacy.dlp.v2.Data" + + "RiskLevel.DataRiskLevelScore\"r\n\022DataRisk" + + "LevelScore\022\032\n\026RISK_SCORE_UNSPECIFIED\020\000\022\014" + + "\n\010RISK_LOW\020\n\022\020\n\014RISK_UNKNOWN\020\014\022\021\n\rRISK_M" + + "ODERATE\020\024\022\r\n\tRISK_HIGH\020\036\"\334\004\n\022ProjectData" + + "Profile\022\014\n\004name\030\001 \001(\t\022\022\n\nproject_id\030\002 \001(" + + "\t\022:\n\026profile_last_generated\030\003 \001(\0132\032.goog" + + "le.protobuf.Timestamp\022B\n\021sensitivity_sco" + + "re\030\004 \001(\0132\'.google.privacy.dlp.v2.Sensiti" + + "vityScore\022=\n\017data_risk_level\030\005 \001(\0132$.goo" + + "gle.privacy.dlp.v2.DataRiskLevel\022<\n\016prof" + + "ile_status\030\007 \001(\0132$.google.privacy.dlp.v2" + + ".ProfileStatus\022 \n\030table_data_profile_cou" + + "nt\030\t \001(\003\022%\n\035file_store_data_profile_coun" + + "t\030\n \001(\003:\335\001\352A\331\001\n%dlp.googleapis.com/Proje" + + "ctDataProfile\022\\organizations/{organizati" + + "on}/locations/{location}/projectDataProf" + + "iles/{project_data_profile}\022Rprojects/{p" + + "roject}/locations/{location}/projectData" + + "Profiles/{project_data_profile}\"\311\002\n\031Data" + + "ProfileConfigSnapshot\022<\n\016inspect_config\030" + + "\002 \001(\0132$.google.privacy.dlp.v2.InspectCon" + + "fig\022I\n\020data_profile_job\030\003 \001(\0132+.google.p" + + "rivacy.dlp.v2.DataProfileJobConfigB\002\030\001\022@" + + "\n\020discovery_config\030\004 \001(\0132&.google.privac" + + "y.dlp.v2.DiscoveryConfig\022\035\n\025inspect_temp" + + "late_name\030\005 \001(\t\022B\n\036inspect_template_modi" + + "fied_time\030\006 \001(\0132\032.google.protobuf.Timest" + + "amp\"\223\016\n\020TableDataProfile\022\014\n\004name\030\001 \001(\t\022?" + + "\n\020data_source_type\030$ \001(\0132%.google.privac" + + "y.dlp.v2.DataSourceType\022\034\n\024project_data_" + + "profile\030\002 \001(\t\022\032\n\022dataset_project_id\030\030 \001(" + + "\t\022\030\n\020dataset_location\030\035 \001(\t\022\022\n\ndataset_i" + + "d\030\031 \001(\t\022\020\n\010table_id\030\032 \001(\t\022\025\n\rfull_resour" + + "ce\030\003 \001(\t\022<\n\016profile_status\030\025 \001(\0132$.googl" + + "e.privacy.dlp.v2.ProfileStatus\022<\n\005state\030" + + "\026 \001(\0162-.google.privacy.dlp.v2.TableDataP" + + "rofile.State\022B\n\021sensitivity_score\030\005 \001(\0132" + + "\'.google.privacy.dlp.v2.SensitivityScore" + + "\022=\n\017data_risk_level\030\006 \001(\0132$.google.priva" + + "cy.dlp.v2.DataRiskLevel\022D\n\024predicted_inf" + + "o_types\030\033 \003(\0132&.google.privacy.dlp.v2.In" + + "foTypeSummary\022E\n\020other_info_types\030\034 \003(\0132" + + "+.google.privacy.dlp.v2.OtherInfoTypeSum" + + "mary\022I\n\017config_snapshot\030\007 \001(\01320.google.p" + + "rivacy.dlp.v2.DataProfileConfigSnapshot\022" + + "6\n\022last_modified_time\030\010 \001(\0132\032.google.pro" + + "tobuf.Timestamp\0223\n\017expiration_time\030\t \001(\013" + + "2\032.google.protobuf.Timestamp\022\034\n\024scanned_" + + "column_count\030\n \001(\003\022\033\n\023failed_column_coun" + + "t\030\013 \001(\003\022\030\n\020table_size_bytes\030\014 \001(\003\022\021\n\trow" + + "_count\030\r \001(\003\022B\n\021encryption_status\030\016 \001(\0162" + + "\'.google.privacy.dlp.v2.EncryptionStatus" + + "\022F\n\023resource_visibility\030\017 \001(\0162).google.p" + + "rivacy.dlp.v2.ResourceVisibility\022:\n\026prof" + + "ile_last_generated\030\020 \001(\0132\032.google.protob" + + "uf.Timestamp\022T\n\017resource_labels\030\021 \003(\0132;." + + "google.privacy.dlp.v2.TableDataProfile.R" + + "esourceLabelsEntry\022/\n\013create_time\030\027 \001(\0132" + + "\032.google.protobuf.Timestamp\022C\n\025sample_fi" + + "ndings_table\030% \001(\0132$.google.privacy.dlp." + + "v2.BigQueryTable\022(\n\004tags\030\' \003(\0132\032.google." + + "privacy.dlp.v2.Tag\022A\n\021related_resources\030" + + ") \003(\0132&.google.privacy.dlp.v2.RelatedRes" + + "ource\022.\n\007domains\030/ \003(\0132\035.google.privacy." + + "dlp.v2.Domain\0325\n\023ResourceLabelsEntry\022\013\n\003" + + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"5\n\005State\022\025\n" + + "\021STATE_UNSPECIFIED\020\000\022\013\n\007RUNNING\020\001\022\010\n\004DON" + + "E\020\002:\323\001\352A\317\001\n#dlp.googleapis.com/TableData" + + "Profile\022Xorganizations/{organization}/lo" + + "cations/{location}/tableDataProfiles/{ta" + + "ble_data_profile}\022Nprojects/{project}/lo" + + "cations/{location}/tableDataProfiles/{ta" + + "ble_data_profile}\"b\n\rProfileStatus\022\"\n\006st" + + "atus\030\001 \001(\0132\022.google.rpc.Status\022-\n\ttimest" + + "amp\030\003 \001(\0132\032.google.protobuf.Timestamp\"g\n" + + "\017InfoTypeSummary\0222\n\tinfo_type\030\001 \001(\0132\037.go" + + "ogle.privacy.dlp.v2.InfoType\022 \n\024estimate" + + "d_prevalence\030\002 \001(\005B\002\030\001\"\210\001\n\024OtherInfoType" + + "Summary\0222\n\tinfo_type\030\001 \001(\0132\037.google.priv" + + "acy.dlp.v2.InfoType\022\034\n\024estimated_prevale" + + "nce\030\002 \001(\005\022\036\n\026excluded_from_analysis\030\003 \001(" + + "\010\"\311\r\n\021ColumnDataProfile\022\014\n\004name\030\001 \001(\t\022<\n" + + "\016profile_status\030\021 \001(\0132$.google.privacy.d" + + "lp.v2.ProfileStatus\022=\n\005state\030\022 \001(\0162..goo" + + "gle.privacy.dlp.v2.ColumnDataProfile.Sta" + + "te\022:\n\026profile_last_generated\030\003 \001(\0132\032.goo" + + "gle.protobuf.Timestamp\022\032\n\022table_data_pro" + + "file\030\004 \001(\t\022\033\n\023table_full_resource\030\005 \001(\t\022" + + "\032\n\022dataset_project_id\030\023 \001(\t\022\030\n\020dataset_l" + + "ocation\030\024 \001(\t\022\022\n\ndataset_id\030\025 \001(\t\022\020\n\010tab" + + "le_id\030\026 \001(\t\022\016\n\006column\030\006 \001(\t\022B\n\021sensitivi" + + "ty_score\030\007 \001(\0132\'.google.privacy.dlp.v2.S" + + "ensitivityScore\022=\n\017data_risk_level\030\010 \001(\013" + + "2$.google.privacy.dlp.v2.DataRiskLevel\022@" + + "\n\020column_info_type\030\t \001(\0132&.google.privac" + + "y.dlp.v2.InfoTypeSummary\022B\n\rother_matche" + + "s\030\n \003(\0132+.google.privacy.dlp.v2.OtherInf" + + "oTypeSummary\022M\n\031estimated_null_percentag" + + "e\030\027 \001(\0162*.google.privacy.dlp.v2.NullPerc" + + "entageLevel\022O\n\032estimated_uniqueness_scor" + + "e\030\030 \001(\0162+.google.privacy.dlp.v2.Uniquene" + + "ssScoreLevel\022\027\n\017free_text_score\030\r \001(\001\022L\n" + + "\013column_type\030\016 \001(\01627.google.privacy.dlp." + + "v2.ColumnDataProfile.ColumnDataType\022P\n\014p" + + "olicy_state\030\017 \001(\0162:.google.privacy.dlp.v" + + "2.ColumnDataProfile.ColumnPolicyState\"5\n" + + "\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007RUNNING" + + "\020\001\022\010\n\004DONE\020\002\"\377\002\n\016ColumnDataType\022 \n\034COLUM" + + "N_DATA_TYPE_UNSPECIFIED\020\000\022\016\n\nTYPE_INT64\020" + + "\001\022\r\n\tTYPE_BOOL\020\002\022\020\n\014TYPE_FLOAT64\020\003\022\017\n\013TY" + + "PE_STRING\020\004\022\016\n\nTYPE_BYTES\020\005\022\022\n\016TYPE_TIME" + + "STAMP\020\006\022\r\n\tTYPE_DATE\020\007\022\r\n\tTYPE_TIME\020\010\022\021\n" + + "\rTYPE_DATETIME\020\t\022\022\n\016TYPE_GEOGRAPHY\020\n\022\020\n\014" + + "TYPE_NUMERIC\020\013\022\017\n\013TYPE_RECORD\020\014\022\023\n\017TYPE_" + + "BIGNUMERIC\020\r\022\r\n\tTYPE_JSON\020\016\022\021\n\rTYPE_INTE" + + "RVAL\020\017\022\023\n\017TYPE_RANGE_DATE\020\020\022\027\n\023TYPE_RANG" + + "E_DATETIME\020\021\022\030\n\024TYPE_RANGE_TIMESTAMP\020\022\"R" + + "\n\021ColumnPolicyState\022#\n\037COLUMN_POLICY_STA" + + "TE_UNSPECIFIED\020\000\022\030\n\024COLUMN_POLICY_TAGGED" + + "\020\001:\330\001\352A\324\001\n$dlp.googleapis.com/ColumnData" + + "Profile\022Zorganizations/{organization}/lo" + + "cations/{location}/columnDataProfiles/{c" + + "olumn_data_profile}\022Pprojects/{project}/" + + "locations/{location}/columnDataProfiles/" + + "{column_data_profile}\"\350\016\n\024FileStoreDataP" + + "rofile\022\014\n\004name\030\001 \001(\t\022?\n\020data_source_type" + + "\030\002 \001(\0132%.google.privacy.dlp.v2.DataSourc" + + "eType\022\034\n\024project_data_profile\030\003 \001(\t\022\022\n\np" + + "roject_id\030\004 \001(\t\022\033\n\023file_store_location\030\005" + + " \001(\t\022\036\n\026data_storage_locations\030\023 \003(\t\022\025\n\r" + + "location_type\030\024 \001(\t\022\027\n\017file_store_path\030\006" + + " \001(\t\022\025\n\rfull_resource\030\030 \001(\t\022I\n\017config_sn" + + "apshot\030\007 \001(\01320.google.privacy.dlp.v2.Dat" + + "aProfileConfigSnapshot\022<\n\016profile_status" + + "\030\010 \001(\0132$.google.privacy.dlp.v2.ProfileSt" + + "atus\022@\n\005state\030\t \001(\01621.google.privacy.dlp" + + ".v2.FileStoreDataProfile.State\022:\n\026profil" + + "e_last_generated\030\n \001(\0132\032.google.protobuf" + + ".Timestamp\022F\n\023resource_visibility\030\013 \001(\0162" + + ").google.privacy.dlp.v2.ResourceVisibili" + + "ty\022B\n\021sensitivity_score\030\014 \001(\0132\'.google.p" + + "rivacy.dlp.v2.SensitivityScore\022=\n\017data_r" + + "isk_level\030\r \001(\0132$.google.privacy.dlp.v2." + + "DataRiskLevel\022/\n\013create_time\030\016 \001(\0132\032.goo" + + "gle.protobuf.Timestamp\0226\n\022last_modified_" + + "time\030\017 \001(\0132\032.google.protobuf.Timestamp\022I" + + "\n\026file_cluster_summaries\030\020 \003(\0132).google." + + "privacy.dlp.v2.FileClusterSummary\022`\n\023res" + + "ource_attributes\030\021 \003(\0132C.google.privacy." + + "dlp.v2.FileStoreDataProfile.ResourceAttr" + + "ibutesEntry\022X\n\017resource_labels\030\022 \003(\0132?.g", + "oogle.privacy.dlp.v2.FileStoreDataProfile.ResourceLabelsEntry\022W\n" + "\036file_store_info_type_summaries\030\025" + " \003(\0132/.google.privacy.dlp.v2.FileStoreInfoTypeSummary\022C\n" - + "\025sample_findings_table\030\026 \001(\0132$.google.privacy.dlp.v2.BigQ", - "ueryTable\022\033\n" + + "\025sample_findings_table\030\026" + + " \001(\0132$.google.privacy.dlp.v2.BigQueryTable\022\033\n" + "\023file_store_is_empty\030\027 \001(\010\022(\n" + "\004tags\030\031 \003(\0132\032.google.privacy.dlp.v2.Tag\022A\n" + "\021related_resources\030\032 \003(\0132&.google.privacy.dlp.v2.RelatedResource\022.\n" @@ -3406,9 +3322,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\021STATE_UNSPECIFIED\020\000\022\013\n" + "\007RUNNING\020\001\022\010\n" + "\004DONE\020\002:\351\001\352A\345\001\n" - + "\'dlp.googleapis.com/FileStoreDataProfile\022aorganizations/{organization}/locatio" - + "ns/{location}/fileStoreDataProfiles/{file_store_data_profile}\022Wprojects/{project" - + "}/locations/{location}/fileStoreDataProfiles/{file_store_data_profile}\"?\n" + + "\'dlp.googleapis.com/FileStoreDataProfile\022aorganizations/{organizatio" + + "n}/locations/{location}/fileStoreDataProfiles/{file_store_data_profile}\022Wproject" + + "s/{project}/locations/{location}/fileStoreDataProfiles/{file_store_data_profile}\"?\n" + "\003Tag\022\034\n" + "\024namespaced_tag_value\030\001 \001(\t\022\013\n" + "\003key\030\002 \001(\t\022\r\n" @@ -3427,16 +3343,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\016file_extension\030\001 \001(\t\"\214\004\n" + "\022FileClusterSummary\022A\n" + "\021file_cluster_type\030\001 \001(\0132&.google.privacy.dlp.v2.FileClusterType\022W\n" - + "\036file_store_info_type_summaries\030\002 \003(\0132/.google" - + ".privacy.dlp.v2.FileStoreInfoTypeSummary\022B\n" - + "\021sensitivity_score\030\003" - + " \001(\0132\'.google.privacy.dlp.v2.SensitivityScore\022=\n" + + "\036file_store_info_type_summaries\030\002 \003(" + + "\0132/.google.privacy.dlp.v2.FileStoreInfoTypeSummary\022B\n" + + "\021sensitivity_score\030\003 \001(\0132\'." + + "google.privacy.dlp.v2.SensitivityScore\022=\n" + "\017data_risk_level\030\004 \001(\0132$.google.privacy.dlp.v2.DataRiskLevel\022,\n" + "\006errors\030\006 \003(\0132\034.google.privacy.dlp.v2.Error\022I\n" + "\027file_extensions_scanned\030\007" + " \003(\0132(.google.privacy.dlp.v2.FileExtensionInfo\022F\n" - + "\024file_extensions_seen\030\010 \003" - + "(\0132(.google.privacy.dlp.v2.FileExtensionInfo\022\026\n" + + "\024file_extensions_seen\030\010" + + " \003(\0132(.google.privacy.dlp.v2.FileExtensionInfo\022\026\n" + "\016no_files_exist\030\t \001(\010\"[\n" + "\034GetProjectDataProfileRequest\022;\n" + "\004name\030\001 \001(\tB-\340A\002\372A\'\n" @@ -3445,15 +3361,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\004name\030\001 \001(\tB-\340A\002\372A\'\n" + "%dlp.googleapis.com/ProjectDataProfile\"\300\001\n" + " ListFileStoreDataProfilesRequest\022?\n" - + "\006parent\030\001 \001(\tB/\340A\002\372A)\022\'d" - + "lp.googleapis.com/FileStoreDataProfile\022\027\n\n" + + "\006parent\030\001 \001(\tB" + + "/\340A\002\372A)\022\'dlp.googleapis.com/FileStoreDataProfile\022\027\n\n" + "page_token\030\002 \001(\tB\003\340A\001\022\026\n" + "\tpage_size\030\003 \001(\005B\003\340A\001\022\025\n" + "\010order_by\030\004 \001(\tB\003\340A\001\022\023\n" + "\006filter\030\005 \001(\tB\003\340A\001\"\213\001\n" + "!ListFileStoreDataProfilesResponse\022M\n" - + "\030file_store_data_profiles\030\001 " - + "\003(\0132+.google.privacy.dlp.v2.FileStoreDataProfile\022\027\n" + + "\030file_store_data_profiles\030\001" + + " \003(\0132+.google.privacy.dlp.v2.FileStoreDataProfile\022\027\n" + "\017next_page_token\030\002 \001(\t\"b\n" + "!DeleteFileStoreDataProfileRequest\022=\n" + "\004name\030\001 \001(\tB/\340A\002\372A)\n" @@ -3465,19 +3381,19 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\004name\030\001 \001(\tB,\340A\002\372A&\n" + "$dlp.googleapis.com/ColumnDataProfile\"\352\005\n" + "\032DataProfilePubSubCondition\022X\n" - + "\013expressions\030\001" - + " \001(\0132C.google.privacy.dlp.v2.DataProfilePubSubCondition.PubSubExpressions\032\351\001\n" + + "\013expressions\030\001 \001(\0132C.google.privacy.dlp.v2." + + "DataProfilePubSubCondition.PubSubExpressions\032\351\001\n" + "\017PubSubCondition\022b\n" - + "\022minimum_risk_score\030\001 \001" - + "(\0162D.google.privacy.dlp.v2.DataProfilePubSubCondition.ProfileScoreBucketH\000\022i\n" - + "\031minimum_sensitivity_score\030\002 \001(\0162D.google.p" - + "rivacy.dlp.v2.DataProfilePubSubCondition.ProfileScoreBucketH\000B\007\n" + + "\022minimum_risk_score\030\001 \001(\0162D.google.privacy.dlp.v2.Dat" + + "aProfilePubSubCondition.ProfileScoreBucketH\000\022i\n" + + "\031minimum_sensitivity_score\030\002 \001(\0162" + + "D.google.privacy.dlp.v2.DataProfilePubSubCondition.ProfileScoreBucketH\000B\007\n" + "\005value\032\253\002\n" + "\021PubSubExpressions\022s\n" - + "\020logical_operator\030\001 \001(\0162Y.google.privacy.dlp.v2.DataProfilePubSub" - + "Condition.PubSubExpressions.PubSubLogicalOperator\022U\n\n" - + "conditions\030\002 \003(\0132A.google.p" - + "rivacy.dlp.v2.DataProfilePubSubCondition.PubSubCondition\"J\n" + + "\020logical_operator\030\001 \001(\0162Y.google.privacy.dlp.v2.DataPro" + + "filePubSubCondition.PubSubExpressions.PubSubLogicalOperator\022U\n\n" + + "conditions\030\002 \003(\0132" + + "A.google.privacy.dlp.v2.DataProfilePubSubCondition.PubSubCondition\"J\n" + "\025PubSubLogicalOperator\022 \n" + "\034LOGICAL_OPERATOR_UNSPECIFIED\020\000\022\006\n" + "\002OR\020\001\022\007\n" @@ -3490,8 +3406,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\007profile\030\001 \001(\0132\'.google.privacy.dlp.v2.TableDataProfile\022G\n" + "\022file_store_profile\030\003" + " \001(\0132+.google.privacy.dlp.v2.FileStoreDataProfile\022A\n" - + "\005event\030\002 \001(\01622." - + "google.privacy.dlp.v2.DataProfileAction.EventType\"\214\001\n" + + "\005event\030\002" + + " \001(\01622.google.privacy.dlp.v2.DataProfileAction.EventType\"\214\001\n" + "\027CreateConnectionRequest\0225\n" + "\006parent\030\001 \001(" + "\tB%\340A\002\372A\037\022\035dlp.googleapis.com/Connection\022:\n\n" @@ -3527,14 +3443,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\035dlp.googleapis.com/Connection\"\220\003\n\n" + "Connection\022\021\n" + "\004name\030\001 \001(\tB\003\340A\003\022:\n" - + "\005state\030\002 \001(\0162&." - + "google.privacy.dlp.v2.ConnectionStateB\003\340A\002\0221\n" + + "\005state\030\002" + + " \001(\0162&.google.privacy.dlp.v2.ConnectionStateB\003\340A\002\0221\n" + "\006errors\030\003 \003(\0132\034.google.privacy.dlp.v2.ErrorB\003\340A\003\022>\n" - + "\tcloud_sql\030\004 \001(\0132).googl" - + "e.privacy.dlp.v2.CloudSqlPropertiesH\000:\261\001\352A\255\001\n" - + "\035dlp.googleapis.com/Connection\022@projects/{project}/locations/{location}/con" - + "nections/{connection}\022Jorganizations/{or" - + "ganization}/locations/{location}/connections/{connection}B\014\n\n" + + "\tcloud_sql\030\004 \001" + + "(\0132).google.privacy.dlp.v2.CloudSqlPropertiesH\000:\261\001\352A\255\001\n" + + "\035dlp.googleapis.com/Connection\022@projects/{project}/locations/{loc" + + "ation}/connections/{connection}\022Jorganiz" + + "ations/{organization}/locations/{location}/connections/{connection}B\014\n\n" + "properties\"[\n" + "\027SecretManagerCredential\022\025\n" + "\010username\030\001 \001(\tB\003\340A\002\022)\n" @@ -3542,13 +3458,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\025CloudSqlIamCredential\"\265\003\n" + "\022CloudSqlProperties\022\037\n" + "\017connection_name\030\001 \001(\tB\006\340A\005\340A\001\022K\n" - + "\021username_password\030\002 \001(\0132..googl" - + "e.privacy.dlp.v2.SecretManagerCredentialH\000\022E\n\r" - + "cloud_sql_iam\030\003" - + " \001(\0132,.google.privacy.dlp.v2.CloudSqlIamCredentialH\000\022\034\n" + + "\021username_password\030\002 \001" + + "(\0132..google.privacy.dlp.v2.SecretManagerCredentialH\000\022E\n\r" + + "cloud_sql_iam\030\003 \001(\0132,.go" + + "ogle.privacy.dlp.v2.CloudSqlIamCredentialH\000\022\034\n" + "\017max_connections\030\004 \001(\005B\003\340A\002\022V\n" - + "\017database_engine\030\007" - + " \001(\01628.google.privacy.dlp.v2.CloudSqlProperties.DatabaseEngineB\003\340A\002\"f\n" + + "\017database_engine\030\007 \001(\01628.google.privacy.dlp." + + "v2.CloudSqlProperties.DatabaseEngineB\003\340A\002\"f\n" + "\016DatabaseEngine\022\033\n" + "\027DATABASE_ENGINE_UNKNOWN\020\000\022\031\n" + "\025DATABASE_ENGINE_MYSQL\020\001\022\034\n" @@ -3560,8 +3476,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\016DataSourceType\022\023\n" + "\013data_source\030\001 \001(\t\"\364\002\n" + "\017FileClusterType\022A\n" - + "\007cluster\030\001 \001(\0162.." - + "google.privacy.dlp.v2.FileClusterType.ClusterH\000\"\210\002\n" + + "\007cluster\030\001" + + " \001(\0162..google.privacy.dlp.v2.FileClusterType.ClusterH\000\"\210\002\n" + "\007Cluster\022\027\n" + "\023CLUSTER_UNSPECIFIED\020\000\022\023\n" + "\017CLUSTER_UNKNOWN\020\001\022\020\n" @@ -3577,22 +3493,22 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "B\023\n" + "\021file_cluster_type\"\266\005\n" + "\022ProcessingLocation\022`\n" - + "\027image_fallback_location\030\001 \001(\0132?.google" - + ".privacy.dlp.v2.ProcessingLocation.ImageFallbackLocation\022f\n" - + "\032document_fallback_location\030\002 \001(\0132B.google.privacy.dlp.v2.Pro" - + "cessingLocation.DocumentFallbackLocation\032\027\n" + + "\027image_fallback_location\030\001 \001(" + + "\0132?.google.privacy.dlp.v2.ProcessingLocation.ImageFallbackLocation\022f\n" + + "\032document_fallback_location\030\002 \001(\0132B.google.privacy." + + "dlp.v2.ProcessingLocation.DocumentFallbackLocation\032\027\n" + "\025MultiRegionProcessing\032\022\n" + "\020GlobalProcessing\032\321\001\n" + "\025ImageFallbackLocation\022`\n" - + "\027multi_region_processing\030d \001(\0132?.google.privac" - + "y.dlp.v2.ProcessingLocation.MultiRegionProcessing\022V\n" - + "\021global_processing\030\310\001 \001(\0132:." - + "google.privacy.dlp.v2.ProcessingLocation.GlobalProcessing\032\324\001\n" - + "\030DocumentFallbackLocation\022`\n" - + "\027multi_region_processing\030d \001(\0132" - + "?.google.privacy.dlp.v2.ProcessingLocation.MultiRegionProcessing\022V\n" + + "\027multi_region_processing\030d \001(\0132?.goo" + + "gle.privacy.dlp.v2.ProcessingLocation.MultiRegionProcessing\022V\n" + "\021global_processing\030\310\001" - + " \001(\0132:.google.privacy.dlp.v2.ProcessingLocation.GlobalProcessing\"K\n" + + " \001(\0132:.google.privacy.dlp.v2.ProcessingLocation.GlobalProcessing\032\324\001\n" + + "\030DocumentFallbackLocation\022`\n" + + "\027multi_region_processing\030d" + + " \001(\0132?.google.privacy.dlp.v2.ProcessingLocation.MultiRegionProcessing\022V\n" + + "\021global_processing\030\310\001 \001(\0132:.google.privacy." + + "dlp.v2.ProcessingLocation.GlobalProcessing\"K\n" + "\027SaveToGcsFindingsOutput\0220\n" + "\010findings\030\001 \003(\0132\036.google.privacy.dlp.v2.Finding\"\306\002\n" + "\006Domain\0228\n" @@ -3672,7 +3588,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\014GREATER_THAN\020\003\022\r\n" + "\tLESS_THAN\020\004\022\032\n" + "\026GREATER_THAN_OR_EQUALS\020\005\022\027\n" - + "\023LESS_THAN_OR_EQUALS\020\006\022\n\n" + + "\023LESS_THAN_OR_EQUALS\020\006\022\n" + + "\n" + "\006EXISTS\020\007*\256\001\n" + "\014MatchingType\022\035\n" + "\031MATCHING_TYPE_UNSPECIFIED\020\000\022\034\n" @@ -3682,13 +3599,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\033MATCHING_TYPE_RULE_SPECIFIC\020\004*M\n\r" + "ContentOption\022\027\n" + "\023CONTENT_UNSPECIFIED\020\000\022\020\n" - + "\014CONTENT_TEXT\020\001\022\021\n" - + "\r" - + "CONTENT_IMAGE\020\002*X\n" + + "\014CONTENT_TEXT\020\001\022\021\n\r" + + "CONTENT_IMAGE\020\002*v\n" + "\014MetadataType\022\034\n" + "\030METADATATYPE_UNSPECIFIED\020\000\022\024\n" + "\020STORAGE_METADATA\020\002\022\024\n" - + "\020CONTENT_METADATA\020\003*P\n" + + "\020CONTENT_METADATA\020\003\022\034\n" + + "\030CLIENT_PROVIDED_METADATA\020\004*P\n" + "\023InfoTypeSupportedBy\022\031\n" + "\025ENUM_TYPE_UNSPECIFIED\020\000\022\013\n" + "\007INSPECT\020\001\022\021\n\r" @@ -3836,13 +3753,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "/locations/*/jobTriggers/*}:hybridInspect:\001*\022\200\002\n\r" + "GetJobTrigger\022+.google.privacy.dlp.v2.GetJobTriggerRequest\032!.google.pri" + "vacy.dlp.v2.JobTrigger\"\236\001\332A\004name\202\323\344\223\002\220\001\022" - + "#/v2/{name=projects/*/jobTriggers/*}Z1\022//v2/{name=projects/*/locations/*/jobTrig" - + "gers/*}Z6\0224/v2/{name=organizations/*/locations/*/jobTriggers/*}\022\223\002\n" - + "\017ListJobTriggers\022-.google.privacy.dlp.v2.ListJobTrigg" + + "#/v2/{name=projects/*/jobTriggers/*}Z1\022//v2/{name=projects/*/locations/*/jobTrig", + "gers/*}Z6\0224/v2/{name=organizations/*/loc" + + "ations/*/jobTriggers/*}\022\223\002\n\017ListJobTrigg" + + "ers\022-.google.privacy.dlp.v2.ListJobTrigg" + "ersRequest\032..google.privacy.dlp.v2.ListJ" + "obTriggersResponse\"\240\001\332A\006parent\202\323\344\223\002\220\001\022#/" - + "v2/{parent=projects/*}/jobTriggersZ1\022//v", - "2/{parent=projects/*/locations/*}/jobTri" + + "v2/{parent=projects/*}/jobTriggersZ1\022//v" + + "2/{parent=projects/*/locations/*}/jobTri" + "ggersZ6\0224/v2/{parent=organizations/*/loc" + "ations/*}/jobTriggers\022\373\001\n\020DeleteJobTrigg" + "er\022..google.privacy.dlp.v2.DeleteJobTrig" @@ -4234,9 +4152,17 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ContentItem_descriptor, new java.lang.String[] { - "Value", "Table", "ByteItem", "DataItem", + "Value", "Table", "ByteItem", "ContentMetadata", "DataItem", + }); + internal_static_google_privacy_dlp_v2_ContentMetadata_descriptor = + getDescriptor().getMessageType(12); + internal_static_google_privacy_dlp_v2_ContentMetadata_fieldAccessorTable = + new com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_google_privacy_dlp_v2_ContentMetadata_descriptor, + new java.lang.String[] { + "Properties", }); - internal_static_google_privacy_dlp_v2_Table_descriptor = getDescriptor().getMessageType(12); + internal_static_google_privacy_dlp_v2_Table_descriptor = getDescriptor().getMessageType(13); internal_static_google_privacy_dlp_v2_Table_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Table_descriptor, @@ -4251,15 +4177,23 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "Values", }); + internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_descriptor = + getDescriptor().getMessageType(14); + internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_fieldAccessorTable = + new com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_descriptor, + new java.lang.String[] { + "Key", "Value", + }); internal_static_google_privacy_dlp_v2_InspectResult_descriptor = - getDescriptor().getMessageType(13); + getDescriptor().getMessageType(15); internal_static_google_privacy_dlp_v2_InspectResult_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InspectResult_descriptor, new java.lang.String[] { "Findings", "FindingsTruncated", }); - internal_static_google_privacy_dlp_v2_Finding_descriptor = getDescriptor().getMessageType(14); + internal_static_google_privacy_dlp_v2_Finding_descriptor = getDescriptor().getMessageType(16); internal_static_google_privacy_dlp_v2_Finding_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Finding_descriptor, @@ -4286,7 +4220,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "Key", "Value", }); - internal_static_google_privacy_dlp_v2_Location_descriptor = getDescriptor().getMessageType(15); + internal_static_google_privacy_dlp_v2_Location_descriptor = getDescriptor().getMessageType(17); internal_static_google_privacy_dlp_v2_Location_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Location_descriptor, @@ -4294,7 +4228,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ByteRange", "CodepointRange", "ContentLocations", "Container", }); internal_static_google_privacy_dlp_v2_ContentLocation_descriptor = - getDescriptor().getMessageType(16); + getDescriptor().getMessageType(18); internal_static_google_privacy_dlp_v2_ContentLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ContentLocation_descriptor, @@ -4309,7 +4243,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Location", }); internal_static_google_privacy_dlp_v2_MetadataLocation_descriptor = - getDescriptor().getMessageType(17); + getDescriptor().getMessageType(19); internal_static_google_privacy_dlp_v2_MetadataLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_MetadataLocation_descriptor, @@ -4317,7 +4251,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Type", "StorageLabel", "KeyValueMetadataLabel", "Label", }); internal_static_google_privacy_dlp_v2_StorageMetadataLabel_descriptor = - getDescriptor().getMessageType(18); + getDescriptor().getMessageType(20); internal_static_google_privacy_dlp_v2_StorageMetadataLabel_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_StorageMetadataLabel_descriptor, @@ -4325,7 +4259,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Key", }); internal_static_google_privacy_dlp_v2_KeyValueMetadataLabel_descriptor = - getDescriptor().getMessageType(19); + getDescriptor().getMessageType(21); internal_static_google_privacy_dlp_v2_KeyValueMetadataLabel_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_KeyValueMetadataLabel_descriptor, @@ -4333,7 +4267,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Key", }); internal_static_google_privacy_dlp_v2_DocumentLocation_descriptor = - getDescriptor().getMessageType(20); + getDescriptor().getMessageType(22); internal_static_google_privacy_dlp_v2_DocumentLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DocumentLocation_descriptor, @@ -4341,7 +4275,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "FileOffset", }); internal_static_google_privacy_dlp_v2_RecordLocation_descriptor = - getDescriptor().getMessageType(21); + getDescriptor().getMessageType(23); internal_static_google_privacy_dlp_v2_RecordLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RecordLocation_descriptor, @@ -4349,21 +4283,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "RecordKey", "FieldId", "TableLocation", }); internal_static_google_privacy_dlp_v2_TableLocation_descriptor = - getDescriptor().getMessageType(22); + getDescriptor().getMessageType(24); internal_static_google_privacy_dlp_v2_TableLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TableLocation_descriptor, new java.lang.String[] { "RowIndex", }); - internal_static_google_privacy_dlp_v2_Container_descriptor = getDescriptor().getMessageType(23); + internal_static_google_privacy_dlp_v2_Container_descriptor = getDescriptor().getMessageType(25); internal_static_google_privacy_dlp_v2_Container_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Container_descriptor, new java.lang.String[] { "Type", "ProjectId", "FullPath", "RootPath", "RelativePath", "UpdateTime", "Version", }); - internal_static_google_privacy_dlp_v2_Range_descriptor = getDescriptor().getMessageType(24); + internal_static_google_privacy_dlp_v2_Range_descriptor = getDescriptor().getMessageType(26); internal_static_google_privacy_dlp_v2_Range_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Range_descriptor, @@ -4371,7 +4305,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Start", "End", }); internal_static_google_privacy_dlp_v2_ImageLocation_descriptor = - getDescriptor().getMessageType(25); + getDescriptor().getMessageType(27); internal_static_google_privacy_dlp_v2_ImageLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ImageLocation_descriptor, @@ -4379,7 +4313,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "BoundingBoxes", }); internal_static_google_privacy_dlp_v2_BoundingBox_descriptor = - getDescriptor().getMessageType(26); + getDescriptor().getMessageType(28); internal_static_google_privacy_dlp_v2_BoundingBox_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_BoundingBox_descriptor, @@ -4387,7 +4321,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Top", "Left", "Width", "Height", }); internal_static_google_privacy_dlp_v2_RedactImageRequest_descriptor = - getDescriptor().getMessageType(27); + getDescriptor().getMessageType(29); internal_static_google_privacy_dlp_v2_RedactImageRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RedactImageRequest_descriptor, @@ -4409,7 +4343,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "InfoType", "RedactAllText", "RedactionColor", "Target", }); - internal_static_google_privacy_dlp_v2_Color_descriptor = getDescriptor().getMessageType(28); + internal_static_google_privacy_dlp_v2_Color_descriptor = getDescriptor().getMessageType(30); internal_static_google_privacy_dlp_v2_Color_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Color_descriptor, @@ -4417,7 +4351,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Red", "Green", "Blue", }); internal_static_google_privacy_dlp_v2_RedactImageResponse_descriptor = - getDescriptor().getMessageType(29); + getDescriptor().getMessageType(31); internal_static_google_privacy_dlp_v2_RedactImageResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RedactImageResponse_descriptor, @@ -4425,7 +4359,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "RedactedImage", "ExtractedText", "InspectResult", }); internal_static_google_privacy_dlp_v2_DeidentifyContentRequest_descriptor = - getDescriptor().getMessageType(30); + getDescriptor().getMessageType(32); internal_static_google_privacy_dlp_v2_DeidentifyContentRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeidentifyContentRequest_descriptor, @@ -4439,7 +4373,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "LocationId", }); internal_static_google_privacy_dlp_v2_DeidentifyContentResponse_descriptor = - getDescriptor().getMessageType(31); + getDescriptor().getMessageType(33); internal_static_google_privacy_dlp_v2_DeidentifyContentResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeidentifyContentResponse_descriptor, @@ -4447,7 +4381,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Item", "Overview", }); internal_static_google_privacy_dlp_v2_ReidentifyContentRequest_descriptor = - getDescriptor().getMessageType(32); + getDescriptor().getMessageType(34); internal_static_google_privacy_dlp_v2_ReidentifyContentRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ReidentifyContentRequest_descriptor, @@ -4461,7 +4395,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "LocationId", }); internal_static_google_privacy_dlp_v2_ReidentifyContentResponse_descriptor = - getDescriptor().getMessageType(33); + getDescriptor().getMessageType(35); internal_static_google_privacy_dlp_v2_ReidentifyContentResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ReidentifyContentResponse_descriptor, @@ -4469,7 +4403,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Item", "Overview", }); internal_static_google_privacy_dlp_v2_InspectContentRequest_descriptor = - getDescriptor().getMessageType(34); + getDescriptor().getMessageType(36); internal_static_google_privacy_dlp_v2_InspectContentRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InspectContentRequest_descriptor, @@ -4477,7 +4411,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "InspectConfig", "Item", "InspectTemplateName", "LocationId", }); internal_static_google_privacy_dlp_v2_InspectContentResponse_descriptor = - getDescriptor().getMessageType(35); + getDescriptor().getMessageType(37); internal_static_google_privacy_dlp_v2_InspectContentResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InspectContentResponse_descriptor, @@ -4485,7 +4419,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Result", }); internal_static_google_privacy_dlp_v2_OutputStorageConfig_descriptor = - getDescriptor().getMessageType(36); + getDescriptor().getMessageType(38); internal_static_google_privacy_dlp_v2_OutputStorageConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_OutputStorageConfig_descriptor, @@ -4493,7 +4427,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Table", "StoragePath", "OutputSchema", "Type", }); internal_static_google_privacy_dlp_v2_InfoTypeStats_descriptor = - getDescriptor().getMessageType(37); + getDescriptor().getMessageType(39); internal_static_google_privacy_dlp_v2_InfoTypeStats_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InfoTypeStats_descriptor, @@ -4501,7 +4435,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "InfoType", "Count", }); internal_static_google_privacy_dlp_v2_InspectDataSourceDetails_descriptor = - getDescriptor().getMessageType(38); + getDescriptor().getMessageType(40); internal_static_google_privacy_dlp_v2_InspectDataSourceDetails_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InspectDataSourceDetails_descriptor, @@ -4529,7 +4463,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "HybridStats", }); internal_static_google_privacy_dlp_v2_DataProfileBigQueryRowSchema_descriptor = - getDescriptor().getMessageType(39); + getDescriptor().getMessageType(41); internal_static_google_privacy_dlp_v2_DataProfileBigQueryRowSchema_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfileBigQueryRowSchema_descriptor, @@ -4537,7 +4471,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "TableProfile", "ColumnProfile", "FileStoreProfile", "DataProfile", }); internal_static_google_privacy_dlp_v2_HybridInspectStatistics_descriptor = - getDescriptor().getMessageType(40); + getDescriptor().getMessageType(42); internal_static_google_privacy_dlp_v2_HybridInspectStatistics_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_HybridInspectStatistics_descriptor, @@ -4545,7 +4479,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ProcessedCount", "AbortedCount", "PendingCount", }); internal_static_google_privacy_dlp_v2_ActionDetails_descriptor = - getDescriptor().getMessageType(41); + getDescriptor().getMessageType(43); internal_static_google_privacy_dlp_v2_ActionDetails_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ActionDetails_descriptor, @@ -4553,7 +4487,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DeidentifyDetails", "Details", }); internal_static_google_privacy_dlp_v2_DeidentifyDataSourceStats_descriptor = - getDescriptor().getMessageType(42); + getDescriptor().getMessageType(44); internal_static_google_privacy_dlp_v2_DeidentifyDataSourceStats_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeidentifyDataSourceStats_descriptor, @@ -4561,7 +4495,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "TransformedBytes", "TransformationCount", "TransformationErrorCount", }); internal_static_google_privacy_dlp_v2_DeidentifyDataSourceDetails_descriptor = - getDescriptor().getMessageType(43); + getDescriptor().getMessageType(45); internal_static_google_privacy_dlp_v2_DeidentifyDataSourceDetails_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeidentifyDataSourceDetails_descriptor, @@ -4580,7 +4514,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "SnapshotImageRedactTemplate", }); internal_static_google_privacy_dlp_v2_LocationSupport_descriptor = - getDescriptor().getMessageType(44); + getDescriptor().getMessageType(46); internal_static_google_privacy_dlp_v2_LocationSupport_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_LocationSupport_descriptor, @@ -4588,7 +4522,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "RegionalizationScope", "Locations", }); internal_static_google_privacy_dlp_v2_InfoTypeDescription_descriptor = - getDescriptor().getMessageType(45); + getDescriptor().getMessageType(47); internal_static_google_privacy_dlp_v2_InfoTypeDescription_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InfoTypeDescription_descriptor, @@ -4606,7 +4540,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "LaunchStatus", }); internal_static_google_privacy_dlp_v2_InfoTypeCategory_descriptor = - getDescriptor().getMessageType(46); + getDescriptor().getMessageType(48); internal_static_google_privacy_dlp_v2_InfoTypeCategory_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InfoTypeCategory_descriptor, @@ -4614,7 +4548,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "LocationCategory", "IndustryCategory", "TypeCategory", "Category", }); internal_static_google_privacy_dlp_v2_VersionDescription_descriptor = - getDescriptor().getMessageType(47); + getDescriptor().getMessageType(49); internal_static_google_privacy_dlp_v2_VersionDescription_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_VersionDescription_descriptor, @@ -4622,7 +4556,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Version", "Description", }); internal_static_google_privacy_dlp_v2_ListInfoTypesRequest_descriptor = - getDescriptor().getMessageType(48); + getDescriptor().getMessageType(50); internal_static_google_privacy_dlp_v2_ListInfoTypesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListInfoTypesRequest_descriptor, @@ -4630,7 +4564,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "LanguageCode", "Filter", "LocationId", }); internal_static_google_privacy_dlp_v2_ListInfoTypesResponse_descriptor = - getDescriptor().getMessageType(49); + getDescriptor().getMessageType(51); internal_static_google_privacy_dlp_v2_ListInfoTypesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListInfoTypesResponse_descriptor, @@ -4638,14 +4572,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "InfoTypes", }); internal_static_google_privacy_dlp_v2_RiskAnalysisJobConfig_descriptor = - getDescriptor().getMessageType(50); + getDescriptor().getMessageType(52); internal_static_google_privacy_dlp_v2_RiskAnalysisJobConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RiskAnalysisJobConfig_descriptor, new java.lang.String[] { "PrivacyMetric", "SourceTable", "Actions", }); - internal_static_google_privacy_dlp_v2_QuasiId_descriptor = getDescriptor().getMessageType(51); + internal_static_google_privacy_dlp_v2_QuasiId_descriptor = getDescriptor().getMessageType(53); internal_static_google_privacy_dlp_v2_QuasiId_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_QuasiId_descriptor, @@ -4653,7 +4587,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Field", "InfoType", "CustomTag", "Inferred", "Tag", }); internal_static_google_privacy_dlp_v2_StatisticalTable_descriptor = - getDescriptor().getMessageType(52); + getDescriptor().getMessageType(54); internal_static_google_privacy_dlp_v2_StatisticalTable_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_StatisticalTable_descriptor, @@ -4669,7 +4603,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Field", "CustomTag", }); internal_static_google_privacy_dlp_v2_PrivacyMetric_descriptor = - getDescriptor().getMessageType(53); + getDescriptor().getMessageType(55); internal_static_google_privacy_dlp_v2_PrivacyMetric_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_PrivacyMetric_descriptor, @@ -4758,7 +4692,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "QuasiIds", "RegionCode", "AuxiliaryTables", }); internal_static_google_privacy_dlp_v2_AnalyzeDataSourceRiskDetails_descriptor = - getDescriptor().getMessageType(54); + getDescriptor().getMessageType(56); internal_static_google_privacy_dlp_v2_AnalyzeDataSourceRiskDetails_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_AnalyzeDataSourceRiskDetails_descriptor, @@ -4934,14 +4868,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "JobConfig", }); internal_static_google_privacy_dlp_v2_ValueFrequency_descriptor = - getDescriptor().getMessageType(55); + getDescriptor().getMessageType(57); internal_static_google_privacy_dlp_v2_ValueFrequency_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ValueFrequency_descriptor, new java.lang.String[] { "Value", "Count", }); - internal_static_google_privacy_dlp_v2_Value_descriptor = getDescriptor().getMessageType(56); + internal_static_google_privacy_dlp_v2_Value_descriptor = getDescriptor().getMessageType(58); internal_static_google_privacy_dlp_v2_Value_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Value_descriptor, @@ -4956,14 +4890,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DayOfWeekValue", "Type", }); - internal_static_google_privacy_dlp_v2_QuoteInfo_descriptor = getDescriptor().getMessageType(57); + internal_static_google_privacy_dlp_v2_QuoteInfo_descriptor = getDescriptor().getMessageType(59); internal_static_google_privacy_dlp_v2_QuoteInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_QuoteInfo_descriptor, new java.lang.String[] { "DateTime", "ParsedQuote", }); - internal_static_google_privacy_dlp_v2_DateTime_descriptor = getDescriptor().getMessageType(58); + internal_static_google_privacy_dlp_v2_DateTime_descriptor = getDescriptor().getMessageType(60); internal_static_google_privacy_dlp_v2_DateTime_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DateTime_descriptor, @@ -4979,7 +4913,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "OffsetMinutes", }); internal_static_google_privacy_dlp_v2_DeidentifyConfig_descriptor = - getDescriptor().getMessageType(59); + getDescriptor().getMessageType(61); internal_static_google_privacy_dlp_v2_DeidentifyConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeidentifyConfig_descriptor, @@ -4991,7 +4925,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Transformation", }); internal_static_google_privacy_dlp_v2_ImageTransformations_descriptor = - getDescriptor().getMessageType(60); + getDescriptor().getMessageType(62); internal_static_google_privacy_dlp_v2_ImageTransformations_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ImageTransformations_descriptor, @@ -5030,7 +4964,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { internal_static_google_privacy_dlp_v2_ImageTransformations_ImageTransformation_AllText_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_TransformationErrorHandling_descriptor = - getDescriptor().getMessageType(61); + getDescriptor().getMessageType(63); internal_static_google_privacy_dlp_v2_TransformationErrorHandling_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationErrorHandling_descriptor, @@ -5052,7 +4986,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { internal_static_google_privacy_dlp_v2_TransformationErrorHandling_LeaveUntransformed_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_PrimitiveTransformation_descriptor = - getDescriptor().getMessageType(62); + getDescriptor().getMessageType(64); internal_static_google_privacy_dlp_v2_PrimitiveTransformation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_PrimitiveTransformation_descriptor, @@ -5072,7 +5006,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Transformation", }); internal_static_google_privacy_dlp_v2_TimePartConfig_descriptor = - getDescriptor().getMessageType(63); + getDescriptor().getMessageType(65); internal_static_google_privacy_dlp_v2_TimePartConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TimePartConfig_descriptor, @@ -5080,7 +5014,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "PartToExtract", }); internal_static_google_privacy_dlp_v2_CryptoHashConfig_descriptor = - getDescriptor().getMessageType(64); + getDescriptor().getMessageType(66); internal_static_google_privacy_dlp_v2_CryptoHashConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CryptoHashConfig_descriptor, @@ -5088,7 +5022,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "CryptoKey", }); internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_descriptor = - getDescriptor().getMessageType(65); + getDescriptor().getMessageType(67); internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_descriptor, @@ -5096,7 +5030,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "CryptoKey", "SurrogateInfoType", "Context", }); internal_static_google_privacy_dlp_v2_ReplaceValueConfig_descriptor = - getDescriptor().getMessageType(66); + getDescriptor().getMessageType(68); internal_static_google_privacy_dlp_v2_ReplaceValueConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ReplaceValueConfig_descriptor, @@ -5104,7 +5038,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "NewValue", }); internal_static_google_privacy_dlp_v2_ReplaceDictionaryConfig_descriptor = - getDescriptor().getMessageType(67); + getDescriptor().getMessageType(69); internal_static_google_privacy_dlp_v2_ReplaceDictionaryConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ReplaceDictionaryConfig_descriptor, @@ -5112,19 +5046,19 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "WordList", "Type", }); internal_static_google_privacy_dlp_v2_ReplaceWithInfoTypeConfig_descriptor = - getDescriptor().getMessageType(68); + getDescriptor().getMessageType(70); internal_static_google_privacy_dlp_v2_ReplaceWithInfoTypeConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ReplaceWithInfoTypeConfig_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_RedactConfig_descriptor = - getDescriptor().getMessageType(69); + getDescriptor().getMessageType(71); internal_static_google_privacy_dlp_v2_RedactConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RedactConfig_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_CharsToIgnore_descriptor = - getDescriptor().getMessageType(70); + getDescriptor().getMessageType(72); internal_static_google_privacy_dlp_v2_CharsToIgnore_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CharsToIgnore_descriptor, @@ -5132,7 +5066,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "CharactersToSkip", "CommonCharactersToIgnore", "Characters", }); internal_static_google_privacy_dlp_v2_CharacterMaskConfig_descriptor = - getDescriptor().getMessageType(71); + getDescriptor().getMessageType(73); internal_static_google_privacy_dlp_v2_CharacterMaskConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CharacterMaskConfig_descriptor, @@ -5140,7 +5074,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "MaskingCharacter", "NumberToMask", "ReverseOrder", "CharactersToIgnore", }); internal_static_google_privacy_dlp_v2_FixedSizeBucketingConfig_descriptor = - getDescriptor().getMessageType(72); + getDescriptor().getMessageType(74); internal_static_google_privacy_dlp_v2_FixedSizeBucketingConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FixedSizeBucketingConfig_descriptor, @@ -5148,7 +5082,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "LowerBound", "UpperBound", "BucketSize", }); internal_static_google_privacy_dlp_v2_BucketingConfig_descriptor = - getDescriptor().getMessageType(73); + getDescriptor().getMessageType(75); internal_static_google_privacy_dlp_v2_BucketingConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_BucketingConfig_descriptor, @@ -5164,7 +5098,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Min", "Max", "ReplacementValue", }); internal_static_google_privacy_dlp_v2_CryptoReplaceFfxFpeConfig_descriptor = - getDescriptor().getMessageType(74); + getDescriptor().getMessageType(76); internal_static_google_privacy_dlp_v2_CryptoReplaceFfxFpeConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CryptoReplaceFfxFpeConfig_descriptor, @@ -5177,7 +5111,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "SurrogateInfoType", "Alphabet", }); - internal_static_google_privacy_dlp_v2_CryptoKey_descriptor = getDescriptor().getMessageType(75); + internal_static_google_privacy_dlp_v2_CryptoKey_descriptor = getDescriptor().getMessageType(77); internal_static_google_privacy_dlp_v2_CryptoKey_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CryptoKey_descriptor, @@ -5185,7 +5119,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Transient", "Unwrapped", "KmsWrapped", "Source", }); internal_static_google_privacy_dlp_v2_TransientCryptoKey_descriptor = - getDescriptor().getMessageType(76); + getDescriptor().getMessageType(78); internal_static_google_privacy_dlp_v2_TransientCryptoKey_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransientCryptoKey_descriptor, @@ -5193,7 +5127,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_descriptor = - getDescriptor().getMessageType(77); + getDescriptor().getMessageType(79); internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_descriptor, @@ -5201,7 +5135,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Key", }); internal_static_google_privacy_dlp_v2_KmsWrappedCryptoKey_descriptor = - getDescriptor().getMessageType(78); + getDescriptor().getMessageType(80); internal_static_google_privacy_dlp_v2_KmsWrappedCryptoKey_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_KmsWrappedCryptoKey_descriptor, @@ -5209,7 +5143,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "WrappedKey", "CryptoKeyName", }); internal_static_google_privacy_dlp_v2_DateShiftConfig_descriptor = - getDescriptor().getMessageType(79); + getDescriptor().getMessageType(81); internal_static_google_privacy_dlp_v2_DateShiftConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DateShiftConfig_descriptor, @@ -5217,7 +5151,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "UpperBoundDays", "LowerBoundDays", "Context", "CryptoKey", "Method", }); internal_static_google_privacy_dlp_v2_InfoTypeTransformations_descriptor = - getDescriptor().getMessageType(80); + getDescriptor().getMessageType(82); internal_static_google_privacy_dlp_v2_InfoTypeTransformations_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InfoTypeTransformations_descriptor, @@ -5233,7 +5167,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "InfoTypes", "PrimitiveTransformation", }); internal_static_google_privacy_dlp_v2_FieldTransformation_descriptor = - getDescriptor().getMessageType(81); + getDescriptor().getMessageType(83); internal_static_google_privacy_dlp_v2_FieldTransformation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FieldTransformation_descriptor, @@ -5245,7 +5179,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Transformation", }); internal_static_google_privacy_dlp_v2_RecordTransformations_descriptor = - getDescriptor().getMessageType(82); + getDescriptor().getMessageType(84); internal_static_google_privacy_dlp_v2_RecordTransformations_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RecordTransformations_descriptor, @@ -5253,7 +5187,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "FieldTransformations", "RecordSuppressions", }); internal_static_google_privacy_dlp_v2_RecordSuppression_descriptor = - getDescriptor().getMessageType(83); + getDescriptor().getMessageType(85); internal_static_google_privacy_dlp_v2_RecordSuppression_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RecordSuppression_descriptor, @@ -5261,7 +5195,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Condition", }); internal_static_google_privacy_dlp_v2_RecordCondition_descriptor = - getDescriptor().getMessageType(84); + getDescriptor().getMessageType(86); internal_static_google_privacy_dlp_v2_RecordCondition_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RecordCondition_descriptor, @@ -5293,7 +5227,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "LogicalOperator", "Conditions", "Type", }); internal_static_google_privacy_dlp_v2_TransformationOverview_descriptor = - getDescriptor().getMessageType(85); + getDescriptor().getMessageType(87); internal_static_google_privacy_dlp_v2_TransformationOverview_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationOverview_descriptor, @@ -5301,7 +5235,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "TransformedBytes", "TransformationSummaries", }); internal_static_google_privacy_dlp_v2_TransformationSummary_descriptor = - getDescriptor().getMessageType(86); + getDescriptor().getMessageType(88); internal_static_google_privacy_dlp_v2_TransformationSummary_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationSummary_descriptor, @@ -5323,7 +5257,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Count", "Code", "Details", }); internal_static_google_privacy_dlp_v2_TransformationDescription_descriptor = - getDescriptor().getMessageType(87); + getDescriptor().getMessageType(89); internal_static_google_privacy_dlp_v2_TransformationDescription_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationDescription_descriptor, @@ -5331,7 +5265,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Type", "Description", "Condition", "InfoType", }); internal_static_google_privacy_dlp_v2_TransformationDetails_descriptor = - getDescriptor().getMessageType(88); + getDescriptor().getMessageType(90); internal_static_google_privacy_dlp_v2_TransformationDetails_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationDetails_descriptor, @@ -5344,7 +5278,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "TransformationLocation", }); internal_static_google_privacy_dlp_v2_TransformationLocation_descriptor = - getDescriptor().getMessageType(89); + getDescriptor().getMessageType(91); internal_static_google_privacy_dlp_v2_TransformationLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationLocation_descriptor, @@ -5352,7 +5286,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "FindingId", "RecordTransformation", "ContainerType", "LocationType", }); internal_static_google_privacy_dlp_v2_RecordTransformation_descriptor = - getDescriptor().getMessageType(90); + getDescriptor().getMessageType(92); internal_static_google_privacy_dlp_v2_RecordTransformation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RecordTransformation_descriptor, @@ -5360,7 +5294,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "FieldId", "ContainerTimestamp", "ContainerVersion", }); internal_static_google_privacy_dlp_v2_TransformationResultStatus_descriptor = - getDescriptor().getMessageType(91); + getDescriptor().getMessageType(93); internal_static_google_privacy_dlp_v2_TransformationResultStatus_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationResultStatus_descriptor, @@ -5368,26 +5302,26 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ResultStatusType", "Details", }); internal_static_google_privacy_dlp_v2_TransformationDetailsStorageConfig_descriptor = - getDescriptor().getMessageType(92); + getDescriptor().getMessageType(94); internal_static_google_privacy_dlp_v2_TransformationDetailsStorageConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationDetailsStorageConfig_descriptor, new java.lang.String[] { "Table", "Type", }); - internal_static_google_privacy_dlp_v2_Schedule_descriptor = getDescriptor().getMessageType(93); + internal_static_google_privacy_dlp_v2_Schedule_descriptor = getDescriptor().getMessageType(95); internal_static_google_privacy_dlp_v2_Schedule_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Schedule_descriptor, new java.lang.String[] { "RecurrencePeriodDuration", "Option", }); - internal_static_google_privacy_dlp_v2_Manual_descriptor = getDescriptor().getMessageType(94); + internal_static_google_privacy_dlp_v2_Manual_descriptor = getDescriptor().getMessageType(96); internal_static_google_privacy_dlp_v2_Manual_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Manual_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_InspectTemplate_descriptor = - getDescriptor().getMessageType(95); + getDescriptor().getMessageType(97); internal_static_google_privacy_dlp_v2_InspectTemplate_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InspectTemplate_descriptor, @@ -5395,14 +5329,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "DisplayName", "Description", "CreateTime", "UpdateTime", "InspectConfig", }); internal_static_google_privacy_dlp_v2_DeidentifyTemplate_descriptor = - getDescriptor().getMessageType(96); + getDescriptor().getMessageType(98); internal_static_google_privacy_dlp_v2_DeidentifyTemplate_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeidentifyTemplate_descriptor, new java.lang.String[] { "Name", "DisplayName", "Description", "CreateTime", "UpdateTime", "DeidentifyConfig", }); - internal_static_google_privacy_dlp_v2_Error_descriptor = getDescriptor().getMessageType(97); + internal_static_google_privacy_dlp_v2_Error_descriptor = getDescriptor().getMessageType(99); internal_static_google_privacy_dlp_v2_Error_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Error_descriptor, @@ -5410,7 +5344,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Details", "Timestamps", "ExtraInfo", }); internal_static_google_privacy_dlp_v2_JobTrigger_descriptor = - getDescriptor().getMessageType(98); + getDescriptor().getMessageType(100); internal_static_google_privacy_dlp_v2_JobTrigger_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_JobTrigger_descriptor, @@ -5435,7 +5369,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "Schedule", "Manual", "Trigger", }); - internal_static_google_privacy_dlp_v2_Action_descriptor = getDescriptor().getMessageType(99); + internal_static_google_privacy_dlp_v2_Action_descriptor = getDescriptor().getMessageType(101); internal_static_google_privacy_dlp_v2_Action_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Action_descriptor, @@ -5509,7 +5443,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { internal_static_google_privacy_dlp_v2_Action_PublishToStackdriver_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_TransformationConfig_descriptor = - getDescriptor().getMessageType(100); + getDescriptor().getMessageType(102); internal_static_google_privacy_dlp_v2_TransformationConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationConfig_descriptor, @@ -5517,7 +5451,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DeidentifyTemplate", "StructuredDeidentifyTemplate", "ImageRedactTemplate", }); internal_static_google_privacy_dlp_v2_CreateInspectTemplateRequest_descriptor = - getDescriptor().getMessageType(101); + getDescriptor().getMessageType(103); internal_static_google_privacy_dlp_v2_CreateInspectTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateInspectTemplateRequest_descriptor, @@ -5525,7 +5459,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "InspectTemplate", "TemplateId", "LocationId", }); internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_descriptor = - getDescriptor().getMessageType(102); + getDescriptor().getMessageType(104); internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_descriptor, @@ -5533,7 +5467,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "InspectTemplate", "UpdateMask", }); internal_static_google_privacy_dlp_v2_GetInspectTemplateRequest_descriptor = - getDescriptor().getMessageType(103); + getDescriptor().getMessageType(105); internal_static_google_privacy_dlp_v2_GetInspectTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetInspectTemplateRequest_descriptor, @@ -5541,7 +5475,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_ListInspectTemplatesRequest_descriptor = - getDescriptor().getMessageType(104); + getDescriptor().getMessageType(106); internal_static_google_privacy_dlp_v2_ListInspectTemplatesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListInspectTemplatesRequest_descriptor, @@ -5549,7 +5483,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageToken", "PageSize", "OrderBy", "LocationId", }); internal_static_google_privacy_dlp_v2_ListInspectTemplatesResponse_descriptor = - getDescriptor().getMessageType(105); + getDescriptor().getMessageType(107); internal_static_google_privacy_dlp_v2_ListInspectTemplatesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListInspectTemplatesResponse_descriptor, @@ -5557,7 +5491,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "InspectTemplates", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteInspectTemplateRequest_descriptor = - getDescriptor().getMessageType(106); + getDescriptor().getMessageType(108); internal_static_google_privacy_dlp_v2_DeleteInspectTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteInspectTemplateRequest_descriptor, @@ -5565,7 +5499,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_CreateJobTriggerRequest_descriptor = - getDescriptor().getMessageType(107); + getDescriptor().getMessageType(109); internal_static_google_privacy_dlp_v2_CreateJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateJobTriggerRequest_descriptor, @@ -5573,7 +5507,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "JobTrigger", "TriggerId", "LocationId", }); internal_static_google_privacy_dlp_v2_ActivateJobTriggerRequest_descriptor = - getDescriptor().getMessageType(108); + getDescriptor().getMessageType(110); internal_static_google_privacy_dlp_v2_ActivateJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ActivateJobTriggerRequest_descriptor, @@ -5581,7 +5515,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_descriptor = - getDescriptor().getMessageType(109); + getDescriptor().getMessageType(111); internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_descriptor, @@ -5589,7 +5523,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "JobTrigger", "UpdateMask", }); internal_static_google_privacy_dlp_v2_GetJobTriggerRequest_descriptor = - getDescriptor().getMessageType(110); + getDescriptor().getMessageType(112); internal_static_google_privacy_dlp_v2_GetJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetJobTriggerRequest_descriptor, @@ -5597,7 +5531,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_CreateDiscoveryConfigRequest_descriptor = - getDescriptor().getMessageType(111); + getDescriptor().getMessageType(113); internal_static_google_privacy_dlp_v2_CreateDiscoveryConfigRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateDiscoveryConfigRequest_descriptor, @@ -5605,7 +5539,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "DiscoveryConfig", "ConfigId", }); internal_static_google_privacy_dlp_v2_UpdateDiscoveryConfigRequest_descriptor = - getDescriptor().getMessageType(112); + getDescriptor().getMessageType(114); internal_static_google_privacy_dlp_v2_UpdateDiscoveryConfigRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateDiscoveryConfigRequest_descriptor, @@ -5613,7 +5547,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "DiscoveryConfig", "UpdateMask", }); internal_static_google_privacy_dlp_v2_GetDiscoveryConfigRequest_descriptor = - getDescriptor().getMessageType(113); + getDescriptor().getMessageType(115); internal_static_google_privacy_dlp_v2_GetDiscoveryConfigRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetDiscoveryConfigRequest_descriptor, @@ -5621,7 +5555,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_ListDiscoveryConfigsRequest_descriptor = - getDescriptor().getMessageType(114); + getDescriptor().getMessageType(116); internal_static_google_privacy_dlp_v2_ListDiscoveryConfigsRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDiscoveryConfigsRequest_descriptor, @@ -5629,7 +5563,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageToken", "PageSize", "OrderBy", }); internal_static_google_privacy_dlp_v2_ListDiscoveryConfigsResponse_descriptor = - getDescriptor().getMessageType(115); + getDescriptor().getMessageType(117); internal_static_google_privacy_dlp_v2_ListDiscoveryConfigsResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDiscoveryConfigsResponse_descriptor, @@ -5637,7 +5571,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DiscoveryConfigs", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteDiscoveryConfigRequest_descriptor = - getDescriptor().getMessageType(116); + getDescriptor().getMessageType(118); internal_static_google_privacy_dlp_v2_DeleteDiscoveryConfigRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteDiscoveryConfigRequest_descriptor, @@ -5645,7 +5579,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_CreateDlpJobRequest_descriptor = - getDescriptor().getMessageType(117); + getDescriptor().getMessageType(119); internal_static_google_privacy_dlp_v2_CreateDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateDlpJobRequest_descriptor, @@ -5653,7 +5587,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "InspectJob", "RiskJob", "JobId", "LocationId", "Job", }); internal_static_google_privacy_dlp_v2_ListJobTriggersRequest_descriptor = - getDescriptor().getMessageType(118); + getDescriptor().getMessageType(120); internal_static_google_privacy_dlp_v2_ListJobTriggersRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListJobTriggersRequest_descriptor, @@ -5661,7 +5595,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageToken", "PageSize", "OrderBy", "Filter", "Type", "LocationId", }); internal_static_google_privacy_dlp_v2_ListJobTriggersResponse_descriptor = - getDescriptor().getMessageType(119); + getDescriptor().getMessageType(121); internal_static_google_privacy_dlp_v2_ListJobTriggersResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListJobTriggersResponse_descriptor, @@ -5669,7 +5603,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "JobTriggers", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteJobTriggerRequest_descriptor = - getDescriptor().getMessageType(120); + getDescriptor().getMessageType(122); internal_static_google_privacy_dlp_v2_DeleteJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteJobTriggerRequest_descriptor, @@ -5677,7 +5611,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_InspectJobConfig_descriptor = - getDescriptor().getMessageType(121); + getDescriptor().getMessageType(123); internal_static_google_privacy_dlp_v2_InspectJobConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InspectJobConfig_descriptor, @@ -5685,7 +5619,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "StorageConfig", "InspectConfig", "InspectTemplateName", "Actions", }); internal_static_google_privacy_dlp_v2_DataProfileAction_descriptor = - getDescriptor().getMessageType(122); + getDescriptor().getMessageType(124); internal_static_google_privacy_dlp_v2_DataProfileAction_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfileAction_descriptor, @@ -5761,7 +5695,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "NamespacedValue", "Format", }); internal_static_google_privacy_dlp_v2_DataProfileFinding_descriptor = - getDescriptor().getMessageType(123); + getDescriptor().getMessageType(125); internal_static_google_privacy_dlp_v2_DataProfileFinding_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfileFinding_descriptor, @@ -5778,7 +5712,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DataSourceType", }); internal_static_google_privacy_dlp_v2_DataProfileFindingLocation_descriptor = - getDescriptor().getMessageType(124); + getDescriptor().getMessageType(126); internal_static_google_privacy_dlp_v2_DataProfileFindingLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfileFindingLocation_descriptor, @@ -5786,7 +5720,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ContainerName", "DataProfileFindingRecordLocation", "LocationExtraDetails", }); internal_static_google_privacy_dlp_v2_DataProfileFindingRecordLocation_descriptor = - getDescriptor().getMessageType(125); + getDescriptor().getMessageType(127); internal_static_google_privacy_dlp_v2_DataProfileFindingRecordLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfileFindingRecordLocation_descriptor, @@ -5794,7 +5728,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Field", }); internal_static_google_privacy_dlp_v2_DataProfileJobConfig_descriptor = - getDescriptor().getMessageType(126); + getDescriptor().getMessageType(128); internal_static_google_privacy_dlp_v2_DataProfileJobConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfileJobConfig_descriptor, @@ -5806,7 +5740,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DataProfileActions", }); internal_static_google_privacy_dlp_v2_BigQueryRegex_descriptor = - getDescriptor().getMessageType(127); + getDescriptor().getMessageType(129); internal_static_google_privacy_dlp_v2_BigQueryRegex_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_BigQueryRegex_descriptor, @@ -5814,7 +5748,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ProjectIdRegex", "DatasetIdRegex", "TableIdRegex", }); internal_static_google_privacy_dlp_v2_BigQueryRegexes_descriptor = - getDescriptor().getMessageType(128); + getDescriptor().getMessageType(130); internal_static_google_privacy_dlp_v2_BigQueryRegexes_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_BigQueryRegexes_descriptor, @@ -5822,19 +5756,19 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Patterns", }); internal_static_google_privacy_dlp_v2_BigQueryTableTypes_descriptor = - getDescriptor().getMessageType(129); + getDescriptor().getMessageType(131); internal_static_google_privacy_dlp_v2_BigQueryTableTypes_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_BigQueryTableTypes_descriptor, new java.lang.String[] { "Types", }); - internal_static_google_privacy_dlp_v2_Disabled_descriptor = getDescriptor().getMessageType(130); + internal_static_google_privacy_dlp_v2_Disabled_descriptor = getDescriptor().getMessageType(132); internal_static_google_privacy_dlp_v2_Disabled_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Disabled_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_DataProfileLocation_descriptor = - getDescriptor().getMessageType(131); + getDescriptor().getMessageType(133); internal_static_google_privacy_dlp_v2_DataProfileLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfileLocation_descriptor, @@ -5842,7 +5776,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "OrganizationId", "FolderId", "Location", }); internal_static_google_privacy_dlp_v2_DiscoveryConfig_descriptor = - getDescriptor().getMessageType(132); + getDescriptor().getMessageType(134); internal_static_google_privacy_dlp_v2_DiscoveryConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryConfig_descriptor, @@ -5870,7 +5804,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Location", "ProjectId", }); internal_static_google_privacy_dlp_v2_DiscoveryTarget_descriptor = - getDescriptor().getMessageType(133); + getDescriptor().getMessageType(135); internal_static_google_privacy_dlp_v2_DiscoveryTarget_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryTarget_descriptor, @@ -5884,7 +5818,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Target", }); internal_static_google_privacy_dlp_v2_BigQueryDiscoveryTarget_descriptor = - getDescriptor().getMessageType(134); + getDescriptor().getMessageType(136); internal_static_google_privacy_dlp_v2_BigQueryDiscoveryTarget_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_BigQueryDiscoveryTarget_descriptor, @@ -5892,7 +5826,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Filter", "Conditions", "Cadence", "Disabled", "Frequency", }); internal_static_google_privacy_dlp_v2_DiscoveryBigQueryFilter_descriptor = - getDescriptor().getMessageType(135); + getDescriptor().getMessageType(137); internal_static_google_privacy_dlp_v2_DiscoveryBigQueryFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryBigQueryFilter_descriptor, @@ -5906,7 +5840,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { internal_static_google_privacy_dlp_v2_DiscoveryBigQueryFilter_AllOtherBigQueryTables_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_BigQueryTableCollection_descriptor = - getDescriptor().getMessageType(136); + getDescriptor().getMessageType(138); internal_static_google_privacy_dlp_v2_BigQueryTableCollection_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_BigQueryTableCollection_descriptor, @@ -5914,7 +5848,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "IncludeRegexes", "Pattern", }); internal_static_google_privacy_dlp_v2_DiscoveryBigQueryConditions_descriptor = - getDescriptor().getMessageType(137); + getDescriptor().getMessageType(139); internal_static_google_privacy_dlp_v2_DiscoveryBigQueryConditions_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryBigQueryConditions_descriptor, @@ -5931,7 +5865,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "MinRowCount", "MinAge", }); internal_static_google_privacy_dlp_v2_DiscoveryGenerationCadence_descriptor = - getDescriptor().getMessageType(138); + getDescriptor().getMessageType(140); internal_static_google_privacy_dlp_v2_DiscoveryGenerationCadence_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryGenerationCadence_descriptor, @@ -5942,7 +5876,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "RefreshFrequency", }); internal_static_google_privacy_dlp_v2_DiscoveryTableModifiedCadence_descriptor = - getDescriptor().getMessageType(139); + getDescriptor().getMessageType(141); internal_static_google_privacy_dlp_v2_DiscoveryTableModifiedCadence_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryTableModifiedCadence_descriptor, @@ -5950,7 +5884,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Types", "Frequency", }); internal_static_google_privacy_dlp_v2_DiscoverySchemaModifiedCadence_descriptor = - getDescriptor().getMessageType(140); + getDescriptor().getMessageType(142); internal_static_google_privacy_dlp_v2_DiscoverySchemaModifiedCadence_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoverySchemaModifiedCadence_descriptor, @@ -5958,7 +5892,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Types", "Frequency", }); internal_static_google_privacy_dlp_v2_DiscoveryInspectTemplateModifiedCadence_descriptor = - getDescriptor().getMessageType(141); + getDescriptor().getMessageType(143); internal_static_google_privacy_dlp_v2_DiscoveryInspectTemplateModifiedCadence_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryInspectTemplateModifiedCadence_descriptor, @@ -5966,7 +5900,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Frequency", }); internal_static_google_privacy_dlp_v2_CloudSqlDiscoveryTarget_descriptor = - getDescriptor().getMessageType(142); + getDescriptor().getMessageType(144); internal_static_google_privacy_dlp_v2_CloudSqlDiscoveryTarget_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CloudSqlDiscoveryTarget_descriptor, @@ -5974,7 +5908,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Filter", "Conditions", "GenerationCadence", "Disabled", "Cadence", }); internal_static_google_privacy_dlp_v2_DiscoveryCloudSqlFilter_descriptor = - getDescriptor().getMessageType(143); + getDescriptor().getMessageType(145); internal_static_google_privacy_dlp_v2_DiscoveryCloudSqlFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryCloudSqlFilter_descriptor, @@ -5982,7 +5916,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Collection", "Others", "DatabaseResourceReference", "Filter", }); internal_static_google_privacy_dlp_v2_DatabaseResourceCollection_descriptor = - getDescriptor().getMessageType(144); + getDescriptor().getMessageType(146); internal_static_google_privacy_dlp_v2_DatabaseResourceCollection_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DatabaseResourceCollection_descriptor, @@ -5990,7 +5924,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "IncludeRegexes", "Pattern", }); internal_static_google_privacy_dlp_v2_DatabaseResourceRegexes_descriptor = - getDescriptor().getMessageType(145); + getDescriptor().getMessageType(147); internal_static_google_privacy_dlp_v2_DatabaseResourceRegexes_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DatabaseResourceRegexes_descriptor, @@ -5998,7 +5932,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Patterns", }); internal_static_google_privacy_dlp_v2_DatabaseResourceRegex_descriptor = - getDescriptor().getMessageType(146); + getDescriptor().getMessageType(148); internal_static_google_privacy_dlp_v2_DatabaseResourceRegex_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DatabaseResourceRegex_descriptor, @@ -6006,13 +5940,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ProjectIdRegex", "InstanceRegex", "DatabaseRegex", "DatabaseResourceNameRegex", }); internal_static_google_privacy_dlp_v2_AllOtherDatabaseResources_descriptor = - getDescriptor().getMessageType(147); + getDescriptor().getMessageType(149); internal_static_google_privacy_dlp_v2_AllOtherDatabaseResources_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_AllOtherDatabaseResources_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_DatabaseResourceReference_descriptor = - getDescriptor().getMessageType(148); + getDescriptor().getMessageType(150); internal_static_google_privacy_dlp_v2_DatabaseResourceReference_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DatabaseResourceReference_descriptor, @@ -6020,7 +5954,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ProjectId", "Instance", "Database", "DatabaseResource", }); internal_static_google_privacy_dlp_v2_DiscoveryCloudSqlConditions_descriptor = - getDescriptor().getMessageType(149); + getDescriptor().getMessageType(151); internal_static_google_privacy_dlp_v2_DiscoveryCloudSqlConditions_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryCloudSqlConditions_descriptor, @@ -6028,7 +5962,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DatabaseEngines", "Types", }); internal_static_google_privacy_dlp_v2_DiscoveryCloudSqlGenerationCadence_descriptor = - getDescriptor().getMessageType(150); + getDescriptor().getMessageType(152); internal_static_google_privacy_dlp_v2_DiscoveryCloudSqlGenerationCadence_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryCloudSqlGenerationCadence_descriptor, @@ -6045,13 +5979,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Types", "Frequency", }); internal_static_google_privacy_dlp_v2_SecretsDiscoveryTarget_descriptor = - getDescriptor().getMessageType(151); + getDescriptor().getMessageType(153); internal_static_google_privacy_dlp_v2_SecretsDiscoveryTarget_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_SecretsDiscoveryTarget_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_CloudStorageDiscoveryTarget_descriptor = - getDescriptor().getMessageType(152); + getDescriptor().getMessageType(154); internal_static_google_privacy_dlp_v2_CloudStorageDiscoveryTarget_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CloudStorageDiscoveryTarget_descriptor, @@ -6059,7 +5993,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Filter", "Conditions", "GenerationCadence", "Disabled", "Cadence", }); internal_static_google_privacy_dlp_v2_DiscoveryCloudStorageFilter_descriptor = - getDescriptor().getMessageType(153); + getDescriptor().getMessageType(155); internal_static_google_privacy_dlp_v2_DiscoveryCloudStorageFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryCloudStorageFilter_descriptor, @@ -6067,7 +6001,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Collection", "CloudStorageResourceReference", "Others", "Filter", }); internal_static_google_privacy_dlp_v2_FileStoreCollection_descriptor = - getDescriptor().getMessageType(154); + getDescriptor().getMessageType(156); internal_static_google_privacy_dlp_v2_FileStoreCollection_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FileStoreCollection_descriptor, @@ -6075,7 +6009,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "IncludeRegexes", "IncludeTags", "Pattern", }); internal_static_google_privacy_dlp_v2_FileStoreRegexes_descriptor = - getDescriptor().getMessageType(155); + getDescriptor().getMessageType(157); internal_static_google_privacy_dlp_v2_FileStoreRegexes_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FileStoreRegexes_descriptor, @@ -6083,7 +6017,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Patterns", }); internal_static_google_privacy_dlp_v2_FileStoreRegex_descriptor = - getDescriptor().getMessageType(156); + getDescriptor().getMessageType(158); internal_static_google_privacy_dlp_v2_FileStoreRegex_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FileStoreRegex_descriptor, @@ -6091,7 +6025,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "CloudStorageRegex", "ResourceRegex", }); internal_static_google_privacy_dlp_v2_CloudStorageRegex_descriptor = - getDescriptor().getMessageType(157); + getDescriptor().getMessageType(159); internal_static_google_privacy_dlp_v2_CloudStorageRegex_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CloudStorageRegex_descriptor, @@ -6099,7 +6033,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ProjectIdRegex", "BucketNameRegex", }); internal_static_google_privacy_dlp_v2_CloudStorageResourceReference_descriptor = - getDescriptor().getMessageType(158); + getDescriptor().getMessageType(160); internal_static_google_privacy_dlp_v2_CloudStorageResourceReference_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CloudStorageResourceReference_descriptor, @@ -6107,7 +6041,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "BucketName", "ProjectId", }); internal_static_google_privacy_dlp_v2_DiscoveryCloudStorageGenerationCadence_descriptor = - getDescriptor().getMessageType(159); + getDescriptor().getMessageType(161); internal_static_google_privacy_dlp_v2_DiscoveryCloudStorageGenerationCadence_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryCloudStorageGenerationCadence_descriptor, @@ -6115,7 +6049,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "RefreshFrequency", "InspectTemplateModifiedCadence", }); internal_static_google_privacy_dlp_v2_DiscoveryCloudStorageConditions_descriptor = - getDescriptor().getMessageType(160); + getDescriptor().getMessageType(162); internal_static_google_privacy_dlp_v2_DiscoveryCloudStorageConditions_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryCloudStorageConditions_descriptor, @@ -6123,7 +6057,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "IncludedObjectAttributes", "IncludedBucketAttributes", }); internal_static_google_privacy_dlp_v2_DiscoveryFileStoreConditions_descriptor = - getDescriptor().getMessageType(161); + getDescriptor().getMessageType(163); internal_static_google_privacy_dlp_v2_DiscoveryFileStoreConditions_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryFileStoreConditions_descriptor, @@ -6131,7 +6065,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "CreatedAfter", "MinAge", "CloudStorageConditions", "Conditions", }); internal_static_google_privacy_dlp_v2_OtherCloudDiscoveryTarget_descriptor = - getDescriptor().getMessageType(162); + getDescriptor().getMessageType(164); internal_static_google_privacy_dlp_v2_OtherCloudDiscoveryTarget_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_OtherCloudDiscoveryTarget_descriptor, @@ -6139,7 +6073,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DataSourceType", "Filter", "Conditions", "GenerationCadence", "Disabled", "Cadence", }); internal_static_google_privacy_dlp_v2_DiscoveryOtherCloudFilter_descriptor = - getDescriptor().getMessageType(163); + getDescriptor().getMessageType(165); internal_static_google_privacy_dlp_v2_DiscoveryOtherCloudFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryOtherCloudFilter_descriptor, @@ -6147,7 +6081,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Collection", "SingleResource", "Others", "Filter", }); internal_static_google_privacy_dlp_v2_OtherCloudResourceCollection_descriptor = - getDescriptor().getMessageType(164); + getDescriptor().getMessageType(166); internal_static_google_privacy_dlp_v2_OtherCloudResourceCollection_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_OtherCloudResourceCollection_descriptor, @@ -6155,7 +6089,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "IncludeRegexes", "Pattern", }); internal_static_google_privacy_dlp_v2_OtherCloudResourceRegexes_descriptor = - getDescriptor().getMessageType(165); + getDescriptor().getMessageType(167); internal_static_google_privacy_dlp_v2_OtherCloudResourceRegexes_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_OtherCloudResourceRegexes_descriptor, @@ -6163,7 +6097,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Patterns", }); internal_static_google_privacy_dlp_v2_OtherCloudResourceRegex_descriptor = - getDescriptor().getMessageType(166); + getDescriptor().getMessageType(168); internal_static_google_privacy_dlp_v2_OtherCloudResourceRegex_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_OtherCloudResourceRegex_descriptor, @@ -6171,7 +6105,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AmazonS3BucketRegex", "ResourceRegex", }); internal_static_google_privacy_dlp_v2_AwsAccountRegex_descriptor = - getDescriptor().getMessageType(167); + getDescriptor().getMessageType(169); internal_static_google_privacy_dlp_v2_AwsAccountRegex_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_AwsAccountRegex_descriptor, @@ -6179,7 +6113,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AccountIdRegex", }); internal_static_google_privacy_dlp_v2_AmazonS3BucketRegex_descriptor = - getDescriptor().getMessageType(168); + getDescriptor().getMessageType(170); internal_static_google_privacy_dlp_v2_AmazonS3BucketRegex_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_AmazonS3BucketRegex_descriptor, @@ -6187,7 +6121,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AwsAccountRegex", "BucketNameRegex", }); internal_static_google_privacy_dlp_v2_OtherCloudSingleResourceReference_descriptor = - getDescriptor().getMessageType(169); + getDescriptor().getMessageType(171); internal_static_google_privacy_dlp_v2_OtherCloudSingleResourceReference_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_OtherCloudSingleResourceReference_descriptor, @@ -6195,7 +6129,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AmazonS3Bucket", "Resource", }); internal_static_google_privacy_dlp_v2_AwsAccount_descriptor = - getDescriptor().getMessageType(170); + getDescriptor().getMessageType(172); internal_static_google_privacy_dlp_v2_AwsAccount_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_AwsAccount_descriptor, @@ -6203,7 +6137,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AccountId", }); internal_static_google_privacy_dlp_v2_AmazonS3Bucket_descriptor = - getDescriptor().getMessageType(171); + getDescriptor().getMessageType(173); internal_static_google_privacy_dlp_v2_AmazonS3Bucket_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_AmazonS3Bucket_descriptor, @@ -6211,7 +6145,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AwsAccount", "BucketName", }); internal_static_google_privacy_dlp_v2_DiscoveryOtherCloudConditions_descriptor = - getDescriptor().getMessageType(172); + getDescriptor().getMessageType(174); internal_static_google_privacy_dlp_v2_DiscoveryOtherCloudConditions_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryOtherCloudConditions_descriptor, @@ -6219,7 +6153,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "MinAge", "AmazonS3BucketConditions", "Conditions", }); internal_static_google_privacy_dlp_v2_AmazonS3BucketConditions_descriptor = - getDescriptor().getMessageType(173); + getDescriptor().getMessageType(175); internal_static_google_privacy_dlp_v2_AmazonS3BucketConditions_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_AmazonS3BucketConditions_descriptor, @@ -6227,7 +6161,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "BucketTypes", "ObjectStorageClasses", }); internal_static_google_privacy_dlp_v2_DiscoveryOtherCloudGenerationCadence_descriptor = - getDescriptor().getMessageType(174); + getDescriptor().getMessageType(176); internal_static_google_privacy_dlp_v2_DiscoveryOtherCloudGenerationCadence_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryOtherCloudGenerationCadence_descriptor, @@ -6235,7 +6169,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "RefreshFrequency", "InspectTemplateModifiedCadence", }); internal_static_google_privacy_dlp_v2_DiscoveryStartingLocation_descriptor = - getDescriptor().getMessageType(175); + getDescriptor().getMessageType(177); internal_static_google_privacy_dlp_v2_DiscoveryStartingLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryStartingLocation_descriptor, @@ -6243,7 +6177,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "OrganizationId", "FolderId", "Location", }); internal_static_google_privacy_dlp_v2_OtherCloudDiscoveryStartingLocation_descriptor = - getDescriptor().getMessageType(176); + getDescriptor().getMessageType(178); internal_static_google_privacy_dlp_v2_OtherCloudDiscoveryStartingLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_OtherCloudDiscoveryStartingLocation_descriptor, @@ -6260,13 +6194,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AccountId", "AllAssetInventoryAssets", "Scope", }); internal_static_google_privacy_dlp_v2_AllOtherResources_descriptor = - getDescriptor().getMessageType(177); + getDescriptor().getMessageType(179); internal_static_google_privacy_dlp_v2_AllOtherResources_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_AllOtherResources_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_VertexDatasetDiscoveryTarget_descriptor = - getDescriptor().getMessageType(178); + getDescriptor().getMessageType(180); internal_static_google_privacy_dlp_v2_VertexDatasetDiscoveryTarget_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_VertexDatasetDiscoveryTarget_descriptor, @@ -6274,7 +6208,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Filter", "Conditions", "GenerationCadence", "Disabled", "Cadence", }); internal_static_google_privacy_dlp_v2_DiscoveryVertexDatasetFilter_descriptor = - getDescriptor().getMessageType(179); + getDescriptor().getMessageType(181); internal_static_google_privacy_dlp_v2_DiscoveryVertexDatasetFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryVertexDatasetFilter_descriptor, @@ -6282,7 +6216,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Collection", "VertexDatasetResourceReference", "Others", "Filter", }); internal_static_google_privacy_dlp_v2_VertexDatasetCollection_descriptor = - getDescriptor().getMessageType(180); + getDescriptor().getMessageType(182); internal_static_google_privacy_dlp_v2_VertexDatasetCollection_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_VertexDatasetCollection_descriptor, @@ -6290,7 +6224,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "VertexDatasetRegexes", "Pattern", }); internal_static_google_privacy_dlp_v2_VertexDatasetRegexes_descriptor = - getDescriptor().getMessageType(181); + getDescriptor().getMessageType(183); internal_static_google_privacy_dlp_v2_VertexDatasetRegexes_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_VertexDatasetRegexes_descriptor, @@ -6298,7 +6232,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Patterns", }); internal_static_google_privacy_dlp_v2_VertexDatasetRegex_descriptor = - getDescriptor().getMessageType(182); + getDescriptor().getMessageType(184); internal_static_google_privacy_dlp_v2_VertexDatasetRegex_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_VertexDatasetRegex_descriptor, @@ -6306,7 +6240,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ProjectIdRegex", }); internal_static_google_privacy_dlp_v2_VertexDatasetResourceReference_descriptor = - getDescriptor().getMessageType(183); + getDescriptor().getMessageType(185); internal_static_google_privacy_dlp_v2_VertexDatasetResourceReference_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_VertexDatasetResourceReference_descriptor, @@ -6314,7 +6248,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DatasetResourceName", }); internal_static_google_privacy_dlp_v2_DiscoveryVertexDatasetConditions_descriptor = - getDescriptor().getMessageType(184); + getDescriptor().getMessageType(186); internal_static_google_privacy_dlp_v2_DiscoveryVertexDatasetConditions_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryVertexDatasetConditions_descriptor, @@ -6322,14 +6256,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "CreatedAfter", "MinAge", }); internal_static_google_privacy_dlp_v2_DiscoveryVertexDatasetGenerationCadence_descriptor = - getDescriptor().getMessageType(185); + getDescriptor().getMessageType(187); internal_static_google_privacy_dlp_v2_DiscoveryVertexDatasetGenerationCadence_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DiscoveryVertexDatasetGenerationCadence_descriptor, new java.lang.String[] { "RefreshFrequency", "InspectTemplateModifiedCadence", }); - internal_static_google_privacy_dlp_v2_DlpJob_descriptor = getDescriptor().getMessageType(186); + internal_static_google_privacy_dlp_v2_DlpJob_descriptor = getDescriptor().getMessageType(188); internal_static_google_privacy_dlp_v2_DlpJob_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DlpJob_descriptor, @@ -6349,7 +6283,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Details", }); internal_static_google_privacy_dlp_v2_GetDlpJobRequest_descriptor = - getDescriptor().getMessageType(187); + getDescriptor().getMessageType(189); internal_static_google_privacy_dlp_v2_GetDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetDlpJobRequest_descriptor, @@ -6357,7 +6291,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_ListDlpJobsRequest_descriptor = - getDescriptor().getMessageType(188); + getDescriptor().getMessageType(190); internal_static_google_privacy_dlp_v2_ListDlpJobsRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDlpJobsRequest_descriptor, @@ -6365,7 +6299,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "Filter", "PageSize", "PageToken", "Type", "OrderBy", "LocationId", }); internal_static_google_privacy_dlp_v2_ListDlpJobsResponse_descriptor = - getDescriptor().getMessageType(189); + getDescriptor().getMessageType(191); internal_static_google_privacy_dlp_v2_ListDlpJobsResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDlpJobsResponse_descriptor, @@ -6373,7 +6307,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Jobs", "NextPageToken", }); internal_static_google_privacy_dlp_v2_CancelDlpJobRequest_descriptor = - getDescriptor().getMessageType(190); + getDescriptor().getMessageType(192); internal_static_google_privacy_dlp_v2_CancelDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CancelDlpJobRequest_descriptor, @@ -6381,7 +6315,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_FinishDlpJobRequest_descriptor = - getDescriptor().getMessageType(191); + getDescriptor().getMessageType(193); internal_static_google_privacy_dlp_v2_FinishDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FinishDlpJobRequest_descriptor, @@ -6389,7 +6323,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_DeleteDlpJobRequest_descriptor = - getDescriptor().getMessageType(192); + getDescriptor().getMessageType(194); internal_static_google_privacy_dlp_v2_DeleteDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteDlpJobRequest_descriptor, @@ -6397,7 +6331,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_CreateDeidentifyTemplateRequest_descriptor = - getDescriptor().getMessageType(193); + getDescriptor().getMessageType(195); internal_static_google_privacy_dlp_v2_CreateDeidentifyTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateDeidentifyTemplateRequest_descriptor, @@ -6405,7 +6339,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "DeidentifyTemplate", "TemplateId", "LocationId", }); internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_descriptor = - getDescriptor().getMessageType(194); + getDescriptor().getMessageType(196); internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_descriptor, @@ -6413,7 +6347,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "DeidentifyTemplate", "UpdateMask", }); internal_static_google_privacy_dlp_v2_GetDeidentifyTemplateRequest_descriptor = - getDescriptor().getMessageType(195); + getDescriptor().getMessageType(197); internal_static_google_privacy_dlp_v2_GetDeidentifyTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetDeidentifyTemplateRequest_descriptor, @@ -6421,7 +6355,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesRequest_descriptor = - getDescriptor().getMessageType(196); + getDescriptor().getMessageType(198); internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesRequest_descriptor, @@ -6429,7 +6363,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageToken", "PageSize", "OrderBy", "LocationId", }); internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesResponse_descriptor = - getDescriptor().getMessageType(197); + getDescriptor().getMessageType(199); internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesResponse_descriptor, @@ -6437,7 +6371,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DeidentifyTemplates", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteDeidentifyTemplateRequest_descriptor = - getDescriptor().getMessageType(198); + getDescriptor().getMessageType(200); internal_static_google_privacy_dlp_v2_DeleteDeidentifyTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteDeidentifyTemplateRequest_descriptor, @@ -6445,7 +6379,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_LargeCustomDictionaryConfig_descriptor = - getDescriptor().getMessageType(199); + getDescriptor().getMessageType(201); internal_static_google_privacy_dlp_v2_LargeCustomDictionaryConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_LargeCustomDictionaryConfig_descriptor, @@ -6453,7 +6387,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "OutputPath", "CloudStorageFileSet", "BigQueryField", "Source", }); internal_static_google_privacy_dlp_v2_LargeCustomDictionaryStats_descriptor = - getDescriptor().getMessageType(200); + getDescriptor().getMessageType(202); internal_static_google_privacy_dlp_v2_LargeCustomDictionaryStats_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_LargeCustomDictionaryStats_descriptor, @@ -6461,7 +6395,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ApproxNumPhrases", }); internal_static_google_privacy_dlp_v2_StoredInfoTypeConfig_descriptor = - getDescriptor().getMessageType(201); + getDescriptor().getMessageType(203); internal_static_google_privacy_dlp_v2_StoredInfoTypeConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_StoredInfoTypeConfig_descriptor, @@ -6469,7 +6403,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DisplayName", "Description", "LargeCustomDictionary", "Dictionary", "Regex", "Type", }); internal_static_google_privacy_dlp_v2_StoredInfoTypeStats_descriptor = - getDescriptor().getMessageType(202); + getDescriptor().getMessageType(204); internal_static_google_privacy_dlp_v2_StoredInfoTypeStats_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_StoredInfoTypeStats_descriptor, @@ -6477,7 +6411,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "LargeCustomDictionary", "Type", }); internal_static_google_privacy_dlp_v2_StoredInfoTypeVersion_descriptor = - getDescriptor().getMessageType(203); + getDescriptor().getMessageType(205); internal_static_google_privacy_dlp_v2_StoredInfoTypeVersion_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_StoredInfoTypeVersion_descriptor, @@ -6485,7 +6419,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Config", "CreateTime", "State", "Errors", "Stats", }); internal_static_google_privacy_dlp_v2_StoredInfoType_descriptor = - getDescriptor().getMessageType(204); + getDescriptor().getMessageType(206); internal_static_google_privacy_dlp_v2_StoredInfoType_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_StoredInfoType_descriptor, @@ -6493,7 +6427,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "CurrentVersion", "PendingVersions", }); internal_static_google_privacy_dlp_v2_CreateStoredInfoTypeRequest_descriptor = - getDescriptor().getMessageType(205); + getDescriptor().getMessageType(207); internal_static_google_privacy_dlp_v2_CreateStoredInfoTypeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateStoredInfoTypeRequest_descriptor, @@ -6501,7 +6435,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "Config", "StoredInfoTypeId", "LocationId", }); internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_descriptor = - getDescriptor().getMessageType(206); + getDescriptor().getMessageType(208); internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_descriptor, @@ -6509,7 +6443,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "Config", "UpdateMask", }); internal_static_google_privacy_dlp_v2_GetStoredInfoTypeRequest_descriptor = - getDescriptor().getMessageType(207); + getDescriptor().getMessageType(209); internal_static_google_privacy_dlp_v2_GetStoredInfoTypeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetStoredInfoTypeRequest_descriptor, @@ -6517,7 +6451,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_ListStoredInfoTypesRequest_descriptor = - getDescriptor().getMessageType(208); + getDescriptor().getMessageType(210); internal_static_google_privacy_dlp_v2_ListStoredInfoTypesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListStoredInfoTypesRequest_descriptor, @@ -6525,7 +6459,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageToken", "PageSize", "OrderBy", "LocationId", }); internal_static_google_privacy_dlp_v2_ListStoredInfoTypesResponse_descriptor = - getDescriptor().getMessageType(209); + getDescriptor().getMessageType(211); internal_static_google_privacy_dlp_v2_ListStoredInfoTypesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListStoredInfoTypesResponse_descriptor, @@ -6533,7 +6467,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "StoredInfoTypes", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteStoredInfoTypeRequest_descriptor = - getDescriptor().getMessageType(210); + getDescriptor().getMessageType(212); internal_static_google_privacy_dlp_v2_DeleteStoredInfoTypeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteStoredInfoTypeRequest_descriptor, @@ -6541,7 +6475,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_HybridInspectJobTriggerRequest_descriptor = - getDescriptor().getMessageType(211); + getDescriptor().getMessageType(213); internal_static_google_privacy_dlp_v2_HybridInspectJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_HybridInspectJobTriggerRequest_descriptor, @@ -6549,7 +6483,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "HybridItem", }); internal_static_google_privacy_dlp_v2_HybridInspectDlpJobRequest_descriptor = - getDescriptor().getMessageType(212); + getDescriptor().getMessageType(214); internal_static_google_privacy_dlp_v2_HybridInspectDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_HybridInspectDlpJobRequest_descriptor, @@ -6557,7 +6491,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "HybridItem", }); internal_static_google_privacy_dlp_v2_HybridContentItem_descriptor = - getDescriptor().getMessageType(213); + getDescriptor().getMessageType(215); internal_static_google_privacy_dlp_v2_HybridContentItem_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_HybridContentItem_descriptor, @@ -6565,7 +6499,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Item", "FindingDetails", }); internal_static_google_privacy_dlp_v2_HybridFindingDetails_descriptor = - getDescriptor().getMessageType(214); + getDescriptor().getMessageType(216); internal_static_google_privacy_dlp_v2_HybridFindingDetails_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_HybridFindingDetails_descriptor, @@ -6581,35 +6515,35 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Key", "Value", }); internal_static_google_privacy_dlp_v2_HybridInspectResponse_descriptor = - getDescriptor().getMessageType(215); + getDescriptor().getMessageType(217); internal_static_google_privacy_dlp_v2_HybridInspectResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_HybridInspectResponse_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_ImageContainmentType_descriptor = - getDescriptor().getMessageType(216); + getDescriptor().getMessageType(218); internal_static_google_privacy_dlp_v2_ImageContainmentType_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ImageContainmentType_descriptor, new java.lang.String[] { "Encloses", "FullyInside", "Overlaps", "Type", }); - internal_static_google_privacy_dlp_v2_Overlap_descriptor = getDescriptor().getMessageType(217); + internal_static_google_privacy_dlp_v2_Overlap_descriptor = getDescriptor().getMessageType(219); internal_static_google_privacy_dlp_v2_Overlap_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Overlap_descriptor, new java.lang.String[] {}); - internal_static_google_privacy_dlp_v2_Encloses_descriptor = getDescriptor().getMessageType(218); + internal_static_google_privacy_dlp_v2_Encloses_descriptor = getDescriptor().getMessageType(220); internal_static_google_privacy_dlp_v2_Encloses_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Encloses_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_FullyInside_descriptor = - getDescriptor().getMessageType(219); + getDescriptor().getMessageType(221); internal_static_google_privacy_dlp_v2_FullyInside_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FullyInside_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_ListProjectDataProfilesRequest_descriptor = - getDescriptor().getMessageType(220); + getDescriptor().getMessageType(222); internal_static_google_privacy_dlp_v2_ListProjectDataProfilesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListProjectDataProfilesRequest_descriptor, @@ -6617,7 +6551,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageToken", "PageSize", "OrderBy", "Filter", }); internal_static_google_privacy_dlp_v2_ListProjectDataProfilesResponse_descriptor = - getDescriptor().getMessageType(221); + getDescriptor().getMessageType(223); internal_static_google_privacy_dlp_v2_ListProjectDataProfilesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListProjectDataProfilesResponse_descriptor, @@ -6625,7 +6559,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ProjectDataProfiles", "NextPageToken", }); internal_static_google_privacy_dlp_v2_ListTableDataProfilesRequest_descriptor = - getDescriptor().getMessageType(222); + getDescriptor().getMessageType(224); internal_static_google_privacy_dlp_v2_ListTableDataProfilesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListTableDataProfilesRequest_descriptor, @@ -6633,7 +6567,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageToken", "PageSize", "OrderBy", "Filter", }); internal_static_google_privacy_dlp_v2_ListTableDataProfilesResponse_descriptor = - getDescriptor().getMessageType(223); + getDescriptor().getMessageType(225); internal_static_google_privacy_dlp_v2_ListTableDataProfilesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListTableDataProfilesResponse_descriptor, @@ -6641,7 +6575,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "TableDataProfiles", "NextPageToken", }); internal_static_google_privacy_dlp_v2_ListColumnDataProfilesRequest_descriptor = - getDescriptor().getMessageType(224); + getDescriptor().getMessageType(226); internal_static_google_privacy_dlp_v2_ListColumnDataProfilesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListColumnDataProfilesRequest_descriptor, @@ -6649,7 +6583,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageToken", "PageSize", "OrderBy", "Filter", }); internal_static_google_privacy_dlp_v2_ListColumnDataProfilesResponse_descriptor = - getDescriptor().getMessageType(225); + getDescriptor().getMessageType(227); internal_static_google_privacy_dlp_v2_ListColumnDataProfilesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListColumnDataProfilesResponse_descriptor, @@ -6657,7 +6591,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "ColumnDataProfiles", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DataRiskLevel_descriptor = - getDescriptor().getMessageType(226); + getDescriptor().getMessageType(228); internal_static_google_privacy_dlp_v2_DataRiskLevel_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataRiskLevel_descriptor, @@ -6665,7 +6599,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Score", }); internal_static_google_privacy_dlp_v2_ProjectDataProfile_descriptor = - getDescriptor().getMessageType(227); + getDescriptor().getMessageType(229); internal_static_google_privacy_dlp_v2_ProjectDataProfile_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ProjectDataProfile_descriptor, @@ -6680,7 +6614,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "FileStoreDataProfileCount", }); internal_static_google_privacy_dlp_v2_DataProfileConfigSnapshot_descriptor = - getDescriptor().getMessageType(228); + getDescriptor().getMessageType(230); internal_static_google_privacy_dlp_v2_DataProfileConfigSnapshot_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfileConfigSnapshot_descriptor, @@ -6692,7 +6626,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "InspectTemplateModifiedTime", }); internal_static_google_privacy_dlp_v2_TableDataProfile_descriptor = - getDescriptor().getMessageType(229); + getDescriptor().getMessageType(231); internal_static_google_privacy_dlp_v2_TableDataProfile_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TableDataProfile_descriptor, @@ -6737,7 +6671,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Key", "Value", }); internal_static_google_privacy_dlp_v2_ProfileStatus_descriptor = - getDescriptor().getMessageType(230); + getDescriptor().getMessageType(232); internal_static_google_privacy_dlp_v2_ProfileStatus_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ProfileStatus_descriptor, @@ -6745,7 +6679,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Status", "Timestamp", }); internal_static_google_privacy_dlp_v2_InfoTypeSummary_descriptor = - getDescriptor().getMessageType(231); + getDescriptor().getMessageType(233); internal_static_google_privacy_dlp_v2_InfoTypeSummary_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InfoTypeSummary_descriptor, @@ -6753,7 +6687,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "InfoType", "EstimatedPrevalence", }); internal_static_google_privacy_dlp_v2_OtherInfoTypeSummary_descriptor = - getDescriptor().getMessageType(232); + getDescriptor().getMessageType(234); internal_static_google_privacy_dlp_v2_OtherInfoTypeSummary_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_OtherInfoTypeSummary_descriptor, @@ -6761,7 +6695,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "InfoType", "EstimatedPrevalence", "ExcludedFromAnalysis", }); internal_static_google_privacy_dlp_v2_ColumnDataProfile_descriptor = - getDescriptor().getMessageType(233); + getDescriptor().getMessageType(235); internal_static_google_privacy_dlp_v2_ColumnDataProfile_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ColumnDataProfile_descriptor, @@ -6788,7 +6722,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "PolicyState", }); internal_static_google_privacy_dlp_v2_FileStoreDataProfile_descriptor = - getDescriptor().getMessageType(234); + getDescriptor().getMessageType(236); internal_static_google_privacy_dlp_v2_FileStoreDataProfile_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FileStoreDataProfile_descriptor, @@ -6837,7 +6771,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "Key", "Value", }); - internal_static_google_privacy_dlp_v2_Tag_descriptor = getDescriptor().getMessageType(235); + internal_static_google_privacy_dlp_v2_Tag_descriptor = getDescriptor().getMessageType(237); internal_static_google_privacy_dlp_v2_Tag_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Tag_descriptor, @@ -6845,7 +6779,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "NamespacedTagValue", "Key", "Value", }); internal_static_google_privacy_dlp_v2_TagFilters_descriptor = - getDescriptor().getMessageType(236); + getDescriptor().getMessageType(238); internal_static_google_privacy_dlp_v2_TagFilters_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TagFilters_descriptor, @@ -6853,7 +6787,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "TagFilters", }); internal_static_google_privacy_dlp_v2_TagFilter_descriptor = - getDescriptor().getMessageType(237); + getDescriptor().getMessageType(239); internal_static_google_privacy_dlp_v2_TagFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TagFilter_descriptor, @@ -6861,7 +6795,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "NamespacedTagValue", "NamespacedTagKey", "Format", }); internal_static_google_privacy_dlp_v2_RelatedResource_descriptor = - getDescriptor().getMessageType(238); + getDescriptor().getMessageType(240); internal_static_google_privacy_dlp_v2_RelatedResource_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RelatedResource_descriptor, @@ -6869,7 +6803,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "FullResource", }); internal_static_google_privacy_dlp_v2_FileStoreInfoTypeSummary_descriptor = - getDescriptor().getMessageType(239); + getDescriptor().getMessageType(241); internal_static_google_privacy_dlp_v2_FileStoreInfoTypeSummary_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FileStoreInfoTypeSummary_descriptor, @@ -6877,7 +6811,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "InfoType", }); internal_static_google_privacy_dlp_v2_FileExtensionInfo_descriptor = - getDescriptor().getMessageType(240); + getDescriptor().getMessageType(242); internal_static_google_privacy_dlp_v2_FileExtensionInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FileExtensionInfo_descriptor, @@ -6885,7 +6819,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "FileExtension", }); internal_static_google_privacy_dlp_v2_FileClusterSummary_descriptor = - getDescriptor().getMessageType(241); + getDescriptor().getMessageType(243); internal_static_google_privacy_dlp_v2_FileClusterSummary_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FileClusterSummary_descriptor, @@ -6900,7 +6834,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "NoFilesExist", }); internal_static_google_privacy_dlp_v2_GetProjectDataProfileRequest_descriptor = - getDescriptor().getMessageType(242); + getDescriptor().getMessageType(244); internal_static_google_privacy_dlp_v2_GetProjectDataProfileRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetProjectDataProfileRequest_descriptor, @@ -6908,7 +6842,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_GetFileStoreDataProfileRequest_descriptor = - getDescriptor().getMessageType(243); + getDescriptor().getMessageType(245); internal_static_google_privacy_dlp_v2_GetFileStoreDataProfileRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetFileStoreDataProfileRequest_descriptor, @@ -6916,7 +6850,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_ListFileStoreDataProfilesRequest_descriptor = - getDescriptor().getMessageType(244); + getDescriptor().getMessageType(246); internal_static_google_privacy_dlp_v2_ListFileStoreDataProfilesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListFileStoreDataProfilesRequest_descriptor, @@ -6924,7 +6858,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageToken", "PageSize", "OrderBy", "Filter", }); internal_static_google_privacy_dlp_v2_ListFileStoreDataProfilesResponse_descriptor = - getDescriptor().getMessageType(245); + getDescriptor().getMessageType(247); internal_static_google_privacy_dlp_v2_ListFileStoreDataProfilesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListFileStoreDataProfilesResponse_descriptor, @@ -6932,7 +6866,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "FileStoreDataProfiles", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteFileStoreDataProfileRequest_descriptor = - getDescriptor().getMessageType(246); + getDescriptor().getMessageType(248); internal_static_google_privacy_dlp_v2_DeleteFileStoreDataProfileRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteFileStoreDataProfileRequest_descriptor, @@ -6940,7 +6874,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_GetTableDataProfileRequest_descriptor = - getDescriptor().getMessageType(247); + getDescriptor().getMessageType(249); internal_static_google_privacy_dlp_v2_GetTableDataProfileRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetTableDataProfileRequest_descriptor, @@ -6948,7 +6882,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_GetColumnDataProfileRequest_descriptor = - getDescriptor().getMessageType(248); + getDescriptor().getMessageType(250); internal_static_google_privacy_dlp_v2_GetColumnDataProfileRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetColumnDataProfileRequest_descriptor, @@ -6956,7 +6890,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_DataProfilePubSubCondition_descriptor = - getDescriptor().getMessageType(249); + getDescriptor().getMessageType(251); internal_static_google_privacy_dlp_v2_DataProfilePubSubCondition_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfilePubSubCondition_descriptor, @@ -6982,7 +6916,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "LogicalOperator", "Conditions", }); internal_static_google_privacy_dlp_v2_DataProfilePubSubMessage_descriptor = - getDescriptor().getMessageType(250); + getDescriptor().getMessageType(252); internal_static_google_privacy_dlp_v2_DataProfilePubSubMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataProfilePubSubMessage_descriptor, @@ -6990,7 +6924,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Profile", "FileStoreProfile", "Event", }); internal_static_google_privacy_dlp_v2_CreateConnectionRequest_descriptor = - getDescriptor().getMessageType(251); + getDescriptor().getMessageType(253); internal_static_google_privacy_dlp_v2_CreateConnectionRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateConnectionRequest_descriptor, @@ -6998,7 +6932,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "Connection", }); internal_static_google_privacy_dlp_v2_GetConnectionRequest_descriptor = - getDescriptor().getMessageType(252); + getDescriptor().getMessageType(254); internal_static_google_privacy_dlp_v2_GetConnectionRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetConnectionRequest_descriptor, @@ -7006,7 +6940,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_ListConnectionsRequest_descriptor = - getDescriptor().getMessageType(253); + getDescriptor().getMessageType(255); internal_static_google_privacy_dlp_v2_ListConnectionsRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListConnectionsRequest_descriptor, @@ -7014,7 +6948,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageSize", "PageToken", "Filter", }); internal_static_google_privacy_dlp_v2_SearchConnectionsRequest_descriptor = - getDescriptor().getMessageType(254); + getDescriptor().getMessageType(256); internal_static_google_privacy_dlp_v2_SearchConnectionsRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_SearchConnectionsRequest_descriptor, @@ -7022,7 +6956,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Parent", "PageSize", "PageToken", "Filter", }); internal_static_google_privacy_dlp_v2_ListConnectionsResponse_descriptor = - getDescriptor().getMessageType(255); + getDescriptor().getMessageType(257); internal_static_google_privacy_dlp_v2_ListConnectionsResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListConnectionsResponse_descriptor, @@ -7030,7 +6964,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Connections", "NextPageToken", }); internal_static_google_privacy_dlp_v2_SearchConnectionsResponse_descriptor = - getDescriptor().getMessageType(256); + getDescriptor().getMessageType(258); internal_static_google_privacy_dlp_v2_SearchConnectionsResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_SearchConnectionsResponse_descriptor, @@ -7038,7 +6972,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Connections", "NextPageToken", }); internal_static_google_privacy_dlp_v2_UpdateConnectionRequest_descriptor = - getDescriptor().getMessageType(257); + getDescriptor().getMessageType(259); internal_static_google_privacy_dlp_v2_UpdateConnectionRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateConnectionRequest_descriptor, @@ -7046,7 +6980,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "Connection", "UpdateMask", }); internal_static_google_privacy_dlp_v2_DeleteConnectionRequest_descriptor = - getDescriptor().getMessageType(258); + getDescriptor().getMessageType(260); internal_static_google_privacy_dlp_v2_DeleteConnectionRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteConnectionRequest_descriptor, @@ -7054,7 +6988,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_Connection_descriptor = - getDescriptor().getMessageType(259); + getDescriptor().getMessageType(261); internal_static_google_privacy_dlp_v2_Connection_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Connection_descriptor, @@ -7062,7 +6996,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", "State", "Errors", "CloudSql", "Properties", }); internal_static_google_privacy_dlp_v2_SecretManagerCredential_descriptor = - getDescriptor().getMessageType(260); + getDescriptor().getMessageType(262); internal_static_google_privacy_dlp_v2_SecretManagerCredential_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_SecretManagerCredential_descriptor, @@ -7070,13 +7004,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Username", "PasswordSecretVersionName", }); internal_static_google_privacy_dlp_v2_CloudSqlIamCredential_descriptor = - getDescriptor().getMessageType(261); + getDescriptor().getMessageType(263); internal_static_google_privacy_dlp_v2_CloudSqlIamCredential_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CloudSqlIamCredential_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_CloudSqlProperties_descriptor = - getDescriptor().getMessageType(262); + getDescriptor().getMessageType(264); internal_static_google_privacy_dlp_v2_CloudSqlProperties_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CloudSqlProperties_descriptor, @@ -7089,7 +7023,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Credential", }); internal_static_google_privacy_dlp_v2_DeleteTableDataProfileRequest_descriptor = - getDescriptor().getMessageType(263); + getDescriptor().getMessageType(265); internal_static_google_privacy_dlp_v2_DeleteTableDataProfileRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteTableDataProfileRequest_descriptor, @@ -7097,7 +7031,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Name", }); internal_static_google_privacy_dlp_v2_DataSourceType_descriptor = - getDescriptor().getMessageType(264); + getDescriptor().getMessageType(266); internal_static_google_privacy_dlp_v2_DataSourceType_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DataSourceType_descriptor, @@ -7105,7 +7039,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "DataSource", }); internal_static_google_privacy_dlp_v2_FileClusterType_descriptor = - getDescriptor().getMessageType(265); + getDescriptor().getMessageType(267); internal_static_google_privacy_dlp_v2_FileClusterType_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FileClusterType_descriptor, @@ -7113,7 +7047,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Cluster", "FileClusterType", }); internal_static_google_privacy_dlp_v2_ProcessingLocation_descriptor = - getDescriptor().getMessageType(266); + getDescriptor().getMessageType(268); internal_static_google_privacy_dlp_v2_ProcessingLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ProcessingLocation_descriptor, @@ -7149,14 +7083,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "MultiRegionProcessing", "GlobalProcessing", }); internal_static_google_privacy_dlp_v2_SaveToGcsFindingsOutput_descriptor = - getDescriptor().getMessageType(267); + getDescriptor().getMessageType(269); internal_static_google_privacy_dlp_v2_SaveToGcsFindingsOutput_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_SaveToGcsFindingsOutput_descriptor, new java.lang.String[] { "Findings", }); - internal_static_google_privacy_dlp_v2_Domain_descriptor = getDescriptor().getMessageType(268); + internal_static_google_privacy_dlp_v2_Domain_descriptor = getDescriptor().getMessageType(270); internal_static_google_privacy_dlp_v2_Domain_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Domain_descriptor, diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeSummary.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeSummary.java index c92c94665e94..faa3f0b700ee 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeSummary.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeSummary.java @@ -131,7 +131,7 @@ public com.google.privacy.dlp.v2.InfoTypeOrBuilder getInfoTypeOrBuilder() { * int32 estimated_prevalence = 2 [deprecated = true]; * * @deprecated google.privacy.dlp.v2.InfoTypeSummary.estimated_prevalence is deprecated. See - * google/privacy/dlp/v2/dlp.proto;l=8036 + * google/privacy/dlp/v2/dlp.proto;l=8057 * @return The estimatedPrevalence. */ @java.lang.Override @@ -697,7 +697,7 @@ public com.google.privacy.dlp.v2.InfoTypeOrBuilder getInfoTypeOrBuilder() { * int32 estimated_prevalence = 2 [deprecated = true]; * * @deprecated google.privacy.dlp.v2.InfoTypeSummary.estimated_prevalence is deprecated. See - * google/privacy/dlp/v2/dlp.proto;l=8036 + * google/privacy/dlp/v2/dlp.proto;l=8057 * @return The estimatedPrevalence. */ @java.lang.Override @@ -716,7 +716,7 @@ public int getEstimatedPrevalence() { * int32 estimated_prevalence = 2 [deprecated = true]; * * @deprecated google.privacy.dlp.v2.InfoTypeSummary.estimated_prevalence is deprecated. See - * google/privacy/dlp/v2/dlp.proto;l=8036 + * google/privacy/dlp/v2/dlp.proto;l=8057 * @param value The estimatedPrevalence to set. * @return This builder for chaining. */ @@ -739,7 +739,7 @@ public Builder setEstimatedPrevalence(int value) { * int32 estimated_prevalence = 2 [deprecated = true]; * * @deprecated google.privacy.dlp.v2.InfoTypeSummary.estimated_prevalence is deprecated. See - * google/privacy/dlp/v2/dlp.proto;l=8036 + * google/privacy/dlp/v2/dlp.proto;l=8057 * @return This builder for chaining. */ @java.lang.Deprecated diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeSummaryOrBuilder.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeSummaryOrBuilder.java index 84843fd46a61..ac780b9b1c67 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeSummaryOrBuilder.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeSummaryOrBuilder.java @@ -73,7 +73,7 @@ public interface InfoTypeSummaryOrBuilder * int32 estimated_prevalence = 2 [deprecated = true]; * * @deprecated google.privacy.dlp.v2.InfoTypeSummary.estimated_prevalence is deprecated. See - * google/privacy/dlp/v2/dlp.proto;l=8036 + * google/privacy/dlp/v2/dlp.proto;l=8057 * @return The estimatedPrevalence. */ @java.lang.Deprecated diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KeyValueMetadataProperty.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KeyValueMetadataProperty.java new file mode 100644 index 000000000000..78769b29d9af --- /dev/null +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KeyValueMetadataProperty.java @@ -0,0 +1,785 @@ +/* + * Copyright 2026 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. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE +// source: google/privacy/dlp/v2/dlp.proto +// Protobuf Java Version: 4.33.2 + +package com.google.privacy.dlp.v2; + +/** + * + * + *
+ * A key-value pair in the Metadata.
+ * 
+ * + * Protobuf type {@code google.privacy.dlp.v2.KeyValueMetadataProperty} + */ +@com.google.protobuf.Generated +public final class KeyValueMetadataProperty extends com.google.protobuf.GeneratedMessage + implements + // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2.KeyValueMetadataProperty) + KeyValueMetadataPropertyOrBuilder { + private static final long serialVersionUID = 0L; + + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 33, + /* patch= */ 2, + /* suffix= */ "", + "KeyValueMetadataProperty"); + } + + // Use KeyValueMetadataProperty.newBuilder() to construct. + private KeyValueMetadataProperty(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + } + + private KeyValueMetadataProperty() { + key_ = ""; + value_ = ""; + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.privacy.dlp.v2.KeyValueMetadataProperty.class, + com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder.class); + } + + public static final int KEY_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") + private volatile java.lang.Object key_ = ""; + + /** + * + * + *
+   * The key of the property.
+   * 
+ * + * string key = 1; + * + * @return The key. + */ + @java.lang.Override + public java.lang.String getKey() { + java.lang.Object ref = key_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + key_ = s; + return s; + } + } + + /** + * + * + *
+   * The key of the property.
+   * 
+ * + * string key = 1; + * + * @return The bytes for key. + */ + @java.lang.Override + public com.google.protobuf.ByteString getKeyBytes() { + java.lang.Object ref = key_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + key_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int VALUE_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") + private volatile java.lang.Object value_ = ""; + + /** + * + * + *
+   * The value of the property.
+   * 
+ * + * string value = 2; + * + * @return The value. + */ + @java.lang.Override + public java.lang.String getValue() { + java.lang.Object ref = value_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + value_ = s; + return s; + } + } + + /** + * + * + *
+   * The value of the property.
+   * 
+ * + * string value = 2; + * + * @return The bytes for value. + */ + @java.lang.Override + public com.google.protobuf.ByteString getValueBytes() { + java.lang.Object ref = value_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + value_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(key_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 1, key_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(value_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 2, value_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(key_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(1, key_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(value_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(2, value_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.privacy.dlp.v2.KeyValueMetadataProperty)) { + return super.equals(obj); + } + com.google.privacy.dlp.v2.KeyValueMetadataProperty other = + (com.google.privacy.dlp.v2.KeyValueMetadataProperty) obj; + + if (!getKey().equals(other.getKey())) return false; + if (!getValue().equals(other.getValue())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + KEY_FIELD_NUMBER; + hash = (53 * hash) + getKey().hashCode(); + hash = (37 * hash) + VALUE_FIELD_NUMBER; + hash = (53 * hash) + getValue().hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom( + java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom( + java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.privacy.dlp.v2.KeyValueMetadataProperty prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + + /** + * + * + *
+   * A key-value pair in the Metadata.
+   * 
+ * + * Protobuf type {@code google.privacy.dlp.v2.KeyValueMetadataProperty} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder + implements + // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2.KeyValueMetadataProperty) + com.google.privacy.dlp.v2.KeyValueMetadataPropertyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.privacy.dlp.v2.KeyValueMetadataProperty.class, + com.google.privacy.dlp.v2.KeyValueMetadataProperty.Builder.class); + } + + // Construct using com.google.privacy.dlp.v2.KeyValueMetadataProperty.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + key_ = ""; + value_ = ""; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_KeyValueMetadataProperty_descriptor; + } + + @java.lang.Override + public com.google.privacy.dlp.v2.KeyValueMetadataProperty getDefaultInstanceForType() { + return com.google.privacy.dlp.v2.KeyValueMetadataProperty.getDefaultInstance(); + } + + @java.lang.Override + public com.google.privacy.dlp.v2.KeyValueMetadataProperty build() { + com.google.privacy.dlp.v2.KeyValueMetadataProperty result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.privacy.dlp.v2.KeyValueMetadataProperty buildPartial() { + com.google.privacy.dlp.v2.KeyValueMetadataProperty result = + new com.google.privacy.dlp.v2.KeyValueMetadataProperty(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartial0(com.google.privacy.dlp.v2.KeyValueMetadataProperty result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.key_ = key_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.value_ = value_; + } + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.privacy.dlp.v2.KeyValueMetadataProperty) { + return mergeFrom((com.google.privacy.dlp.v2.KeyValueMetadataProperty) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.privacy.dlp.v2.KeyValueMetadataProperty other) { + if (other == com.google.privacy.dlp.v2.KeyValueMetadataProperty.getDefaultInstance()) + return this; + if (!other.getKey().isEmpty()) { + key_ = other.key_; + bitField0_ |= 0x00000001; + onChanged(); + } + if (!other.getValue().isEmpty()) { + value_ = other.value_; + bitField0_ |= 0x00000002; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + key_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: + { + value_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int bitField0_; + + private java.lang.Object key_ = ""; + + /** + * + * + *
+     * The key of the property.
+     * 
+ * + * string key = 1; + * + * @return The key. + */ + public java.lang.String getKey() { + java.lang.Object ref = key_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + key_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + + /** + * + * + *
+     * The key of the property.
+     * 
+ * + * string key = 1; + * + * @return The bytes for key. + */ + public com.google.protobuf.ByteString getKeyBytes() { + java.lang.Object ref = key_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + key_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + /** + * + * + *
+     * The key of the property.
+     * 
+ * + * string key = 1; + * + * @param value The key to set. + * @return This builder for chaining. + */ + public Builder setKey(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + key_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + /** + * + * + *
+     * The key of the property.
+     * 
+ * + * string key = 1; + * + * @return This builder for chaining. + */ + public Builder clearKey() { + key_ = getDefaultInstance().getKey(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + + /** + * + * + *
+     * The key of the property.
+     * 
+ * + * string key = 1; + * + * @param value The bytes for key to set. + * @return This builder for chaining. + */ + public Builder setKeyBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + key_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + private java.lang.Object value_ = ""; + + /** + * + * + *
+     * The value of the property.
+     * 
+ * + * string value = 2; + * + * @return The value. + */ + public java.lang.String getValue() { + java.lang.Object ref = value_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + value_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + + /** + * + * + *
+     * The value of the property.
+     * 
+ * + * string value = 2; + * + * @return The bytes for value. + */ + public com.google.protobuf.ByteString getValueBytes() { + java.lang.Object ref = value_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + value_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + /** + * + * + *
+     * The value of the property.
+     * 
+ * + * string value = 2; + * + * @param value The value to set. + * @return This builder for chaining. + */ + public Builder setValue(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + value_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + /** + * + * + *
+     * The value of the property.
+     * 
+ * + * string value = 2; + * + * @return This builder for chaining. + */ + public Builder clearValue() { + value_ = getDefaultInstance().getValue(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + + /** + * + * + *
+     * The value of the property.
+     * 
+ * + * string value = 2; + * + * @param value The bytes for value to set. + * @return This builder for chaining. + */ + public Builder setValueBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + value_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2.KeyValueMetadataProperty) + } + + // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2.KeyValueMetadataProperty) + private static final com.google.privacy.dlp.v2.KeyValueMetadataProperty DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.privacy.dlp.v2.KeyValueMetadataProperty(); + } + + public static com.google.privacy.dlp.v2.KeyValueMetadataProperty getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public KeyValueMetadataProperty parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.privacy.dlp.v2.KeyValueMetadataProperty getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KeyValueMetadataPropertyOrBuilder.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KeyValueMetadataPropertyOrBuilder.java new file mode 100644 index 000000000000..d1fdba31536a --- /dev/null +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KeyValueMetadataPropertyOrBuilder.java @@ -0,0 +1,80 @@ +/* + * Copyright 2026 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. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE +// source: google/privacy/dlp/v2/dlp.proto +// Protobuf Java Version: 4.33.2 + +package com.google.privacy.dlp.v2; + +@com.google.protobuf.Generated +public interface KeyValueMetadataPropertyOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2.KeyValueMetadataProperty) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + *
+   * The key of the property.
+   * 
+ * + * string key = 1; + * + * @return The key. + */ + java.lang.String getKey(); + + /** + * + * + *
+   * The key of the property.
+   * 
+ * + * string key = 1; + * + * @return The bytes for key. + */ + com.google.protobuf.ByteString getKeyBytes(); + + /** + * + * + *
+   * The value of the property.
+   * 
+ * + * string value = 2; + * + * @return The value. + */ + java.lang.String getValue(); + + /** + * + * + *
+   * The value of the property.
+   * 
+ * + * string value = 2; + * + * @return The bytes for value. + */ + com.google.protobuf.ByteString getValueBytes(); +} diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/MetadataType.java b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/MetadataType.java index 14dee2f0c12e..c8df143bbdcd 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/MetadataType.java +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/MetadataType.java @@ -61,6 +61,16 @@ public enum MetadataType implements com.google.protobuf.ProtocolMessageEnum { * CONTENT_METADATA = 3; */ CONTENT_METADATA(3), + /** + * + * + *
+   * Metadata provided by the client.
+   * 
+ * + * CLIENT_PROVIDED_METADATA = 4; + */ + CLIENT_PROVIDED_METADATA(4), UNRECOGNIZED(-1), ; @@ -107,6 +117,17 @@ public enum MetadataType implements com.google.protobuf.ProtocolMessageEnum { */ public static final int CONTENT_METADATA_VALUE = 3; + /** + * + * + *
+   * Metadata provided by the client.
+   * 
+ * + * CLIENT_PROVIDED_METADATA = 4; + */ + public static final int CLIENT_PROVIDED_METADATA_VALUE = 4; + public final int getNumber() { if (this == UNRECOGNIZED) { throw new java.lang.IllegalArgumentException( @@ -137,6 +158,8 @@ public static MetadataType forNumber(int value) { return STORAGE_METADATA; case 3: return CONTENT_METADATA; + case 4: + return CLIENT_PROVIDED_METADATA; default: return null; } diff --git a/java-dlp/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto b/java-dlp/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto index f19908a0e556..114eaacb40c2 100644 --- a/java-dlp/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto +++ b/java-dlp/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto @@ -1384,6 +1384,15 @@ message ContentItem { // Content data to inspect or redact. Replaces `type` and `data`. ByteContentItem byte_item = 5; } + + // User provided metadata for the content. + ContentMetadata content_metadata = 6; +} + +// Metadata on content to be scanned. +message ContentMetadata { + // User provided key-value pairs of content metadata. + repeated KeyValueMetadataProperty properties = 2; } // Structured content to inspect. Up to 50,000 `Value`s per request allowed. See @@ -1403,6 +1412,15 @@ message Table { repeated Row rows = 2; } +// A key-value pair in the Metadata. +message KeyValueMetadataProperty { + // The key of the property. + string key = 1; + + // The value of the property. + string value = 2; +} + // All the findings for a single scanned item. message InspectResult { // List of findings for an item. @@ -7478,6 +7496,9 @@ enum MetadataType { // Metadata extracted from the files. CONTENT_METADATA = 3; + + // Metadata provided by the client. + CLIENT_PROVIDED_METADATA = 4; } // Parts of the APIs which use certain infoTypes. diff --git a/java-storage/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java b/java-storage/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java index f59fe20a0ed3..462864e83c11 100644 --- a/java-storage/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java +++ b/java-storage/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java @@ -1979,7 +1979,10 @@ public void updateObjectExceptionTest() throws Exception { @Test public void writeObjectTest() throws Exception { - WriteObjectResponse expectedResponse = WriteObjectResponse.newBuilder().build(); + WriteObjectResponse expectedResponse = + WriteObjectResponse.newBuilder() + .setPersistedDataChecksums(ObjectChecksums.newBuilder().build()) + .build(); mockStorage.addResponse(expectedResponse); WriteObjectRequest request = WriteObjectRequest.newBuilder() @@ -2039,6 +2042,7 @@ public void writeObjectExceptionTest() throws Exception { public void bidiWriteObjectTest() throws Exception { BidiWriteObjectResponse expectedResponse = BidiWriteObjectResponse.newBuilder() + .setPersistedDataChecksums(ObjectChecksums.newBuilder().build()) .setWriteHandle(BidiWriteHandle.newBuilder().build()) .build(); mockStorage.addResponse(expectedResponse); @@ -2372,7 +2376,10 @@ public void startResumableWriteExceptionTest() throws Exception { @Test public void queryWriteStatusTest() throws Exception { - QueryWriteStatusResponse expectedResponse = QueryWriteStatusResponse.newBuilder().build(); + QueryWriteStatusResponse expectedResponse = + QueryWriteStatusResponse.newBuilder() + .setPersistedDataChecksums(ObjectChecksums.newBuilder().build()) + .build(); mockStorage.addResponse(expectedResponse); String uploadId = "uploadId1563990780"; diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectRequest.java b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectRequest.java index 5a1f0c7d0cdd..36abdd34c865 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectRequest.java +++ b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectRequest.java @@ -453,9 +453,9 @@ public com.google.storage.v2.ChecksummedDataOrBuilder getChecksummedDataOrBuilde * *
    * Optional. Checksums for the complete object. If the checksums computed by
-   * the service don't match the specified checksums the call fails. Might only
-   * be provided in the first request or the last request (with finish_write
-   * set).
+   * the service don't match the specified checksums the call fails. May be
+   * provided in the last request (with finish_write set). For non-appendable
+   * objects only, may also be provided in the first request.
    * 
* * @@ -474,9 +474,9 @@ public boolean hasObjectChecksums() { * *
    * Optional. Checksums for the complete object. If the checksums computed by
-   * the service don't match the specified checksums the call fails. Might only
-   * be provided in the first request or the last request (with finish_write
-   * set).
+   * the service don't match the specified checksums the call fails. May be
+   * provided in the last request (with finish_write set). For non-appendable
+   * objects only, may also be provided in the first request.
    * 
* * @@ -497,9 +497,9 @@ public com.google.storage.v2.ObjectChecksums getObjectChecksums() { * *
    * Optional. Checksums for the complete object. If the checksums computed by
-   * the service don't match the specified checksums the call fails. Might only
-   * be provided in the first request or the last request (with finish_write
-   * set).
+   * the service don't match the specified checksums the call fails. May be
+   * provided in the last request (with finish_write set). For non-appendable
+   * objects only, may also be provided in the first request.
    * 
* * @@ -2224,9 +2224,9 @@ public com.google.storage.v2.ChecksummedDataOrBuilder getChecksummedDataOrBuilde * *
      * Optional. Checksums for the complete object. If the checksums computed by
-     * the service don't match the specified checksums the call fails. Might only
-     * be provided in the first request or the last request (with finish_write
-     * set).
+     * the service don't match the specified checksums the call fails. May be
+     * provided in the last request (with finish_write set). For non-appendable
+     * objects only, may also be provided in the first request.
      * 
* * @@ -2244,9 +2244,9 @@ public boolean hasObjectChecksums() { * *
      * Optional. Checksums for the complete object. If the checksums computed by
-     * the service don't match the specified checksums the call fails. Might only
-     * be provided in the first request or the last request (with finish_write
-     * set).
+     * the service don't match the specified checksums the call fails. May be
+     * provided in the last request (with finish_write set). For non-appendable
+     * objects only, may also be provided in the first request.
      * 
* * @@ -2270,9 +2270,9 @@ public com.google.storage.v2.ObjectChecksums getObjectChecksums() { * *
      * Optional. Checksums for the complete object. If the checksums computed by
-     * the service don't match the specified checksums the call fails. Might only
-     * be provided in the first request or the last request (with finish_write
-     * set).
+     * the service don't match the specified checksums the call fails. May be
+     * provided in the last request (with finish_write set). For non-appendable
+     * objects only, may also be provided in the first request.
      * 
* * @@ -2298,9 +2298,9 @@ public Builder setObjectChecksums(com.google.storage.v2.ObjectChecksums value) { * *
      * Optional. Checksums for the complete object. If the checksums computed by
-     * the service don't match the specified checksums the call fails. Might only
-     * be provided in the first request or the last request (with finish_write
-     * set).
+     * the service don't match the specified checksums the call fails. May be
+     * provided in the last request (with finish_write set). For non-appendable
+     * objects only, may also be provided in the first request.
      * 
* * @@ -2324,9 +2324,9 @@ public Builder setObjectChecksums( * *
      * Optional. Checksums for the complete object. If the checksums computed by
-     * the service don't match the specified checksums the call fails. Might only
-     * be provided in the first request or the last request (with finish_write
-     * set).
+     * the service don't match the specified checksums the call fails. May be
+     * provided in the last request (with finish_write set). For non-appendable
+     * objects only, may also be provided in the first request.
      * 
* * @@ -2357,9 +2357,9 @@ public Builder mergeObjectChecksums(com.google.storage.v2.ObjectChecksums value) * *
      * Optional. Checksums for the complete object. If the checksums computed by
-     * the service don't match the specified checksums the call fails. Might only
-     * be provided in the first request or the last request (with finish_write
-     * set).
+     * the service don't match the specified checksums the call fails. May be
+     * provided in the last request (with finish_write set). For non-appendable
+     * objects only, may also be provided in the first request.
      * 
* * @@ -2382,9 +2382,9 @@ public Builder clearObjectChecksums() { * *
      * Optional. Checksums for the complete object. If the checksums computed by
-     * the service don't match the specified checksums the call fails. Might only
-     * be provided in the first request or the last request (with finish_write
-     * set).
+     * the service don't match the specified checksums the call fails. May be
+     * provided in the last request (with finish_write set). For non-appendable
+     * objects only, may also be provided in the first request.
      * 
* * @@ -2402,9 +2402,9 @@ public com.google.storage.v2.ObjectChecksums.Builder getObjectChecksumsBuilder() * *
      * Optional. Checksums for the complete object. If the checksums computed by
-     * the service don't match the specified checksums the call fails. Might only
-     * be provided in the first request or the last request (with finish_write
-     * set).
+     * the service don't match the specified checksums the call fails. May be
+     * provided in the last request (with finish_write set). For non-appendable
+     * objects only, may also be provided in the first request.
      * 
* * @@ -2426,9 +2426,9 @@ public com.google.storage.v2.ObjectChecksumsOrBuilder getObjectChecksumsOrBuilde * *
      * Optional. Checksums for the complete object. If the checksums computed by
-     * the service don't match the specified checksums the call fails. Might only
-     * be provided in the first request or the last request (with finish_write
-     * set).
+     * the service don't match the specified checksums the call fails. May be
+     * provided in the last request (with finish_write set). For non-appendable
+     * objects only, may also be provided in the first request.
      * 
* * diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectRequestOrBuilder.java b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectRequestOrBuilder.java index 95ef87da740c..5e85064a5a77 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectRequestOrBuilder.java +++ b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectRequestOrBuilder.java @@ -215,9 +215,9 @@ public interface BidiWriteObjectRequestOrBuilder * *
    * Optional. Checksums for the complete object. If the checksums computed by
-   * the service don't match the specified checksums the call fails. Might only
-   * be provided in the first request or the last request (with finish_write
-   * set).
+   * the service don't match the specified checksums the call fails. May be
+   * provided in the last request (with finish_write set). For non-appendable
+   * objects only, may also be provided in the first request.
    * 
* * @@ -233,9 +233,9 @@ public interface BidiWriteObjectRequestOrBuilder * *
    * Optional. Checksums for the complete object. If the checksums computed by
-   * the service don't match the specified checksums the call fails. Might only
-   * be provided in the first request or the last request (with finish_write
-   * set).
+   * the service don't match the specified checksums the call fails. May be
+   * provided in the last request (with finish_write set). For non-appendable
+   * objects only, may also be provided in the first request.
    * 
* * @@ -251,9 +251,9 @@ public interface BidiWriteObjectRequestOrBuilder * *
    * Optional. Checksums for the complete object. If the checksums computed by
-   * the service don't match the specified checksums the call fails. Might only
-   * be provided in the first request or the last request (with finish_write
-   * set).
+   * the service don't match the specified checksums the call fails. May be
+   * provided in the last request (with finish_write set). For non-appendable
+   * objects only, may also be provided in the first request.
    * 
* * diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectResponse.java b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectResponse.java index e467f9b10de1..4594eec67377 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectResponse.java +++ b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectResponse.java @@ -215,6 +215,59 @@ public com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder() { return com.google.storage.v2.Object.getDefaultInstance(); } + public static final int PERSISTED_DATA_CHECKSUMS_FIELD_NUMBER = 4; + private com.google.storage.v2.ObjectChecksums persistedDataChecksums_; + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + * + * @return Whether the persistedDataChecksums field is set. + */ + @java.lang.Override + public boolean hasPersistedDataChecksums() { + return ((bitField0_ & 0x00000001) != 0); + } + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + * + * @return The persistedDataChecksums. + */ + @java.lang.Override + public com.google.storage.v2.ObjectChecksums getPersistedDataChecksums() { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + */ + @java.lang.Override + public com.google.storage.v2.ObjectChecksumsOrBuilder getPersistedDataChecksumsOrBuilder() { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } + public static final int WRITE_HANDLE_FIELD_NUMBER = 3; private com.google.storage.v2.BidiWriteHandle writeHandle_; @@ -233,7 +286,7 @@ public com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder() { */ @java.lang.Override public boolean hasWriteHandle() { - return ((bitField0_ & 0x00000001) != 0); + return ((bitField0_ & 0x00000002) != 0); } /** @@ -294,9 +347,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (writeStatusCase_ == 2) { output.writeMessage(2, (com.google.storage.v2.Object) writeStatus_); } - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { output.writeMessage(3, getWriteHandle()); } + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(4, getPersistedDataChecksums()); + } getUnknownFields().writeTo(output); } @@ -316,9 +372,13 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, (com.google.storage.v2.Object) writeStatus_); } - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getWriteHandle()); } + if (((bitField0_ & 0x00000001) != 0)) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize(4, getPersistedDataChecksums()); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -335,6 +395,10 @@ public boolean equals(final java.lang.Object obj) { com.google.storage.v2.BidiWriteObjectResponse other = (com.google.storage.v2.BidiWriteObjectResponse) obj; + if (hasPersistedDataChecksums() != other.hasPersistedDataChecksums()) return false; + if (hasPersistedDataChecksums()) { + if (!getPersistedDataChecksums().equals(other.getPersistedDataChecksums())) return false; + } if (hasWriteHandle() != other.hasWriteHandle()) return false; if (hasWriteHandle()) { if (!getWriteHandle().equals(other.getWriteHandle())) return false; @@ -361,6 +425,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPersistedDataChecksums()) { + hash = (37 * hash) + PERSISTED_DATA_CHECKSUMS_FIELD_NUMBER; + hash = (53 * hash) + getPersistedDataChecksums().hashCode(); + } if (hasWriteHandle()) { hash = (37 * hash) + WRITE_HANDLE_FIELD_NUMBER; hash = (53 * hash) + getWriteHandle().hashCode(); @@ -518,6 +586,7 @@ private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + internalGetPersistedDataChecksumsFieldBuilder(); internalGetWriteHandleFieldBuilder(); } } @@ -529,6 +598,11 @@ public Builder clear() { if (resourceBuilder_ != null) { resourceBuilder_.clear(); } + persistedDataChecksums_ = null; + if (persistedDataChecksumsBuilder_ != null) { + persistedDataChecksumsBuilder_.dispose(); + persistedDataChecksumsBuilder_ = null; + } writeHandle_ = null; if (writeHandleBuilder_ != null) { writeHandleBuilder_.dispose(); @@ -575,9 +649,16 @@ private void buildPartial0(com.google.storage.v2.BidiWriteObjectResponse result) int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000004) != 0)) { + result.persistedDataChecksums_ = + persistedDataChecksumsBuilder_ == null + ? persistedDataChecksums_ + : persistedDataChecksumsBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000008) != 0)) { result.writeHandle_ = writeHandleBuilder_ == null ? writeHandle_ : writeHandleBuilder_.build(); - to_bitField0_ |= 0x00000001; + to_bitField0_ |= 0x00000002; } result.bitField0_ |= to_bitField0_; } @@ -602,6 +683,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.storage.v2.BidiWriteObjectResponse other) { if (other == com.google.storage.v2.BidiWriteObjectResponse.getDefaultInstance()) return this; + if (other.hasPersistedDataChecksums()) { + mergePersistedDataChecksums(other.getPersistedDataChecksums()); + } if (other.hasWriteHandle()) { mergeWriteHandle(other.getWriteHandle()); } @@ -664,9 +748,17 @@ public Builder mergeFrom( { input.readMessage( internalGetWriteHandleFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; break; } // case 26 + case 34: + { + input.readMessage( + internalGetPersistedDataChecksumsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000004; + break; + } // case 34 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -1000,6 +1092,202 @@ public com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder() { return resourceBuilder_; } + private com.google.storage.v2.ObjectChecksums persistedDataChecksums_; + private com.google.protobuf.SingleFieldBuilder< + com.google.storage.v2.ObjectChecksums, + com.google.storage.v2.ObjectChecksums.Builder, + com.google.storage.v2.ObjectChecksumsOrBuilder> + persistedDataChecksumsBuilder_; + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + * + * @return Whether the persistedDataChecksums field is set. + */ + public boolean hasPersistedDataChecksums() { + return ((bitField0_ & 0x00000004) != 0); + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + * + * @return The persistedDataChecksums. + */ + public com.google.storage.v2.ObjectChecksums getPersistedDataChecksums() { + if (persistedDataChecksumsBuilder_ == null) { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } else { + return persistedDataChecksumsBuilder_.getMessage(); + } + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + */ + public Builder setPersistedDataChecksums(com.google.storage.v2.ObjectChecksums value) { + if (persistedDataChecksumsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + persistedDataChecksums_ = value; + } else { + persistedDataChecksumsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + */ + public Builder setPersistedDataChecksums( + com.google.storage.v2.ObjectChecksums.Builder builderForValue) { + if (persistedDataChecksumsBuilder_ == null) { + persistedDataChecksums_ = builderForValue.build(); + } else { + persistedDataChecksumsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + */ + public Builder mergePersistedDataChecksums(com.google.storage.v2.ObjectChecksums value) { + if (persistedDataChecksumsBuilder_ == null) { + if (((bitField0_ & 0x00000004) != 0) + && persistedDataChecksums_ != null + && persistedDataChecksums_ + != com.google.storage.v2.ObjectChecksums.getDefaultInstance()) { + getPersistedDataChecksumsBuilder().mergeFrom(value); + } else { + persistedDataChecksums_ = value; + } + } else { + persistedDataChecksumsBuilder_.mergeFrom(value); + } + if (persistedDataChecksums_ != null) { + bitField0_ |= 0x00000004; + onChanged(); + } + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + */ + public Builder clearPersistedDataChecksums() { + bitField0_ = (bitField0_ & ~0x00000004); + persistedDataChecksums_ = null; + if (persistedDataChecksumsBuilder_ != null) { + persistedDataChecksumsBuilder_.dispose(); + persistedDataChecksumsBuilder_ = null; + } + onChanged(); + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + */ + public com.google.storage.v2.ObjectChecksums.Builder getPersistedDataChecksumsBuilder() { + bitField0_ |= 0x00000004; + onChanged(); + return internalGetPersistedDataChecksumsFieldBuilder().getBuilder(); + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + */ + public com.google.storage.v2.ObjectChecksumsOrBuilder getPersistedDataChecksumsOrBuilder() { + if (persistedDataChecksumsBuilder_ != null) { + return persistedDataChecksumsBuilder_.getMessageOrBuilder(); + } else { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + */ + private com.google.protobuf.SingleFieldBuilder< + com.google.storage.v2.ObjectChecksums, + com.google.storage.v2.ObjectChecksums.Builder, + com.google.storage.v2.ObjectChecksumsOrBuilder> + internalGetPersistedDataChecksumsFieldBuilder() { + if (persistedDataChecksumsBuilder_ == null) { + persistedDataChecksumsBuilder_ = + new com.google.protobuf.SingleFieldBuilder< + com.google.storage.v2.ObjectChecksums, + com.google.storage.v2.ObjectChecksums.Builder, + com.google.storage.v2.ObjectChecksumsOrBuilder>( + getPersistedDataChecksums(), getParentForChildren(), isClean()); + persistedDataChecksums_ = null; + } + return persistedDataChecksumsBuilder_; + } + private com.google.storage.v2.BidiWriteHandle writeHandle_; private com.google.protobuf.SingleFieldBuilder< com.google.storage.v2.BidiWriteHandle, @@ -1021,7 +1309,7 @@ public com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder() { * @return Whether the writeHandle field is set. */ public boolean hasWriteHandle() { - return ((bitField0_ & 0x00000004) != 0); + return ((bitField0_ & 0x00000008) != 0); } /** @@ -1067,7 +1355,7 @@ public Builder setWriteHandle(com.google.storage.v2.BidiWriteHandle value) { } else { writeHandleBuilder_.setMessage(value); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1089,7 +1377,7 @@ public Builder setWriteHandle(com.google.storage.v2.BidiWriteHandle.Builder buil } else { writeHandleBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1107,7 +1395,7 @@ public Builder setWriteHandle(com.google.storage.v2.BidiWriteHandle.Builder buil */ public Builder mergeWriteHandle(com.google.storage.v2.BidiWriteHandle value) { if (writeHandleBuilder_ == null) { - if (((bitField0_ & 0x00000004) != 0) + if (((bitField0_ & 0x00000008) != 0) && writeHandle_ != null && writeHandle_ != com.google.storage.v2.BidiWriteHandle.getDefaultInstance()) { getWriteHandleBuilder().mergeFrom(value); @@ -1118,7 +1406,7 @@ public Builder mergeWriteHandle(com.google.storage.v2.BidiWriteHandle value) { writeHandleBuilder_.mergeFrom(value); } if (writeHandle_ != null) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; onChanged(); } return this; @@ -1136,7 +1424,7 @@ public Builder mergeWriteHandle(com.google.storage.v2.BidiWriteHandle value) { * optional .google.storage.v2.BidiWriteHandle write_handle = 3; */ public Builder clearWriteHandle() { - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); writeHandle_ = null; if (writeHandleBuilder_ != null) { writeHandleBuilder_.dispose(); @@ -1158,7 +1446,7 @@ public Builder clearWriteHandle() { * optional .google.storage.v2.BidiWriteHandle write_handle = 3; */ public com.google.storage.v2.BidiWriteHandle.Builder getWriteHandleBuilder() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; onChanged(); return internalGetWriteHandleFieldBuilder().getBuilder(); } diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectResponseOrBuilder.java b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectResponseOrBuilder.java index 3bce65b843b7..1376eff571cb 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectResponseOrBuilder.java +++ b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BidiWriteObjectResponseOrBuilder.java @@ -94,6 +94,43 @@ public interface BidiWriteObjectResponseOrBuilder */ com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder(); + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + * + * @return Whether the persistedDataChecksums field is set. + */ + boolean hasPersistedDataChecksums(); + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + * + * @return The persistedDataChecksums. + */ + com.google.storage.v2.ObjectChecksums getPersistedDataChecksums(); + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 4; + */ + com.google.storage.v2.ObjectChecksumsOrBuilder getPersistedDataChecksumsOrBuilder(); + /** * * diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/QueryWriteStatusResponse.java b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/QueryWriteStatusResponse.java index 31e9b8a65877..e27854f88800 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/QueryWriteStatusResponse.java +++ b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/QueryWriteStatusResponse.java @@ -69,6 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.storage.v2.QueryWriteStatusResponse.Builder.class); } + private int bitField0_; private int writeStatusCase_ = 0; @SuppressWarnings("serial") @@ -219,6 +220,59 @@ public com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder() { return com.google.storage.v2.Object.getDefaultInstance(); } + public static final int PERSISTED_DATA_CHECKSUMS_FIELD_NUMBER = 3; + private com.google.storage.v2.ObjectChecksums persistedDataChecksums_; + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return Whether the persistedDataChecksums field is set. + */ + @java.lang.Override + public boolean hasPersistedDataChecksums() { + return ((bitField0_ & 0x00000001) != 0); + } + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return The persistedDataChecksums. + */ + @java.lang.Override + public com.google.storage.v2.ObjectChecksums getPersistedDataChecksums() { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + @java.lang.Override + public com.google.storage.v2.ObjectChecksumsOrBuilder getPersistedDataChecksumsOrBuilder() { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -239,6 +293,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (writeStatusCase_ == 2) { output.writeMessage(2, (com.google.storage.v2.Object) writeStatus_); } + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(3, getPersistedDataChecksums()); + } getUnknownFields().writeTo(output); } @@ -258,6 +315,10 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, (com.google.storage.v2.Object) writeStatus_); } + if (((bitField0_ & 0x00000001) != 0)) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize(3, getPersistedDataChecksums()); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -274,6 +335,10 @@ public boolean equals(final java.lang.Object obj) { com.google.storage.v2.QueryWriteStatusResponse other = (com.google.storage.v2.QueryWriteStatusResponse) obj; + if (hasPersistedDataChecksums() != other.hasPersistedDataChecksums()) return false; + if (hasPersistedDataChecksums()) { + if (!getPersistedDataChecksums().equals(other.getPersistedDataChecksums())) return false; + } if (!getWriteStatusCase().equals(other.getWriteStatusCase())) return false; switch (writeStatusCase_) { case 1: @@ -296,6 +361,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPersistedDataChecksums()) { + hash = (37 * hash) + PERSISTED_DATA_CHECKSUMS_FIELD_NUMBER; + hash = (53 * hash) + getPersistedDataChecksums().hashCode(); + } switch (writeStatusCase_) { case 1: hash = (37 * hash) + PERSISTED_SIZE_FIELD_NUMBER; @@ -439,10 +508,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.storage.v2.QueryWriteStatusResponse.newBuilder() - private Builder() {} + private Builder() { + maybeForceBuilderInitialization(); + } private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); + maybeForceBuilderInitialization(); + } + + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + internalGetPersistedDataChecksumsFieldBuilder(); + } } @java.lang.Override @@ -452,6 +530,11 @@ public Builder clear() { if (resourceBuilder_ != null) { resourceBuilder_.clear(); } + persistedDataChecksums_ = null; + if (persistedDataChecksumsBuilder_ != null) { + persistedDataChecksumsBuilder_.dispose(); + persistedDataChecksumsBuilder_ = null; + } writeStatusCase_ = 0; writeStatus_ = null; return this; @@ -491,6 +574,15 @@ public com.google.storage.v2.QueryWriteStatusResponse buildPartial() { private void buildPartial0(com.google.storage.v2.QueryWriteStatusResponse result) { int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000004) != 0)) { + result.persistedDataChecksums_ = + persistedDataChecksumsBuilder_ == null + ? persistedDataChecksums_ + : persistedDataChecksumsBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + result.bitField0_ |= to_bitField0_; } private void buildPartialOneofs(com.google.storage.v2.QueryWriteStatusResponse result) { @@ -513,6 +605,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.storage.v2.QueryWriteStatusResponse other) { if (other == com.google.storage.v2.QueryWriteStatusResponse.getDefaultInstance()) return this; + if (other.hasPersistedDataChecksums()) { + mergePersistedDataChecksums(other.getPersistedDataChecksums()); + } switch (other.getWriteStatusCase()) { case PERSISTED_SIZE: { @@ -568,6 +663,14 @@ public Builder mergeFrom( writeStatusCase_ = 2; break; } // case 18 + case 26: + { + input.readMessage( + internalGetPersistedDataChecksumsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000004; + break; + } // case 26 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -909,6 +1012,202 @@ public com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder() { return resourceBuilder_; } + private com.google.storage.v2.ObjectChecksums persistedDataChecksums_; + private com.google.protobuf.SingleFieldBuilder< + com.google.storage.v2.ObjectChecksums, + com.google.storage.v2.ObjectChecksums.Builder, + com.google.storage.v2.ObjectChecksumsOrBuilder> + persistedDataChecksumsBuilder_; + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return Whether the persistedDataChecksums field is set. + */ + public boolean hasPersistedDataChecksums() { + return ((bitField0_ & 0x00000004) != 0); + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return The persistedDataChecksums. + */ + public com.google.storage.v2.ObjectChecksums getPersistedDataChecksums() { + if (persistedDataChecksumsBuilder_ == null) { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } else { + return persistedDataChecksumsBuilder_.getMessage(); + } + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public Builder setPersistedDataChecksums(com.google.storage.v2.ObjectChecksums value) { + if (persistedDataChecksumsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + persistedDataChecksums_ = value; + } else { + persistedDataChecksumsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public Builder setPersistedDataChecksums( + com.google.storage.v2.ObjectChecksums.Builder builderForValue) { + if (persistedDataChecksumsBuilder_ == null) { + persistedDataChecksums_ = builderForValue.build(); + } else { + persistedDataChecksumsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public Builder mergePersistedDataChecksums(com.google.storage.v2.ObjectChecksums value) { + if (persistedDataChecksumsBuilder_ == null) { + if (((bitField0_ & 0x00000004) != 0) + && persistedDataChecksums_ != null + && persistedDataChecksums_ + != com.google.storage.v2.ObjectChecksums.getDefaultInstance()) { + getPersistedDataChecksumsBuilder().mergeFrom(value); + } else { + persistedDataChecksums_ = value; + } + } else { + persistedDataChecksumsBuilder_.mergeFrom(value); + } + if (persistedDataChecksums_ != null) { + bitField0_ |= 0x00000004; + onChanged(); + } + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public Builder clearPersistedDataChecksums() { + bitField0_ = (bitField0_ & ~0x00000004); + persistedDataChecksums_ = null; + if (persistedDataChecksumsBuilder_ != null) { + persistedDataChecksumsBuilder_.dispose(); + persistedDataChecksumsBuilder_ = null; + } + onChanged(); + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public com.google.storage.v2.ObjectChecksums.Builder getPersistedDataChecksumsBuilder() { + bitField0_ |= 0x00000004; + onChanged(); + return internalGetPersistedDataChecksumsFieldBuilder().getBuilder(); + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public com.google.storage.v2.ObjectChecksumsOrBuilder getPersistedDataChecksumsOrBuilder() { + if (persistedDataChecksumsBuilder_ != null) { + return persistedDataChecksumsBuilder_.getMessageOrBuilder(); + } else { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + private com.google.protobuf.SingleFieldBuilder< + com.google.storage.v2.ObjectChecksums, + com.google.storage.v2.ObjectChecksums.Builder, + com.google.storage.v2.ObjectChecksumsOrBuilder> + internalGetPersistedDataChecksumsFieldBuilder() { + if (persistedDataChecksumsBuilder_ == null) { + persistedDataChecksumsBuilder_ = + new com.google.protobuf.SingleFieldBuilder< + com.google.storage.v2.ObjectChecksums, + com.google.storage.v2.ObjectChecksums.Builder, + com.google.storage.v2.ObjectChecksumsOrBuilder>( + getPersistedDataChecksums(), getParentForChildren(), isClean()); + persistedDataChecksums_ = null; + } + return persistedDataChecksumsBuilder_; + } + // @@protoc_insertion_point(builder_scope:google.storage.v2.QueryWriteStatusResponse) } diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/QueryWriteStatusResponseOrBuilder.java b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/QueryWriteStatusResponseOrBuilder.java index fda3b384bf11..d79677bed205 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/QueryWriteStatusResponseOrBuilder.java +++ b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/QueryWriteStatusResponseOrBuilder.java @@ -98,5 +98,42 @@ public interface QueryWriteStatusResponseOrBuilder */ com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder(); + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return Whether the persistedDataChecksums field is set. + */ + boolean hasPersistedDataChecksums(); + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return The persistedDataChecksums. + */ + com.google.storage.v2.ObjectChecksums getPersistedDataChecksums(); + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + com.google.storage.v2.ObjectChecksumsOrBuilder getPersistedDataChecksumsOrBuilder(); + com.google.storage.v2.QueryWriteStatusResponse.WriteStatusCase getWriteStatusCase(); } diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java index 161be5a97e40..3388cc9f2e65 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java +++ b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java @@ -651,10 +651,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\034common_object_request_params\030\010" + " \001(\0132,.google.storage.v2.CommonObjectRequestParamsB\003\340A\001B\017\n\r" + "first_messageB\006\n" - + "\004data\"n\n" + + "\004data\"\264\001\n" + "\023WriteObjectResponse\022\030\n" + "\016persisted_size\030\001 \001(\003H\000\022-\n" - + "\010resource\030\002 \001(\0132\031.google.storage.v2.ObjectH\000B\016\n" + + "\010resource\030\002 \001(\0132\031.google.storage.v2.ObjectH\000\022D\n" + + "\030persisted_data_checksums\030\003" + + " \001(\0132\".google.storage.v2.ObjectChecksumsB\016\n" + "\014write_status\"\201\003\n" + "\020AppendObjectSpec\0225\n" + "\006bucket\030\001 \001(\tB%\340A\002\372A\037\n" @@ -687,10 +689,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\034common_object_request_params\030\n" + " \001(\0132,.google.storage.v2.CommonObjectRequestParamsB\003\340A\001B\017\n\r" + "first_messageB\006\n" - + "\004data\"\302\001\n" + + "\004data\"\210\002\n" + "\027BidiWriteObjectResponse\022\030\n" + "\016persisted_size\030\001 \001(\003H\000\022-\n" - + "\010resource\030\002 \001(\0132\031.google.storage.v2.ObjectH\000\022=\n" + + "\010resource\030\002 \001(\0132\031.google.storage.v2.ObjectH\000\022D\n" + + "\030persisted_data_checksums\030\004" + + " \001(\0132\".google.storage.v2.ObjectChecksums\022=\n" + "\014write_handle\030\003" + " \001(\0132\".google.storage.v2.BidiWriteHandleH\001\210\001\001B\016\n" + "\014write_statusB\017\n\r" @@ -716,11 +720,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "_read_mask\"\212\001\n" + "\027QueryWriteStatusRequest\022\026\n" + "\tupload_id\030\001 \001(\tB\003\340A\002\022W\n" - + "\034common_object_request_params\030\002" - + " \001(\0132,.google.storage.v2.CommonObjectRequestParamsB\003\340A\001\"s\n" + + "\034common_object_request_params\030\002 \001(\0132,.g" + + "oogle.storage.v2.CommonObjectRequestParamsB\003\340A\001\"\271\001\n" + "\030QueryWriteStatusResponse\022\030\n" + "\016persisted_size\030\001 \001(\003H\000\022-\n" - + "\010resource\030\002 \001(\0132\031.google.storage.v2.ObjectH\000B\016\n" + + "\010resource\030\002 \001(\0132\031.google.storage.v2.ObjectH\000\022D\n" + + "\030persisted_data_checksums\030\003" + + " \001(\0132\".google.storage.v2.ObjectChecksumsB\016\n" + "\014write_status\"\335\n\n" + "\024RewriteObjectRequest\022 \n" + "\020destination_name\030\030 \001(\tB\006\340A\002\340A\005\022D\n" @@ -728,8 +734,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\035storage.googleapis.com/Bucket\022F\n" + "\023destination_kms_key\030\033 \001(\tB)\340A\001\372A#\n" + "!cloudkms.googleapis.com/CryptoKey\0223\n" - + "\013destination\030\001 \001(\0132\031.google.storage.v2.ObjectB\003\340A\001\022<\n" - + "\r" + + "\013destination\030\001 \001(\0132\031.google.storage.v2.ObjectB\003\340A\001\022<\n\r" + "source_bucket\030\002 \001(\tB%\340A\002\372A\037\n" + "\035storage.googleapis.com/Bucket\022\032\n\r" + "source_object\030\003 \001(\tB\003\340A\002\022\036\n" @@ -750,10 +755,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + " copy_source_encryption_algorithm\030\020 \001(\tB\003\340A\001\022-\n" + " copy_source_encryption_key_bytes\030\025 \001(\014B\003\340A\001\0224\n" + "\'copy_source_encryption_key_sha256_bytes\030\026 \001(\014B\003\340A\001\022W\n" - + "\034common_object_request_params\030\023 \001(\0132,.google.s" - + "torage.v2.CommonObjectRequestParamsB\003\340A\001\022A\n" - + "\020object_checksums\030\035" - + " \001(\0132\".google.storage.v2.ObjectChecksumsB\003\340A\001B\026\n" + + "\034common_object_request_params\030\023 \001(" + + "\0132,.google.storage.v2.CommonObjectRequestParamsB\003\340A\001\022A\n" + + "\020object_checksums\030\035 \001(\0132\"" + + ".google.storage.v2.ObjectChecksumsB\003\340A\001B\026\n" + "\024_if_generation_matchB\032\n" + "\030_if_generation_not_matchB\032\n" + "\030_if_metageneration_matchB\036\n" @@ -866,35 +871,36 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\030default_event_based_hold\030\016 \001(\010B\003\340A\001\022:\n" + "\006labels\030\017" + " \003(\0132%.google.storage.v2.Bucket.LabelsEntryB\003\340A\001\0227\n" - + "\007website\030\020 \001(\013" - + "2!.google.storage.v2.Bucket.WebsiteB\003\340A\001\022=\n\n" + + "\007website\030\020" + + " \001(\0132!.google.storage.v2.Bucket.WebsiteB\003\340A\001\022=\n\n" + "versioning\030\021" + " \001(\0132$.google.storage.v2.Bucket.VersioningB\003\340A\001\0227\n" + "\007logging\030\022 \001(\0132!.google.storage.v2.Bucket.LoggingB\003\340A\001\022,\n" + "\005owner\030\023 \001(\0132\030.google.storage.v2.OwnerB\003\340A\003\022=\n\n" - + "encryption\030\024" - + " \001(\0132$.google.storage.v2.Bucket.EncryptionB\003\340A\001\0227\n" + + "encryption\030\024 \001(\0132$" + + ".google.storage.v2.Bucket.EncryptionB\003\340A\001\0227\n" + "\007billing\030\025 \001(\0132!.google.storage.v2.Bucket.BillingB\003\340A\001\022H\n" - + "\020retention_policy\030\026 \001(\0132).googl" - + "e.storage.v2.Bucket.RetentionPolicyB\003\340A\001\022<\n\n" + + "\020retention_policy\030\026" + + " \001(\0132).google.storage.v2.Bucket.RetentionPolicyB\003\340A\001\022<\n\n" + "iam_config\030\027" + " \001(\0132#.google.storage.v2.Bucket.IamConfigB\003\340A\001\022\032\n\r" + "satisfies_pzs\030\031 \001(\010B\003\340A\001\022U\n" - + "\027custom_placement_config\030\032 " - + "\001(\0132/.google.storage.v2.Bucket.CustomPlacementConfigB\003\340A\001\022;\n" - + "\tautoclass\030\034 \001(\0132#.g" - + "oogle.storage.v2.Bucket.AutoclassB\003\340A\001\022T\n" - + "\026hierarchical_namespace\030 \001(\0132/.google." - + "storage.v2.Bucket.HierarchicalNamespaceB\003\340A\001\022K\n" - + "\022soft_delete_policy\030\037 \001(\0132*.googl" - + "e.storage.v2.Bucket.SoftDeletePolicyB\003\340A\001\022H\n" - + "\020object_retention\030!" - + " \001(\0132).google.storage.v2.Bucket.ObjectRetentionB\003\340A\001\022?\n" + + "\027custom_placement_config\030\032" + + " \001(\0132/.google.storage.v2.Bucket.CustomPlacementConfigB\003\340A\001\022;\n" + + "\tautoclass\030\034" + + " \001(\0132#.google.storage.v2.Bucket.AutoclassB\003\340A\001\022T\n" + + "\026hierarchical_namespace\030 \001" + + "(\0132/.google.storage.v2.Bucket.HierarchicalNamespaceB\003\340A\001\022K\n" + + "\022soft_delete_policy\030\037" + + " \001(\0132*.google.storage.v2.Bucket.SoftDeletePolicyB\003\340A\001\022H\n" + + "\020object_retention\030! \001(\0132" + + ").google.storage.v2.Bucket.ObjectRetentionB\003\340A\001\022?\n" + "\tip_filter\030&" + " \001(\0132\".google.storage.v2.Bucket.IpFilterB\003\340A\001H\000\210\001\001\032&\n" + "\007Billing\022\033\n" + "\016requester_pays\030\001 \001(\010B\003\340A\001\032l\n" - + "\004Cors\022\023\n" + + "\004Cors", + "\022\023\n" + "\006origin\030\001 \003(\tB\003\340A\001\022\023\n" + "\006method\030\002 \003(\tB\003\340A\001\022\034\n" + "\017response_header\030\003 \003(\tB\003\340A\001\022\034\n" @@ -902,15 +908,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "Encryption\022B\n" + "\017default_kms_key\030\001 \001(\tB)\340A\001\372A#\n" + "!cloudkms.googleapis.com/CryptoKey\022\215\001\n" - + ",google_managed_encrypt", - "ion_enforcement_config\030\002 \001(\0132M.google.storage.v2.Bucket.Encryption.GoogleManaged" - + "EncryptionEnforcementConfigB\003\340A\001H\000\210\001\001\022\221\001\n" - + ".customer_managed_encryption_enforcement_config\030\003" - + " \001(\0132O.google.storage.v2.Bucke" - + "t.Encryption.CustomerManagedEncryptionEnforcementConfigB\003\340A\001H\001\210\001\001\022\223\001\n" - + "/customer_supplied_encryption_enforcement_config\030\004 " - + "\001(\0132P.google.storage.v2.Bucket.Encryptio" - + "n.CustomerSuppliedEncryptionEnforcementConfigB\003\340A\001H\002\210\001\001\032\252\001\n" + + ",google_managed_encryption_enforcement_config\030\002 \001(\013" + + "2M.google.storage.v2.Bucket.Encryption.G" + + "oogleManagedEncryptionEnforcementConfigB\003\340A\001H\000\210\001\001\022\221\001\n" + + ".customer_managed_encryption_enforcement_config\030\003 \001(\0132O.google.stor" + + "age.v2.Bucket.Encryption.CustomerManaged" + + "EncryptionEnforcementConfigB\003\340A\001H\001\210\001\001\022\223\001\n" + + "/customer_supplied_encryption_enforcement_config\030\004" + + " \001(\0132P.google.storage.v2.Buck" + + "et.Encryption.CustomerSuppliedEncryptionEnforcementConfigB\003\340A\001H\002\210\001\001\032\252\001\n" + "(GoogleManagedEncryptionEnforcementConfig\022\035\n" + "\020restriction_mode\030\003 \001(\tH\000\210\001\001\0227\n" + "\016effective_time\030\002" @@ -933,21 +939,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "/_customer_managed_encryption_enforcement_configB2\n" + "0_customer_supplied_encryption_enforcement_config\032\200\002\n" + "\tIamConfig\022f\n" - + "\033uniform_bucket_level_access\030\001 \001(\0132<.google.storage." - + "v2.Bucket.IamConfig.UniformBucketLevelAccessB\003\340A\001\022%\n" + + "\033uniform_bucket_level_access\030\001 \001(\0132<.goo" + + "gle.storage.v2.Bucket.IamConfig.UniformBucketLevelAccessB\003\340A\001\022%\n" + "\030public_access_prevention\030\003 \001(\tB\003\340A\001\032d\n" + "\030UniformBucketLevelAccess\022\024\n" + "\007enabled\030\001 \001(\010B\003\340A\001\0222\n" + "\tlock_time\030\002" + " \001(\0132\032.google.protobuf.TimestampB\003\340A\001\032\252\006\n" + "\tLifecycle\022;\n" - + "\004rule\030\001" - + " \003(\0132(.google.storage.v2.Bucket.Lifecycle.RuleB\003\340A\001\032\337\005\n" + + "\004rule\030\001 \003(\0132(.google." + + "storage.v2.Bucket.Lifecycle.RuleB\003\340A\001\032\337\005\n" + "\004Rule\022D\n" + "\006action\030\001" + " \001(\0132/.google.storage.v2.Bucket.Lifecycle.Rule.ActionB\003\340A\001\022J\n" - + "\tcondition\030\002 " - + "\001(\01322.google.storage.v2.Bucket.Lifecycle.Rule.ConditionB\003\340A\001\0327\n" + + "\tcondition\030\002" + + " \001(\01322.google.storage.v2.Bucket.Lifecycle.Rule.ConditionB\003\340A\001\0327\n" + "\006Action\022\021\n" + "\004type\030\001 \001(\tB\003\340A\001\022\032\n\r" + "storage_class\030\002 \001(\tB\003\340A\001\032\213\004\n" @@ -998,14 +1004,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\007enabled\030\001 \001(\010B\003\340A\001\0224\n" + "\013toggle_time\030\002 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\022#\n" + "\026terminal_storage_class\030\003 \001(\tH\000\210\001\001\022P\n" - + "\"terminal_storage_class_update_time\030\004" - + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003H\001\210\001\001B\031\n" + + "\"terminal_storage_class_update_time\030\004 \001(\013" + + "2\032.google.protobuf.TimestampB\003\340A\003H\001\210\001\001B\031\n" + "\027_terminal_storage_classB%\n" + "#_terminal_storage_class_update_time\032\375\003\n" + "\010IpFilter\022\021\n" + "\004mode\030\001 \001(\tH\000\210\001\001\022Z\n" - + "\025public_network_source\030\002 \001(\01326.go" - + "ogle.storage.v2.Bucket.IpFilter.PublicNetworkSourceH\001\210\001\001\022U\n" + + "\025public_network_source\030\002" + + " \001(\01326.google.storage.v2.Bucket.IpFilter.PublicNetworkSourceH\001\210\001\001\022U\n" + "\023vpc_network_sources\030\003" + " \003(\01323.google.storage.v2.Bucket.IpFilter.VpcNetworkSourceB\003\340A\001\022!\n" + "\024allow_cross_org_vpcs\030\004 \001(\010B\003\340A\001\022+\n" @@ -1024,8 +1030,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\013LabelsEntry\022\013\n" + "\003key\030\001 \001(\t\022\r\n" + "\005value\030\002 \001(\t:\0028\001:X\352AU\n" - + "\035storage.googlea" - + "pis.com/Bucket\022#projects/{project}/buckets/{bucket}*\007buckets2\006bucketB\014\n\n" + + "\035storage.googleapis.com/Bucket\022#projects/{pr" + + "oject}/buckets/{bucket}*\007buckets2\006bucketB\014\n\n" + "_ip_filter\"\366\001\n" + "\023BucketAccessControl\022\021\n" + "\004role\030\001 \001(\tB\003\340A\001\022\017\n" @@ -1052,8 +1058,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\013update_time\030\003" + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003\"\262\001\n" + "\016ObjectContexts\022B\n" - + "\006custom\030\001 \003(\0132-.goo" - + "gle.storage.v2.ObjectContexts.CustomEntryB\003\340A\001\032\\\n" + + "\006custom\030\001" + + " \003(\0132-.google.storage.v2.ObjectContexts.CustomEntryB\003\340A\001\032\\\n" + "\013CustomEntry\022\013\n" + "\003key\030\001 \001(\t\022<\n" + "\005value\030\002" @@ -1066,8 +1072,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\006bucket\030\002 \001(\tB%\340A\005\372A\037\n" + "\035storage.googleapis.com/Bucket\022\021\n" + "\004etag\030\033 \001(\tB\003\340A\001\022\027\n\n" - + "generation\030\003 \001(\003B\003\340A\005\022\037\n" - + "\r" + + "generation\030\003 \001(\003B\003\340A\005\022\037\n\r" + "restore_token\030# \001(\tB\003\340A\003H\000\210\001\001\022\033\n" + "\016metageneration\030\004 \001(\003B\003\340A\003\022\032\n\r" + "storage_class\030\005 \001(\tB\003\340A\001\022\021\n" @@ -1096,8 +1101,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\016temporary_hold\030\024 \001(\010B\003\340A\001\022>\n" + "\025retention_expire_time\030\025" + " \001(\0132\032.google.protobuf.TimestampB\003\340A\001\022>\n" - + "\010metadata\030\026" - + " \003(\0132\'.google.storage.v2.Object.MetadataEntryB\003\340A\001\0228\n" + + "\010metadata\030\026 \003(\0132\'.goo" + + "gle.storage.v2.Object.MetadataEntryB\003\340A\001\0228\n" + "\010contexts\030& \001(\0132!.google.storage.v2.ObjectContextsB\003\340A\001\022\035\n" + "\020event_based_hold\030\027 \001(\010H\001\210\001\001\022,\n" + "\005owner\030\030 \001(\0132\030.google.storage.v2.OwnerB\003\340A\003\022G\n" @@ -1108,11 +1113,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003H\002\210\001\001\022>\n" + "\020hard_delete_time\030\035" + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003H\003\210\001\001\022;\n" - + "\tretention\030\036 \001(\0132#." - + "google.storage.v2.Object.RetentionB\003\340A\001\032\274\001\n" + + "\tretention\030\036" + + " \001(\0132#.google.storage.v2.Object.RetentionB\003\340A\001\032\274\001\n" + "\tRetention\022;\n" - + "\004mode\030\001" - + " \001(\0162(.google.storage.v2.Object.Retention.ModeB\003\340A\001\022:\n" + + "\004mode\030\001 \001(\0162" + + "(.google.storage.v2.Object.Retention.ModeB\003\340A\001\022:\n" + "\021retain_until_time\030\002" + " \001(\0132\032.google.protobuf.TimestampB\003\340A\001\"6\n" + "\004Mode\022\024\n" @@ -1152,96 +1157,98 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\003end\030\002 \001(\003\022\027\n" + "\017complete_length\030\003 \001(\0032\237\037\n" + "\007Storage\022r\n" - + "\014DeleteBucket\022&.google.storage.v2.Delete" - + "BucketRequest\032\026.google.protobuf.Empty\"\"\332A\004name\212\323\344\223\002\025\022\023\n" + + "\014DeleteBucket\022&.google.stora" + + "ge.v2.DeleteBucketRequest\032\026.google.protobuf.Empty\"\"\332A\004name\212\323\344\223\002\025\022\023\n" + "\004name\022\013{bucket=**}\022o\n" - + "\tGetBucket\022#.google.storage.v2.GetBucketRequ" - + "est\032\031.google.storage.v2.Bucket\"\"\332A\004name\212\323\344\223\002\025\022\023\n" + + "\tGetBucket\022#.google.storage.v2.G" + + "etBucketRequest\032\031.google.storage.v2.Bucket\"\"\332A\004name\212\323\344\223\002\025\022\023\n" + "\004name\022\013{bucket=**}\022\253\001\n" - + "\014CreateBucket\022&.google.storage.v2.CreateBucketRequ" - + "est\032\031.google.storage.v2.Bucket\"X\332A\027parent,bucket,bucket_id\212\323\344\223\0028\022\026\n" + + "\014CreateBucket\022&.google.storage.v2.Crea" + + "teBucketRequest\032\031.google.storage.v2.Bucket\"X\332A\027parent,bucket,bucket_id\212\323\344\223\0028\022\026\n" + "\006parent\022\014{project=**}\022\036\n" + "\016bucket.project\022\014{project=**}\022\205\001\n" - + "\013ListBuckets\022%.google.storage.v2.Lis" - + "tBucketsRequest\032&.google.storage.v2.ListBucketsResponse\"\'\332A\006parent\212\323\344\223\002\030\022\026\n" + + "\013ListBuckets\022%.google.storage.v2.ListBucketsRequest\032&.google.sto" + + "rage.v2.ListBucketsResponse\"\'\332A\006parent\212\323\344\223\002\030\022\026\n" + "\006parent\022\014{project=**}\022\223\001\n" - + "\031LockBucketRetentionPolicy\0223.google.storage.v2.LockBucketRet" - + "entionPolicyRequest\032\031.google.storage.v2.Bucket\"&\332A\006bucket\212\323\344\223\002\027\022\025\n" + + "\031LockBucketRetentionPolicy\0223.google.storage.v2.L" + + "ockBucketRetentionPolicyRequest\032\031.google.storage.v2.Bucket\"&\332A\006bucket\212\323\344\223\002\027\022\025\n" + "\006bucket\022\013{bucket=**}\022\243\001\n" - + "\014GetIamPolicy\022\".google.iam.v1." - + "GetIamPolicyRequest\032\025.google.iam.v1.Policy\"X\332A\010resource\212\323\344\223\002G\022\027\n" + + "\014GetIamPolicy\022\".go" + + "ogle.iam.v1.GetIamPolicyRequest\032\025.google.iam.v1.Policy\"X\332A\010resource\212\323\344\223\002G\022\027\n" + "\010resource\022\013{bucket=**}\022,\n" + "\010resource\022 {bucket=projects/*/buckets/*}/**\022\252\001\n" - + "\014SetIamPolicy\022\".google.i" - + "am.v1.SetIamPolicyRequest\032\025.google.iam.v1.Policy\"_\332A\017resource,policy\212\323\344\223\002G\022\027\n" + + "\014SetIamPolicy\022\".google.iam.v1.SetIamPolicyRequest\032\025." + + "google.iam.v1.Policy\"_\332A\017resource,policy\212\323\344\223\002G\022\027\n" + "\010resource\022\013{bucket=**}\022,\n" + "\010resource\022 {bucket=projects/*/buckets/*}/**\022\226\002\n" - + "\022TestIamPermissions\022(.google.iam.v1.TestIamPermissi" - + "onsRequest\032).google.iam.v1.TestIamPermis" - + "sionsResponse\"\252\001\332A\024resource,permissions\212\323\344\223\002\214\001\022\027\n" + + "\022TestIamPermissions\022(.google.iam.v1.Tes" + + "tIamPermissionsRequest\032).google.iam.v1.T" + + "estIamPermissionsResponse\"\252\001\332A\024resource,permissions\212\323\344\223\002\214\001\022\027\n" + "\010resource\022\013{bucket=**}\0224\n" + "\010resource\022({bucket=projects/*/buckets/*}/objects/**\022;\n" + "\010resource\022/{bucket=projects/*/buckets/*}/managedFolders/**\022\212\001\n" - + "\014UpdateBucket\022&.google.storage.v2.UpdateBucketRequ" - + "est\032\031.google.storage.v2.Bucket\"7\332A\022bucket,update_mask\212\323\344\223\002\034\022\032\n" + + "\014UpdateBucket\022&.google.storage.v2.Upda" + + "teBucketRequest\032\031.google.storage.v2.Bucket\"7\332A\022bucket,update_mask\212\323\344\223\002\034\022\032\n" + "\013bucket.name\022\013{bucket=**}\022~\n\r" - + "ComposeObject\022\'.google.storag" - + "e.v2.ComposeObjectRequest\032\031.google.storage.v2.Object\")\212\323\344\223\002#\022!\n" + + "ComposeObject\022\'.g" + + "oogle.storage.v2.ComposeObjectRequest\032\031.google.storage.v2.Object\")\212\323\344\223\002#\022!\n" + "\022destination.bucket\022\013{bucket=**}\022\230\001\n" - + "\014DeleteObject\022&.googl" - + "e.storage.v2.DeleteObjectRequest\032\026.google.protobuf.Empty\"H\332A\r" + + "\014DeleteOb" + + "ject\022&.google.storage.v2.DeleteObjectRequest\032\026.google.protobuf.Empty\"H\332A\r" + "bucket,object\332A\030bucket,object,generation\212\323\344\223\002\027\022\025\n" + "\006bucket\022\013{bucket=**}\022\215\001\n\r" - + "RestoreObject\022\'.google.storage.v2.RestoreObjectRequest\032\031.google.s" - + "torage.v2.Object\"8\332A\030bucket,object,generation\212\323\344\223\002\027\022\025\n" + + "RestoreObject\022\'.google.storage.v2.RestoreObjectReques" + + "t\032\031.google.storage.v2.Object\"8\332A\030bucket,object,generation\212\323\344\223\002\027\022\025\n" + "\006bucket\022\013{bucket=**}\022\272\001\n" - + "\024CancelResumableWrite\022..google.storage.v2." - + "CancelResumableWriteRequest\032/.google.sto" - + "rage.v2.CancelResumableWriteResponse\"A\332A\tupload_id\212\323\344\223\002/\022-\n" + + "\024CancelResumableWrite\022..google.storage.v2.CancelResumableWriteRequest\032" + + "/.google.storage.v2.CancelResumableWriteResponse\"A\332A" + + "\tupload_id\212\323\344\223\002/\022-\n" + "\tupload_id\022 {bucket=projects/*/buckets/*}/**\022\225\001\n" - + "\tGetObject\022#." - + "google.storage.v2.GetObjectRequest\032\031.google.storage.v2.Object\"H\332A\r" + + "\tGetObject\022#.google.storage.v2.GetObjectRequest\032\031.google.storage.v2.Object\"H\332A\r" + "bucket,object\332A\030bucket,object,generation\212\323\344\223\002\027\022\025\n" + "\006bucket\022\013{bucket=**}\022\245\001\n\n" - + "ReadObject\022$.google." - + "storage.v2.ReadObjectRequest\032%.google.storage.v2.ReadObjectResponse\"H\332A\r" + + "ReadObject\022$.google.storage.v2.ReadObjectRequest" + + "\032%.google.storage.v2.ReadObjectResponse\"H\332A\r" + "bucket,object\332A\030bucket,object,generation\212\323\344\223\002\027\022\025\n" + "\006bucket\022\013{bucket=**}0\001\022\231\001\n" - + "\016BidiReadObject\022(.google.storage.v2.BidiReadObjectReq" - + "uest\032).google.storage.v2.BidiReadObjectResponse\".\212\323\344\223\002(\022&\n" + + "\016BidiReadObject\022(.google.storage.v2.BidiR" + + "eadObjectRequest\032).google.storage.v2.BidiReadObjectResponse\".\212\323\344\223\002(\022&\n" + "\027read_object_spec.bucket\022\013{bucket=**}(\0010\001\022\214\001\n" - + "\014UpdateObject\022&.google.storage.v2.UpdateObjectRequest\032\031.g" - + "oogle.storage.v2.Object\"9\332A\022object,update_mask\212\323\344\223\002\036\022\034\n\r" + + "\014UpdateObject\022&.google.storage.v2.UpdateObjec" + + "tRequest\032\031.google.storage.v2.Object\"9\332A\022object,update_mask\212\323\344\223\002\036\022\034\n\r" + "object.bucket\022\013{bucket=**}\022`\n" - + "\013WriteObject\022%.google.storage.v2.Wr" - + "iteObjectRequest\032&.google.storage.v2.WriteObjectResponse\"\000(\001\022n\n" - + "\017BidiWriteObject\022).google.storage.v2.BidiWriteObjectReque" - + "st\032*.google.storage.v2.BidiWriteObjectResponse\"\000(\0010\001\022\204\001\n" - + "\013ListObjects\022%.google.storage.v2.ListObjectsRequest\032&.google.sto" - + "rage.v2.ListObjectsResponse\"&\332A\006parent\212\323\344\223\002\027\022\025\n" + + "\013WriteObject\022%.google.s" + + "torage.v2.WriteObjectRequest\032&.google.storage.v2.WriteObjectResponse\"\000(\001\022n\n" + + "\017BidiWriteObject\022).google.storage.v2.BidiWrit" + + "eObjectRequest\032*.google.storage.v2.BidiWriteObjectResponse\"\000(\0010\001\022\204\001\n" + + "\013ListObjects\022%.google.storage.v2.ListObjectsRequest\032" + + "&.google.storage.v2.ListObjectsResponse\"&\332A\006parent\212\323\344\223\002\027\022\025\n" + "\006parent\022\013{bucket=**}\022\230\001\n\r" - + "RewriteObject\022\'.google.storage.v2.RewriteObjectR" - + "equest\032\".google.storage.v2.RewriteResponse\":\212\323\344\223\0024\022\017\n\r" + + "RewriteObject\022\'.google.storage.v2.Re" + + "writeObjectRequest\032\".google.storage.v2.RewriteResponse\":\212\323\344\223\0024\022\017\n\r" + "source_bucket\022!\n" + "\022destination_bucket\022\013{bucket=**}\022\256\001\n" - + "\023StartResumableWrite\022-.google.storage.v2.StartResumabl" - + "eWriteRequest\032..google.storage.v2.StartResumableWriteResponse\"8\212\323\344\223\0022\0220\n" + + "\023StartResumableWrite\022-.google.storage.v2.S" + + "tartResumableWriteRequest\032..google.stora" + + "ge.v2.StartResumableWriteResponse\"8\212\323\344\223\0022\0220\n" + "!write_object_spec.resource.bucket\022\013{bucket=**}\022\256\001\n" - + "\020QueryWriteStatus\022*.google.storage.v2" - + ".QueryWriteStatusRequest\032+.google.storage.v2.QueryWriteStatusResponse\"A\332A" + + "\020QueryWriteStatus\022*.google.storage.v2.QueryWriteStatusRequest\032+.g" + + "oogle.storage.v2.QueryWriteStatusResponse\"A\332A" + "\tupload_id\212\323\344\223\002/\022-\n" + "\tupload_id\022 {bucket=projects/*/buckets/*}/**\022\226\001\n\n" - + "MoveObject\022$.google.storage.v2.MoveObjectRequest\032\031.google.s" - + "torage.v2.Object\"G\332A\'bucket,source_object,destination_object\212\323\344\223\002\027\022\025\n" - + "\006bucket\022\013{bucket=**}\032\247\002\312A\026storage.googleapis.com\322A\212" - + "\002https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/" - + "cloud-platform.read-only,https://www.googleapis.com/auth/devstorage.full_control" - + ",https://www.googleapis.com/auth/devstor" - + "age.read_only,https://www.googleapis.com/auth/devstorage.read_writeB\342\001\n" - + "\025com.google.storage.v2B\014StorageProtoP\001Z>cloud.goo" - + "gle.com/go/storage/internal/apiv2/storagepb;storagepb\352Ax\n" - + "!cloudkms.googleapis.com/CryptoKey\022Sprojects/{project}/location" - + "s/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}b\006proto3" + + "MoveObject\022$.google.storage.v2.MoveObjectReques" + + "t\032\031.google.storage.v2.Object\"G\332A\'bucket," + + "source_object,destination_object\212\323\344\223\002\027\022\025\n" + + "\006bucket\022\013{bucket=**}\032\247\002\312A\026storage.googl" + + "eapis.com\322A\212\002https://www.googleapis.com/" + + "auth/cloud-platform,https://www.googleapis.com/auth/cloud-platform.read-only,htt" + + "ps://www.googleapis.com/auth/devstorage.full_control,https://www.googleapis.com/" + + "auth/devstorage.read_only,https://www.go" + + "ogleapis.com/auth/devstorage.read_writeB\342\001\n" + + "\025com.google.storage.v2B\014StorageProtoP" + + "\001Z>cloud.google.com/go/storage/internal/apiv2/storagepb;storagepb\352Ax\n" + + "!cloudkms.googleapis.com/CryptoKey\022Sprojects/{proje" + + "ct}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -1583,7 +1590,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_storage_v2_WriteObjectResponse_descriptor, new java.lang.String[] { - "PersistedSize", "Resource", "WriteStatus", + "PersistedSize", "Resource", "PersistedDataChecksums", "WriteStatus", }); internal_static_google_storage_v2_AppendObjectSpec_descriptor = getDescriptor().getMessageType(29); @@ -1624,7 +1631,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_storage_v2_BidiWriteObjectResponse_descriptor, new java.lang.String[] { - "PersistedSize", "Resource", "WriteHandle", "WriteStatus", + "PersistedSize", "Resource", "PersistedDataChecksums", "WriteHandle", "WriteStatus", }); internal_static_google_storage_v2_ListObjectsRequest_descriptor = getDescriptor().getMessageType(32); @@ -1661,7 +1668,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_storage_v2_QueryWriteStatusResponse_descriptor, new java.lang.String[] { - "PersistedSize", "Resource", "WriteStatus", + "PersistedSize", "Resource", "PersistedDataChecksums", "WriteStatus", }); internal_static_google_storage_v2_RewriteObjectRequest_descriptor = getDescriptor().getMessageType(35); diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectResponse.java b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectResponse.java index 6e3e5946a013..7f642ce61553 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectResponse.java +++ b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectResponse.java @@ -69,6 +69,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.storage.v2.WriteObjectResponse.Builder.class); } + private int bitField0_; private int writeStatusCase_ = 0; @SuppressWarnings("serial") @@ -215,6 +216,59 @@ public com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder() { return com.google.storage.v2.Object.getDefaultInstance(); } + public static final int PERSISTED_DATA_CHECKSUMS_FIELD_NUMBER = 3; + private com.google.storage.v2.ObjectChecksums persistedDataChecksums_; + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return Whether the persistedDataChecksums field is set. + */ + @java.lang.Override + public boolean hasPersistedDataChecksums() { + return ((bitField0_ & 0x00000001) != 0); + } + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return The persistedDataChecksums. + */ + @java.lang.Override + public com.google.storage.v2.ObjectChecksums getPersistedDataChecksums() { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + @java.lang.Override + public com.google.storage.v2.ObjectChecksumsOrBuilder getPersistedDataChecksumsOrBuilder() { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -235,6 +289,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (writeStatusCase_ == 2) { output.writeMessage(2, (com.google.storage.v2.Object) writeStatus_); } + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(3, getPersistedDataChecksums()); + } getUnknownFields().writeTo(output); } @@ -254,6 +311,10 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, (com.google.storage.v2.Object) writeStatus_); } + if (((bitField0_ & 0x00000001) != 0)) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize(3, getPersistedDataChecksums()); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -270,6 +331,10 @@ public boolean equals(final java.lang.Object obj) { com.google.storage.v2.WriteObjectResponse other = (com.google.storage.v2.WriteObjectResponse) obj; + if (hasPersistedDataChecksums() != other.hasPersistedDataChecksums()) return false; + if (hasPersistedDataChecksums()) { + if (!getPersistedDataChecksums().equals(other.getPersistedDataChecksums())) return false; + } if (!getWriteStatusCase().equals(other.getWriteStatusCase())) return false; switch (writeStatusCase_) { case 1: @@ -292,6 +357,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (hasPersistedDataChecksums()) { + hash = (37 * hash) + PERSISTED_DATA_CHECKSUMS_FIELD_NUMBER; + hash = (53 * hash) + getPersistedDataChecksums().hashCode(); + } switch (writeStatusCase_) { case 1: hash = (37 * hash) + PERSISTED_SIZE_FIELD_NUMBER; @@ -435,10 +504,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.storage.v2.WriteObjectResponse.newBuilder() - private Builder() {} + private Builder() { + maybeForceBuilderInitialization(); + } private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); + maybeForceBuilderInitialization(); + } + + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + internalGetPersistedDataChecksumsFieldBuilder(); + } } @java.lang.Override @@ -448,6 +526,11 @@ public Builder clear() { if (resourceBuilder_ != null) { resourceBuilder_.clear(); } + persistedDataChecksums_ = null; + if (persistedDataChecksumsBuilder_ != null) { + persistedDataChecksumsBuilder_.dispose(); + persistedDataChecksumsBuilder_ = null; + } writeStatusCase_ = 0; writeStatus_ = null; return this; @@ -487,6 +570,15 @@ public com.google.storage.v2.WriteObjectResponse buildPartial() { private void buildPartial0(com.google.storage.v2.WriteObjectResponse result) { int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000004) != 0)) { + result.persistedDataChecksums_ = + persistedDataChecksumsBuilder_ == null + ? persistedDataChecksums_ + : persistedDataChecksumsBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + result.bitField0_ |= to_bitField0_; } private void buildPartialOneofs(com.google.storage.v2.WriteObjectResponse result) { @@ -509,6 +601,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.storage.v2.WriteObjectResponse other) { if (other == com.google.storage.v2.WriteObjectResponse.getDefaultInstance()) return this; + if (other.hasPersistedDataChecksums()) { + mergePersistedDataChecksums(other.getPersistedDataChecksums()); + } switch (other.getWriteStatusCase()) { case PERSISTED_SIZE: { @@ -564,6 +659,14 @@ public Builder mergeFrom( writeStatusCase_ = 2; break; } // case 18 + case 26: + { + input.readMessage( + internalGetPersistedDataChecksumsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000004; + break; + } // case 26 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -897,6 +1000,202 @@ public com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder() { return resourceBuilder_; } + private com.google.storage.v2.ObjectChecksums persistedDataChecksums_; + private com.google.protobuf.SingleFieldBuilder< + com.google.storage.v2.ObjectChecksums, + com.google.storage.v2.ObjectChecksums.Builder, + com.google.storage.v2.ObjectChecksumsOrBuilder> + persistedDataChecksumsBuilder_; + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return Whether the persistedDataChecksums field is set. + */ + public boolean hasPersistedDataChecksums() { + return ((bitField0_ & 0x00000004) != 0); + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return The persistedDataChecksums. + */ + public com.google.storage.v2.ObjectChecksums getPersistedDataChecksums() { + if (persistedDataChecksumsBuilder_ == null) { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } else { + return persistedDataChecksumsBuilder_.getMessage(); + } + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public Builder setPersistedDataChecksums(com.google.storage.v2.ObjectChecksums value) { + if (persistedDataChecksumsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + persistedDataChecksums_ = value; + } else { + persistedDataChecksumsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public Builder setPersistedDataChecksums( + com.google.storage.v2.ObjectChecksums.Builder builderForValue) { + if (persistedDataChecksumsBuilder_ == null) { + persistedDataChecksums_ = builderForValue.build(); + } else { + persistedDataChecksumsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public Builder mergePersistedDataChecksums(com.google.storage.v2.ObjectChecksums value) { + if (persistedDataChecksumsBuilder_ == null) { + if (((bitField0_ & 0x00000004) != 0) + && persistedDataChecksums_ != null + && persistedDataChecksums_ + != com.google.storage.v2.ObjectChecksums.getDefaultInstance()) { + getPersistedDataChecksumsBuilder().mergeFrom(value); + } else { + persistedDataChecksums_ = value; + } + } else { + persistedDataChecksumsBuilder_.mergeFrom(value); + } + if (persistedDataChecksums_ != null) { + bitField0_ |= 0x00000004; + onChanged(); + } + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public Builder clearPersistedDataChecksums() { + bitField0_ = (bitField0_ & ~0x00000004); + persistedDataChecksums_ = null; + if (persistedDataChecksumsBuilder_ != null) { + persistedDataChecksumsBuilder_.dispose(); + persistedDataChecksumsBuilder_ = null; + } + onChanged(); + return this; + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public com.google.storage.v2.ObjectChecksums.Builder getPersistedDataChecksumsBuilder() { + bitField0_ |= 0x00000004; + onChanged(); + return internalGetPersistedDataChecksumsFieldBuilder().getBuilder(); + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + public com.google.storage.v2.ObjectChecksumsOrBuilder getPersistedDataChecksumsOrBuilder() { + if (persistedDataChecksumsBuilder_ != null) { + return persistedDataChecksumsBuilder_.getMessageOrBuilder(); + } else { + return persistedDataChecksums_ == null + ? com.google.storage.v2.ObjectChecksums.getDefaultInstance() + : persistedDataChecksums_; + } + } + + /** + * + * + *
+     * If persisted_size is set, contains checksums of persisted data.
+     * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + private com.google.protobuf.SingleFieldBuilder< + com.google.storage.v2.ObjectChecksums, + com.google.storage.v2.ObjectChecksums.Builder, + com.google.storage.v2.ObjectChecksumsOrBuilder> + internalGetPersistedDataChecksumsFieldBuilder() { + if (persistedDataChecksumsBuilder_ == null) { + persistedDataChecksumsBuilder_ = + new com.google.protobuf.SingleFieldBuilder< + com.google.storage.v2.ObjectChecksums, + com.google.storage.v2.ObjectChecksums.Builder, + com.google.storage.v2.ObjectChecksumsOrBuilder>( + getPersistedDataChecksums(), getParentForChildren(), isClean()); + persistedDataChecksums_ = null; + } + return persistedDataChecksumsBuilder_; + } + // @@protoc_insertion_point(builder_scope:google.storage.v2.WriteObjectResponse) } diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectResponseOrBuilder.java b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectResponseOrBuilder.java index 97841575ba77..d220df825f75 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectResponseOrBuilder.java +++ b/java-storage/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectResponseOrBuilder.java @@ -94,5 +94,42 @@ public interface WriteObjectResponseOrBuilder */ com.google.storage.v2.ObjectOrBuilder getResourceOrBuilder(); + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return Whether the persistedDataChecksums field is set. + */ + boolean hasPersistedDataChecksums(); + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + * + * @return The persistedDataChecksums. + */ + com.google.storage.v2.ObjectChecksums getPersistedDataChecksums(); + + /** + * + * + *
+   * If persisted_size is set, contains checksums of persisted data.
+   * 
+ * + * .google.storage.v2.ObjectChecksums persisted_data_checksums = 3; + */ + com.google.storage.v2.ObjectChecksumsOrBuilder getPersistedDataChecksumsOrBuilder(); + com.google.storage.v2.WriteObjectResponse.WriteStatusCase getWriteStatusCase(); } diff --git a/java-storage/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto b/java-storage/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto index d16c0f91d868..f56e4f3e0a07 100644 --- a/java-storage/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto +++ b/java-storage/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto @@ -1461,6 +1461,9 @@ message WriteObjectResponse { // the upload has finalized. Object resource = 2; } + + // If persisted_size is set, contains checksums of persisted data. + ObjectChecksums persisted_data_checksums = 3; } // Describes an attempt to append to an object, possibly over multiple requests. @@ -1543,9 +1546,9 @@ message BidiWriteObjectRequest { } // Optional. Checksums for the complete object. If the checksums computed by - // the service don't match the specified checksums the call fails. Might only - // be provided in the first request or the last request (with finish_write - // set). + // the service don't match the specified checksums the call fails. May be + // provided in the last request (with finish_write set). For non-appendable + // objects only, may also be provided in the first request. ObjectChecksums object_checksums = 6 [(google.api.field_behavior) = OPTIONAL]; // Optional. For each `BidiWriteObjectRequest` where `state_lookup` is `true` @@ -1593,6 +1596,9 @@ message BidiWriteObjectResponse { Object resource = 2; } + // If persisted_size is set, contains checksums of persisted data. + ObjectChecksums persisted_data_checksums = 4; + // An optional write handle that is returned periodically in response // messages. Clients should save it for later use in establishing a new stream // if a connection is interrupted. @@ -1704,6 +1710,9 @@ message QueryWriteStatusResponse { // the upload has finalized. Object resource = 2; } + + // If persisted_size is set, contains checksums of persisted data. + ObjectChecksums persisted_data_checksums = 3; } // Request message for [RewriteObject][google.storage.v2.Storage.RewriteObject]. diff --git a/java-translate/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceClient.java b/java-translate/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceClient.java index 56d6561e2887..7e7757a5b479 100644 --- a/java-translate/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceClient.java +++ b/java-translate/google-cloud-translate/src/main/java/com/google/cloud/translate/v3/TranslationServiceClient.java @@ -4699,6 +4699,7 @@ public final AdaptiveMtTranslateResponse adaptiveMtTranslate( * .setDataset( * AdaptiveMtDatasetName.of("[PROJECT]", "[LOCATION]", "[DATASET]").toString()) * .addAllContent(new ArrayList()) + * .setMimeType("mimeType-1392120434") * .setReferenceSentenceConfig( * AdaptiveMtTranslateRequest.ReferenceSentenceConfig.newBuilder().build()) * .setGlossaryConfig(AdaptiveMtTranslateRequest.GlossaryConfig.newBuilder().build()) @@ -4733,6 +4734,7 @@ public final AdaptiveMtTranslateResponse adaptiveMtTranslate(AdaptiveMtTranslate * .setDataset( * AdaptiveMtDatasetName.of("[PROJECT]", "[LOCATION]", "[DATASET]").toString()) * .addAllContent(new ArrayList()) + * .setMimeType("mimeType-1392120434") * .setReferenceSentenceConfig( * AdaptiveMtTranslateRequest.ReferenceSentenceConfig.newBuilder().build()) * .setGlossaryConfig(AdaptiveMtTranslateRequest.GlossaryConfig.newBuilder().build()) diff --git a/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtProto.java b/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtProto.java index eebff60fae56..71a8c209509d 100644 --- a/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtProto.java +++ b/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtProto.java @@ -141,128 +141,146 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { - "\n+google/cloud/translate/v3/adaptive_mt." + "\n" + + "+google/cloud/translate/v3/adaptive_mt." + "proto\022\033google.cloud.translation.v3\032\037goog" + "le/api/field_behavior.proto\032\031google/api/" + "resource.proto\032&google/cloud/translate/v" - + "3/common.proto\032\037google/protobuf/timestam" - + "p.proto\"\241\003\n\021AdaptiveMtDataset\022@\n\004name\030\001 " - + "\001(\tB2\340A\002\372A,\n*translate.googleapis.com/Ad" - + "aptiveMtDataset\022\024\n\014display_name\030\002 \001(\t\022\034\n" - + "\024source_language_code\030\003 \001(\t\022\034\n\024target_la" - + "nguage_code\030\004 \001(\t\022\025\n\rexample_count\030\005 \001(\005" - + "\0224\n\013create_time\030\t \001(\0132\032.google.protobuf." - + "TimestampB\003\340A\003\0224\n\013update_time\030\n \001(\0132\032.go" - + "ogle.protobuf.TimestampB\003\340A\003:u\352Ar\n*trans" - + "late.googleapis.com/AdaptiveMtDataset\022Dp" - + "rojects/{project}/locations/{location}/a" - + "daptiveMtDatasets/{dataset}\"\255\001\n\036CreateAd" - + "aptiveMtDatasetRequest\0229\n\006parent\030\001 \001(\tB)" - + "\340A\002\372A#\n!locations.googleapis.com/Locatio" - + "n\022P\n\023adaptive_mt_dataset\030\002 \001(\0132..google." - + "cloud.translation.v3.AdaptiveMtDatasetB\003" - + "\340A\002\"b\n\036DeleteAdaptiveMtDatasetRequest\022@\n" - + "\004name\030\001 \001(\tB2\340A\002\372A,\n*translate.googleapi" - + "s.com/AdaptiveMtDataset\"_\n\033GetAdaptiveMt" - + "DatasetRequest\022@\n\004name\030\001 \001(\tB2\340A\002\372A,\n*tr" - + "anslate.googleapis.com/AdaptiveMtDataset" - + "\"\240\001\n\035ListAdaptiveMtDatasetsRequest\0229\n\006pa" - + "rent\030\001 \001(\tB)\340A\002\372A#\n!locations.googleapis" - + ".com/Location\022\026\n\tpage_size\030\002 \001(\005B\003\340A\001\022\027\n" - + "\npage_token\030\003 \001(\tB\003\340A\001\022\023\n\006filter\030\004 \001(\tB\003" - + "\340A\001\"\221\001\n\036ListAdaptiveMtDatasetsResponse\022Q" - + "\n\024adaptive_mt_datasets\030\001 \003(\0132..google.cl" - + "oud.translation.v3.AdaptiveMtDatasetB\003\340A" - + "\003\022\034\n\017next_page_token\030\002 \001(\tB\003\340A\001\"\213\010\n\032Adap" - + "tiveMtTranslateRequest\0229\n\006parent\030\001 \001(\tB)" - + "\340A\002\372A#\n!locations.googleapis.com/Locatio" - + "n\022C\n\007dataset\030\002 \001(\tB2\340A\002\372A,\n*translate.go" - + "ogleapis.com/AdaptiveMtDataset\022\024\n\007conten" - + "t\030\003 \003(\tB\003\340A\002\022w\n\031reference_sentence_confi" - + "g\030\006 \001(\0132O.google.cloud.translation.v3.Ad" - + "aptiveMtTranslateRequest.ReferenceSenten" - + "ceConfigH\000\210\001\001\022i\n\017glossary_config\030\007 \001(\0132F" + + "3/common.proto\032\037google/protobuf/timestamp.proto\"\241\003\n" + + "\021AdaptiveMtDataset\022@\n" + + "\004name\030\001 \001(\tB2\340A\002\372A,\n" + + "*translate.googleapis.com/AdaptiveMtDataset\022\024\n" + + "\014display_name\030\002 \001(\t\022\034\n" + + "\024source_language_code\030\003 \001(\t\022\034\n" + + "\024target_language_code\030\004 \001(\t\022\025\n\r" + + "example_count\030\005 \001(\005\0224\n" + + "\013create_time\030\t \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n" + + "\013update_time\030\n" + + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003:u\352Ar\n" + + "*translate.googleapis.com/AdaptiveMtDataset\022Dp" + + "rojects/{project}/locations/{location}/adaptiveMtDatasets/{dataset}\"\255\001\n" + + "\036CreateAdaptiveMtDatasetRequest\0229\n" + + "\006parent\030\001 \001(\tB)\340A\002\372A#\n" + + "!locations.googleapis.com/Location\022P\n" + + "\023adaptive_mt_dataset\030\002 \001(\0132..google." + + "cloud.translation.v3.AdaptiveMtDatasetB\003\340A\002\"b\n" + + "\036DeleteAdaptiveMtDatasetRequest\022@\n" + + "\004name\030\001 \001(\tB2\340A\002\372A,\n" + + "*translate.googleapis.com/AdaptiveMtDataset\"_\n" + + "\033GetAdaptiveMtDatasetRequest\022@\n" + + "\004name\030\001 \001(\tB2\340A\002\372A,\n" + + "*translate.googleapis.com/AdaptiveMtDataset\"\240\001\n" + + "\035ListAdaptiveMtDatasetsRequest\0229\n" + + "\006parent\030\001 \001(\tB)\340A\002\372A#\n" + + "!locations.googleapis.com/Location\022\026\n" + + "\tpage_size\030\002 \001(\005B\003\340A\001\022\027\n" + + "\n" + + "page_token\030\003 \001(\tB\003\340A\001\022\023\n" + + "\006filter\030\004 \001(\tB\003\340A\001\"\221\001\n" + + "\036ListAdaptiveMtDatasetsResponse\022Q\n" + + "\024adaptive_mt_datasets\030\001 \003(\0132..google.cl" + + "oud.translation.v3.AdaptiveMtDatasetB\003\340A\003\022\034\n" + + "\017next_page_token\030\002 \001(\tB\003\340A\001\"\236\010\n" + + "\032AdaptiveMtTranslateRequest\0229\n" + + "\006parent\030\001 \001(\tB)\340A\002\372A#\n" + + "!locations.googleapis.com/Location\022C\n" + + "\007dataset\030\002 \001(\tB2\340A\002\372A,\n" + + "*translate.googleapis.com/AdaptiveMtDataset\022\024\n" + + "\007content\030\003 \003(\tB\003\340A\002\022\021\n" + + "\tmime_type\030\004 \001(\t\022w\n" + + "\031reference_sentence_config\030\006 \001(\0132O.google.clou" + + "d.translation.v3.AdaptiveMtTranslateRequest.ReferenceSentenceConfigH\000\210\001\001\022i\n" + + "\017glossary_config\030\007 \001(\0132F.google.cloud.transla" + + "tion.v3.AdaptiveMtTranslateRequest.GlossaryConfigB\003\340A\001H\001\210\001\001\032I\n" + + "\025ReferenceSentencePair\022\027\n" + + "\017source_sentence\030\001 \001(\t\022\027\n" + + "\017target_sentence\030\002 \001(\t\032\214\001\n" + + "\031ReferenceSentencePairList\022o\n" + + "\030reference_sentence_pairs\030\001 \003(\0132M" + ".google.cloud.translation.v3.AdaptiveMtT" - + "ranslateRequest.GlossaryConfigB\003\340A\001H\001\210\001\001" - + "\032I\n\025ReferenceSentencePair\022\027\n\017source_sent" - + "ence\030\001 \001(\t\022\027\n\017target_sentence\030\002 \001(\t\032\214\001\n\031" - + "ReferenceSentencePairList\022o\n\030reference_s" - + "entence_pairs\030\001 \003(\0132M.google.cloud.trans" - + "lation.v3.AdaptiveMtTranslateRequest.Ref" - + "erenceSentencePair\032\317\001\n\027ReferenceSentence" - + "Config\022x\n\035reference_sentence_pair_lists\030" - + "\001 \003(\0132Q.google.cloud.translation.v3.Adap" - + "tiveMtTranslateRequest.ReferenceSentence" - + "PairList\022\034\n\024source_language_code\030\002 \001(\t\022\034" - + "\n\024target_language_code\030\003 \001(\t\032\224\001\n\016Glossar" - + "yConfig\022;\n\010glossary\030\001 \001(\tB)\340A\002\372A#\n!trans" - + "late.googleapis.com/Glossary\022\030\n\013ignore_c" - + "ase\030\002 \001(\010B\003\340A\001\022+\n\036contextual_translation" - + "_enabled\030\004 \001(\010B\003\340A\001B\034\n\032_reference_senten" - + "ce_configB\022\n\020_glossary_config\"5\n\025Adaptiv" - + "eMtTranslation\022\034\n\017translated_text\030\001 \001(\tB" - + "\003\340A\003\"\333\001\n\033AdaptiveMtTranslateResponse\022M\n\014" - + "translations\030\001 \003(\01322.google.cloud.transl" - + "ation.v3.AdaptiveMtTranslationB\003\340A\003\022\032\n\rl" - + "anguage_code\030\002 \001(\tB\003\340A\003\022Q\n\025glossary_tran" - + "slations\030\004 \003(\01322.google.cloud.translatio" - + "n.v3.AdaptiveMtTranslation\"\224\003\n\016AdaptiveM" - + "tFile\022=\n\004name\030\001 \001(\tB/\340A\002\372A)\n\'translate.g" - + "oogleapis.com/AdaptiveMtFile\022\024\n\014display_" - + "name\030\002 \001(\t\022\023\n\013entry_count\030\003 \001(\005\0224\n\013creat" - + "e_time\030\004 \001(\0132\032.google.protobuf.Timestamp" - + "B\003\340A\003\0224\n\013update_time\030\005 \001(\0132\032.google.prot" - + "obuf.TimestampB\003\340A\003:\253\001\352A\247\001\n\'translate.go" - + "ogleapis.com/AdaptiveMtFile\022[projects/{p" - + "roject}/locations/{location}/adaptiveMtD" - + "atasets/{dataset}/adaptiveMtFiles/{file}" - + "*\017adaptiveMtFiles2\016adaptiveMtFile\"Y\n\030Get" - + "AdaptiveMtFileRequest\022=\n\004name\030\001 \001(\tB/\340A\002" - + "\372A)\n\'translate.googleapis.com/AdaptiveMt" - + "File\"\\\n\033DeleteAdaptiveMtFileRequest\022=\n\004n" - + "ame\030\001 \001(\tB/\340A\002\372A)\n\'translate.googleapis." - + "com/AdaptiveMtFile\"\377\001\n\033ImportAdaptiveMtF" - + "ileRequest\022B\n\006parent\030\001 \001(\tB2\340A\002\372A,\n*tran" - + "slate.googleapis.com/AdaptiveMtDataset\022I" - + "\n\021file_input_source\030\002 \001(\0132,.google.cloud" - + ".translation.v3.FileInputSourceH\000\022G\n\020gcs" - + "_input_source\030\003 \001(\0132+.google.cloud.trans" - + "lation.v3.GcsInputSourceH\000B\010\n\006source\"j\n\034" - + "ImportAdaptiveMtFileResponse\022J\n\020adaptive" - + "_mt_file\030\001 \001(\0132+.google.cloud.translatio" - + "n.v3.AdaptiveMtFileB\003\340A\003\"\221\001\n\032ListAdaptiv" - + "eMtFilesRequest\022B\n\006parent\030\001 \001(\tB2\340A\002\372A,\n" - + "*translate.googleapis.com/AdaptiveMtData" - + "set\022\026\n\tpage_size\030\002 \001(\005B\003\340A\001\022\027\n\npage_toke" - + "n\030\003 \001(\tB\003\340A\001\"\210\001\n\033ListAdaptiveMtFilesResp" - + "onse\022K\n\021adaptive_mt_files\030\001 \003(\0132+.google" - + ".cloud.translation.v3.AdaptiveMtFileB\003\340A" - + "\003\022\034\n\017next_page_token\030\003 \001(\tB\003\340A\001\"\330\003\n\022Adap" - + "tiveMtSentence\022A\n\004name\030\001 \001(\tB3\340A\002\372A-\n+tr" - + "anslate.googleapis.com/AdaptiveMtSentenc" - + "e\022\034\n\017source_sentence\030\002 \001(\tB\003\340A\002\022\034\n\017targe" - + "t_sentence\030\003 \001(\tB\003\340A\002\0224\n\013create_time\030\004 \001" - + "(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n\013u" - + "pdate_time\030\005 \001(\0132\032.google.protobuf.Times" - + "tampB\003\340A\003:\326\001\352A\322\001\n+translate.googleapis.c" - + "om/AdaptiveMtSentence\022zprojects/{project" - + "}/locations/{location}/adaptiveMtDataset" - + "s/{dataset}/adaptiveMtFiles/{file}/adapt" - + "iveMtSentences/{sentence}*\023adaptiveMtSen" - + "tences2\022adaptiveMtSentence\"\210\001\n\036ListAdapt" - + "iveMtSentencesRequest\022?\n\006parent\030\001 \001(\tB/\340" - + "A\002\372A)\n\'translate.googleapis.com/Adaptive" - + "MtFile\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030" - + "\003 \001(\t\"\224\001\n\037ListAdaptiveMtSentencesRespons" - + "e\022S\n\025adaptive_mt_sentences\030\001 \003(\0132/.googl" - + "e.cloud.translation.v3.AdaptiveMtSentenc" - + "eB\003\340A\003\022\034\n\017next_page_token\030\002 \001(\tB\003\340A\001B\306\001\n" - + "\035com.google.cloud.translate.v3B\017Adaptive" - + "MtProtoP\001Z;cloud.google.com/go/translate" - + "/apiv3/translatepb;translatepb\252\002\031Google." - + "Cloud.Translate.V3\312\002\031Google\\Cloud\\Transl" - + "ate\\V3\352\002\034Google::Cloud::Translate::V3b\006p" - + "roto3" + + "ranslateRequest.ReferenceSentencePair\032\317\001\n" + + "\027ReferenceSentenceConfig\022x\n" + + "\035reference_sentence_pair_lists\030\001 \003(\0132Q.google.cloud." + + "translation.v3.AdaptiveMtTranslateRequest.ReferenceSentencePairList\022\034\n" + + "\024source_language_code\030\002 \001(\t\022\034\n" + + "\024target_language_code\030\003 \001(\t\032\224\001\n" + + "\016GlossaryConfig\022;\n" + + "\010glossary\030\001 \001(\tB)\340A\002\372A#\n" + + "!translate.googleapis.com/Glossary\022\030\n" + + "\013ignore_case\030\002 \001(\010B\003\340A\001\022+\n" + + "\036contextual_translation_enabled\030\004 \001(\010B\003\340A\001B\034\n" + + "\032_reference_sentence_configB\022\n" + + "\020_glossary_config\"5\n" + + "\025AdaptiveMtTranslation\022\034\n" + + "\017translated_text\030\001 \001(\tB\003\340A\003\"\333\001\n" + + "\033AdaptiveMtTranslateResponse\022M\n" + + "\014translations\030\001 \003(\01322." + + "google.cloud.translation.v3.AdaptiveMtTranslationB\003\340A\003\022\032\n\r" + + "language_code\030\002 \001(\tB\003\340A\003\022Q\n" + + "\025glossary_translations\030\004 \003(\01322.goog" + + "le.cloud.translation.v3.AdaptiveMtTranslation\"\224\003\n" + + "\016AdaptiveMtFile\022=\n" + + "\004name\030\001 \001(\tB/\340A\002\372A)\n" + + "\'translate.googleapis.com/AdaptiveMtFile\022\024\n" + + "\014display_name\030\002 \001(\t\022\023\n" + + "\013entry_count\030\003 \001(\005\0224\n" + + "\013create_time\030\004 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n" + + "\013update_time\030\005" + + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003:\253\001\352A\247\001\n" + + "\'translate.googleapis.com/AdaptiveMtFile\022[projects/{project}/locations/{lo" + + "cation}/adaptiveMtDatasets/{dataset}/ada" + + "ptiveMtFiles/{file}*\017adaptiveMtFiles2\016adaptiveMtFile\"Y\n" + + "\030GetAdaptiveMtFileRequest\022=\n" + + "\004name\030\001 \001(\tB/\340A\002\372A)\n" + + "\'translate.googleapis.com/AdaptiveMtFile\"\\\n" + + "\033DeleteAdaptiveMtFileRequest\022=\n" + + "\004name\030\001 \001(\tB/\340A\002\372A)\n" + + "\'translate.googleapis.com/AdaptiveMtFile\"\377\001\n" + + "\033ImportAdaptiveMtFileRequest\022B\n" + + "\006parent\030\001 \001(\tB2\340A\002\372A,\n" + + "*translate.googleapis.com/AdaptiveMtDataset\022I\n" + + "\021file_input_source\030\002" + + " \001(\0132,.google.cloud.translation.v3.FileInputSourceH\000\022G\n" + + "\020gcs_input_source\030\003 \001(\0132+" + + ".google.cloud.translation.v3.GcsInputSourceH\000B\010\n" + + "\006source\"j\n" + + "\034ImportAdaptiveMtFileResponse\022J\n" + + "\020adaptive_mt_file\030\001 \001(\0132+.goog" + + "le.cloud.translation.v3.AdaptiveMtFileB\003\340A\003\"\221\001\n" + + "\032ListAdaptiveMtFilesRequest\022B\n" + + "\006parent\030\001 \001(\tB2\340A\002\372A,\n" + + "*translate.googleapis.com/AdaptiveMtDataset\022\026\n" + + "\tpage_size\030\002 \001(\005B\003\340A\001\022\027\n\n" + + "page_token\030\003 \001(\tB\003\340A\001\"\210\001\n" + + "\033ListAdaptiveMtFilesResponse\022K\n" + + "\021adaptive_mt_files\030\001" + + " \003(\0132+.google.cloud.translation.v3.AdaptiveMtFileB\003\340A\003\022\034\n" + + "\017next_page_token\030\003 \001(\tB\003\340A\001\"\330\003\n" + + "\022AdaptiveMtSentence\022A\n" + + "\004name\030\001 \001(\tB3\340A\002\372A-\n" + + "+translate.googleapis.com/AdaptiveMtSentence\022\034\n" + + "\017source_sentence\030\002 \001(\tB\003\340A\002\022\034\n" + + "\017target_sentence\030\003 \001(\tB\003\340A\002\0224\n" + + "\013create_time\030\004 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n" + + "\013update_time\030\005" + + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003:\326\001\352A\322\001\n" + + "+translate.googleapis.com/AdaptiveMtSentence" + + "\022zprojects/{project}/locations/{location}/adaptiveMtDatasets/{dataset}/adaptiveM" + + "tFiles/{file}/adaptiveMtSentences/{sente" + + "nce}*\023adaptiveMtSentences2\022adaptiveMtSentence\"\210\001\n" + + "\036ListAdaptiveMtSentencesRequest\022?\n" + + "\006parent\030\001 \001(\tB/\340A\002\372A)\n" + + "\'translate.googleapis.com/AdaptiveMtFile\022\021\n" + + "\tpage_size\030\002 \001(\005\022\022\n\n" + + "page_token\030\003 \001(\t\"\224\001\n" + + "\037ListAdaptiveMtSentencesResponse\022S\n" + + "\025adaptive_mt_sentences\030\001" + + " \003(\0132/.google.cloud.translation.v3.AdaptiveMtSentenceB\003\340A\003\022\034\n" + + "\017next_page_token\030\002 \001(\tB\003\340A\001B\306\001\n" + + "\035com.google.cloud.translate.v3B\017AdaptiveMtProtoP\001Z;cloud.goog" + + "le.com/go/translate/apiv3/translatepb;tr" + + "anslatepb\252\002\031Google.Cloud.Translate.V3\312\002\031" + + "Google\\Cloud\\Translate\\V3\352\002\034Google::Cloud::Translate::V3b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -333,7 +351,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_cloud_translation_v3_AdaptiveMtTranslateRequest_descriptor, new java.lang.String[] { - "Parent", "Dataset", "Content", "ReferenceSentenceConfig", "GlossaryConfig", + "Parent", + "Dataset", + "Content", + "MimeType", + "ReferenceSentenceConfig", + "GlossaryConfig", }); internal_static_google_cloud_translation_v3_AdaptiveMtTranslateRequest_ReferenceSentencePair_descriptor = internal_static_google_cloud_translation_v3_AdaptiveMtTranslateRequest_descriptor diff --git a/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtTranslateRequest.java b/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtTranslateRequest.java index 3fbf1527f49e..5456a4e88d11 100644 --- a/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtTranslateRequest.java +++ b/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtTranslateRequest.java @@ -55,6 +55,7 @@ private AdaptiveMtTranslateRequest() { parent_ = ""; dataset_ = ""; content_ = com.google.protobuf.LazyStringArrayList.emptyList(); + mimeType_ = ""; } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @@ -4817,6 +4818,59 @@ public com.google.protobuf.ByteString getContentBytes(int index) { return content_.getByteString(index); } + public static final int MIME_TYPE_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") + private volatile java.lang.Object mimeType_ = ""; + + /** + * + * + *
+   * The format of the source text.
+   * 
+ * + * string mime_type = 4; + * + * @return The mimeType. + */ + @java.lang.Override + public java.lang.String getMimeType() { + java.lang.Object ref = mimeType_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + mimeType_ = s; + return s; + } + } + + /** + * + * + *
+   * The format of the source text.
+   * 
+ * + * string mime_type = 4; + * + * @return The bytes for mimeType. + */ + @java.lang.Override + public com.google.protobuf.ByteString getMimeTypeBytes() { + java.lang.Object ref = mimeType_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + mimeType_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + public static final int REFERENCE_SENTENCE_CONFIG_FIELD_NUMBER = 6; private com.google.cloud.translate.v3.AdaptiveMtTranslateRequest.ReferenceSentenceConfig referenceSentenceConfig_; @@ -4973,6 +5027,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < content_.size(); i++) { com.google.protobuf.GeneratedMessage.writeString(output, 3, content_.getRaw(i)); } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(mimeType_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 4, mimeType_); + } if (((bitField0_ & 0x00000001) != 0)) { output.writeMessage(6, getReferenceSentenceConfig()); } @@ -5002,6 +5059,9 @@ public int getSerializedSize() { size += dataSize; size += 1 * getContentList().size(); } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(mimeType_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(4, mimeType_); + } if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getReferenceSentenceConfig()); @@ -5028,6 +5088,7 @@ public boolean equals(final java.lang.Object obj) { if (!getParent().equals(other.getParent())) return false; if (!getDataset().equals(other.getDataset())) return false; if (!getContentList().equals(other.getContentList())) return false; + if (!getMimeType().equals(other.getMimeType())) return false; if (hasReferenceSentenceConfig() != other.hasReferenceSentenceConfig()) return false; if (hasReferenceSentenceConfig()) { if (!getReferenceSentenceConfig().equals(other.getReferenceSentenceConfig())) return false; @@ -5055,6 +5116,8 @@ public int hashCode() { hash = (37 * hash) + CONTENT_FIELD_NUMBER; hash = (53 * hash) + getContentList().hashCode(); } + hash = (37 * hash) + MIME_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getMimeType().hashCode(); if (hasReferenceSentenceConfig()) { hash = (37 * hash) + REFERENCE_SENTENCE_CONFIG_FIELD_NUMBER; hash = (53 * hash) + getReferenceSentenceConfig().hashCode(); @@ -5217,6 +5280,7 @@ public Builder clear() { parent_ = ""; dataset_ = ""; content_ = com.google.protobuf.LazyStringArrayList.emptyList(); + mimeType_ = ""; referenceSentenceConfig_ = null; if (referenceSentenceConfigBuilder_ != null) { referenceSentenceConfigBuilder_.dispose(); @@ -5273,15 +5337,18 @@ private void buildPartial0(com.google.cloud.translate.v3.AdaptiveMtTranslateRequ content_.makeImmutable(); result.content_ = content_; } - int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000008) != 0)) { + result.mimeType_ = mimeType_; + } + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000010) != 0)) { result.referenceSentenceConfig_ = referenceSentenceConfigBuilder_ == null ? referenceSentenceConfig_ : referenceSentenceConfigBuilder_.build(); to_bitField0_ |= 0x00000001; } - if (((from_bitField0_ & 0x00000010) != 0)) { + if (((from_bitField0_ & 0x00000020) != 0)) { result.glossaryConfig_ = glossaryConfigBuilder_ == null ? glossaryConfig_ : glossaryConfigBuilder_.build(); to_bitField0_ |= 0x00000002; @@ -5322,6 +5389,11 @@ public Builder mergeFrom(com.google.cloud.translate.v3.AdaptiveMtTranslateReques } onChanged(); } + if (!other.getMimeType().isEmpty()) { + mimeType_ = other.mimeType_; + bitField0_ |= 0x00000008; + onChanged(); + } if (other.hasReferenceSentenceConfig()) { mergeReferenceSentenceConfig(other.getReferenceSentenceConfig()); } @@ -5373,19 +5445,25 @@ public Builder mergeFrom( content_.add(s); break; } // case 26 + case 34: + { + mimeType_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000008; + break; + } // case 34 case 50: { input.readMessage( internalGetReferenceSentenceConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; break; } // case 50 case 58: { input.readMessage( internalGetGlossaryConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; break; } // case 58 default: @@ -5847,6 +5925,117 @@ public Builder addContentBytes(com.google.protobuf.ByteString value) { return this; } + private java.lang.Object mimeType_ = ""; + + /** + * + * + *
+     * The format of the source text.
+     * 
+ * + * string mime_type = 4; + * + * @return The mimeType. + */ + public java.lang.String getMimeType() { + java.lang.Object ref = mimeType_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + mimeType_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + + /** + * + * + *
+     * The format of the source text.
+     * 
+ * + * string mime_type = 4; + * + * @return The bytes for mimeType. + */ + public com.google.protobuf.ByteString getMimeTypeBytes() { + java.lang.Object ref = mimeType_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + mimeType_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + /** + * + * + *
+     * The format of the source text.
+     * 
+ * + * string mime_type = 4; + * + * @param value The mimeType to set. + * @return This builder for chaining. + */ + public Builder setMimeType(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + mimeType_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + + /** + * + * + *
+     * The format of the source text.
+     * 
+ * + * string mime_type = 4; + * + * @return This builder for chaining. + */ + public Builder clearMimeType() { + mimeType_ = getDefaultInstance().getMimeType(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + return this; + } + + /** + * + * + *
+     * The format of the source text.
+     * 
+ * + * string mime_type = 4; + * + * @param value The bytes for mimeType to set. + * @return This builder for chaining. + */ + public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + mimeType_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + private com.google.cloud.translate.v3.AdaptiveMtTranslateRequest.ReferenceSentenceConfig referenceSentenceConfig_; private com.google.protobuf.SingleFieldBuilder< @@ -5871,7 +6060,7 @@ public Builder addContentBytes(com.google.protobuf.ByteString value) { * @return Whether the referenceSentenceConfig field is set. */ public boolean hasReferenceSentenceConfig() { - return ((bitField0_ & 0x00000008) != 0); + return ((bitField0_ & 0x00000010) != 0); } /** @@ -5920,7 +6109,7 @@ public Builder setReferenceSentenceConfig( } else { referenceSentenceConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -5944,7 +6133,7 @@ public Builder setReferenceSentenceConfig( } else { referenceSentenceConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -5963,7 +6152,7 @@ public Builder setReferenceSentenceConfig( public Builder mergeReferenceSentenceConfig( com.google.cloud.translate.v3.AdaptiveMtTranslateRequest.ReferenceSentenceConfig value) { if (referenceSentenceConfigBuilder_ == null) { - if (((bitField0_ & 0x00000008) != 0) + if (((bitField0_ & 0x00000010) != 0) && referenceSentenceConfig_ != null && referenceSentenceConfig_ != com.google.cloud.translate.v3.AdaptiveMtTranslateRequest.ReferenceSentenceConfig @@ -5976,7 +6165,7 @@ public Builder mergeReferenceSentenceConfig( referenceSentenceConfigBuilder_.mergeFrom(value); } if (referenceSentenceConfig_ != null) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; onChanged(); } return this; @@ -5994,7 +6183,7 @@ public Builder mergeReferenceSentenceConfig( *
*/ public Builder clearReferenceSentenceConfig() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); referenceSentenceConfig_ = null; if (referenceSentenceConfigBuilder_ != null) { referenceSentenceConfigBuilder_.dispose(); @@ -6017,7 +6206,7 @@ public Builder clearReferenceSentenceConfig() { */ public com.google.cloud.translate.v3.AdaptiveMtTranslateRequest.ReferenceSentenceConfig.Builder getReferenceSentenceConfigBuilder() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; onChanged(); return internalGetReferenceSentenceConfigFieldBuilder().getBuilder(); } @@ -6100,7 +6289,7 @@ public Builder clearReferenceSentenceConfig() { * @return Whether the glossaryConfig field is set. */ public boolean hasGlossaryConfig() { - return ((bitField0_ & 0x00000010) != 0); + return ((bitField0_ & 0x00000020) != 0); } /** @@ -6153,7 +6342,7 @@ public Builder setGlossaryConfig( } else { glossaryConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -6179,7 +6368,7 @@ public Builder setGlossaryConfig( } else { glossaryConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -6200,7 +6389,7 @@ public Builder setGlossaryConfig( public Builder mergeGlossaryConfig( com.google.cloud.translate.v3.AdaptiveMtTranslateRequest.GlossaryConfig value) { if (glossaryConfigBuilder_ == null) { - if (((bitField0_ & 0x00000010) != 0) + if (((bitField0_ & 0x00000020) != 0) && glossaryConfig_ != null && glossaryConfig_ != com.google.cloud.translate.v3.AdaptiveMtTranslateRequest.GlossaryConfig @@ -6213,7 +6402,7 @@ public Builder mergeGlossaryConfig( glossaryConfigBuilder_.mergeFrom(value); } if (glossaryConfig_ != null) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); } return this; @@ -6233,7 +6422,7 @@ public Builder mergeGlossaryConfig( *
*/ public Builder clearGlossaryConfig() { - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); glossaryConfig_ = null; if (glossaryConfigBuilder_ != null) { glossaryConfigBuilder_.dispose(); @@ -6258,7 +6447,7 @@ public Builder clearGlossaryConfig() { */ public com.google.cloud.translate.v3.AdaptiveMtTranslateRequest.GlossaryConfig.Builder getGlossaryConfigBuilder() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); return internalGetGlossaryConfigFieldBuilder().getBuilder(); } diff --git a/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtTranslateRequestOrBuilder.java b/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtTranslateRequestOrBuilder.java index 46ee297affd8..9119b0e67e0a 100644 --- a/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtTranslateRequestOrBuilder.java +++ b/java-translate/proto-google-cloud-translate-v3/src/main/java/com/google/cloud/translate/v3/AdaptiveMtTranslateRequestOrBuilder.java @@ -146,6 +146,32 @@ public interface AdaptiveMtTranslateRequestOrBuilder */ com.google.protobuf.ByteString getContentBytes(int index); + /** + * + * + *
+   * The format of the source text.
+   * 
+ * + * string mime_type = 4; + * + * @return The mimeType. + */ + java.lang.String getMimeType(); + + /** + * + * + *
+   * The format of the source text.
+   * 
+ * + * string mime_type = 4; + * + * @return The bytes for mimeType. + */ + com.google.protobuf.ByteString getMimeTypeBytes(); + /** * * diff --git a/java-translate/proto-google-cloud-translate-v3/src/main/proto/google/cloud/translate/v3/adaptive_mt.proto b/java-translate/proto-google-cloud-translate-v3/src/main/proto/google/cloud/translate/v3/adaptive_mt.proto index 2ccb207c42c1..594292c35dd7 100644 --- a/java-translate/proto-google-cloud-translate-v3/src/main/proto/google/cloud/translate/v3/adaptive_mt.proto +++ b/java-translate/proto-google-cloud-translate-v3/src/main/proto/google/cloud/translate/v3/adaptive_mt.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -229,6 +229,9 @@ message AdaptiveMtTranslateRequest { // Required. The content of the input in string format. repeated string content = 3 [(google.api.field_behavior) = REQUIRED]; + // The format of the source text. + string mime_type = 4; + // Configuration for caller provided reference sentences. optional ReferenceSentenceConfig reference_sentence_config = 6; diff --git a/java-translate/samples/snippets/generated/com/google/cloud/translate/v3/translationservice/adaptivemttranslate/AsyncAdaptiveMtTranslate.java b/java-translate/samples/snippets/generated/com/google/cloud/translate/v3/translationservice/adaptivemttranslate/AsyncAdaptiveMtTranslate.java index 00f6e878d79f..df1f6ba0025a 100644 --- a/java-translate/samples/snippets/generated/com/google/cloud/translate/v3/translationservice/adaptivemttranslate/AsyncAdaptiveMtTranslate.java +++ b/java-translate/samples/snippets/generated/com/google/cloud/translate/v3/translationservice/adaptivemttranslate/AsyncAdaptiveMtTranslate.java @@ -44,6 +44,7 @@ public static void asyncAdaptiveMtTranslate() throws Exception { .setDataset( AdaptiveMtDatasetName.of("[PROJECT]", "[LOCATION]", "[DATASET]").toString()) .addAllContent(new ArrayList()) + .setMimeType("mimeType-1392120434") .setReferenceSentenceConfig( AdaptiveMtTranslateRequest.ReferenceSentenceConfig.newBuilder().build()) .setGlossaryConfig(AdaptiveMtTranslateRequest.GlossaryConfig.newBuilder().build()) diff --git a/java-translate/samples/snippets/generated/com/google/cloud/translate/v3/translationservice/adaptivemttranslate/SyncAdaptiveMtTranslate.java b/java-translate/samples/snippets/generated/com/google/cloud/translate/v3/translationservice/adaptivemttranslate/SyncAdaptiveMtTranslate.java index dacb2f75d7ce..9511be4ceb10 100644 --- a/java-translate/samples/snippets/generated/com/google/cloud/translate/v3/translationservice/adaptivemttranslate/SyncAdaptiveMtTranslate.java +++ b/java-translate/samples/snippets/generated/com/google/cloud/translate/v3/translationservice/adaptivemttranslate/SyncAdaptiveMtTranslate.java @@ -43,6 +43,7 @@ public static void syncAdaptiveMtTranslate() throws Exception { .setDataset( AdaptiveMtDatasetName.of("[PROJECT]", "[LOCATION]", "[DATASET]").toString()) .addAllContent(new ArrayList()) + .setMimeType("mimeType-1392120434") .setReferenceSentenceConfig( AdaptiveMtTranslateRequest.ReferenceSentenceConfig.newBuilder().build()) .setGlossaryConfig(AdaptiveMtTranslateRequest.GlossaryConfig.newBuilder().build())