diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 1b1f157b2..9564231af 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.68.0 + - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@v1.85.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index de4ac9dbf..af9f68ad4 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index d8ae3b322..576031a71 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index 0e9d1203a..1d86c06d2 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/README.md b/README.md index 9c5387318..ce74acefa 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.78.0') +implementation platform('com.google.cloud:libraries-bom:26.79.0') implementation 'com.google.cloud:google-cloud-pubsub' ``` diff --git a/generation_config.yaml b/generation_config.yaml index 454916e8f..e13e43f99 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ -gapic_generator_version: 2.68.0 -googleapis_commitish: 758d8244a84065ea6b0dfacff3d3e9284983390b -libraries_bom_version: 26.78.0 +gapic_generator_version: 2.71.0 +googleapis_commitish: 62e4ecb2f4390728990514fea14aad0431881a52 +libraries_bom_version: 26.79.0 libraries: - api_shortname: pubsub name_pretty: Cloud Pub/Sub diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java index aca63c6bc..137efe471 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java @@ -257,6 +257,7 @@ protected GrpcPublisherStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); GrpcCallSettings updateTopicTransportSettings = GrpcCallSettings.newBuilder() @@ -277,6 +278,7 @@ protected GrpcPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); GrpcCallSettings getTopicTransportSettings = GrpcCallSettings.newBuilder() @@ -287,6 +289,7 @@ protected GrpcPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); GrpcCallSettings listTopicsTransportSettings = GrpcCallSettings.newBuilder() @@ -297,6 +300,7 @@ protected GrpcPublisherStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getProject()) .build(); GrpcCallSettings listTopicSubscriptionsTransportSettings = @@ -309,6 +313,7 @@ protected GrpcPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); GrpcCallSettings listTopicSnapshotsTransportSettings = @@ -320,6 +325,7 @@ protected GrpcPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); GrpcCallSettings deleteTopicTransportSettings = GrpcCallSettings.newBuilder() @@ -330,6 +336,7 @@ protected GrpcPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); GrpcCallSettings detachSubscriptionTransportSettings = @@ -341,6 +348,7 @@ protected GrpcPublisherStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); GrpcCallSettings setIamPolicyTransportSettings = GrpcCallSettings.newBuilder() @@ -351,6 +359,7 @@ protected GrpcPublisherStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); GrpcCallSettings getIamPolicyTransportSettings = GrpcCallSettings.newBuilder() @@ -361,6 +370,7 @@ protected GrpcPublisherStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); GrpcCallSettings testIamPermissionsTransportSettings = @@ -372,6 +382,7 @@ protected GrpcPublisherStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); this.createTopicCallable = diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSchemaServiceStub.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSchemaServiceStub.java index 403a90e19..a13604e4b 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSchemaServiceStub.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSchemaServiceStub.java @@ -269,6 +269,7 @@ protected GrpcSchemaServiceStub( builder.add("parent", String.valueOf(request.getParent())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getParent()) .build(); GrpcCallSettings getSchemaTransportSettings = GrpcCallSettings.newBuilder() @@ -279,6 +280,7 @@ protected GrpcSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); GrpcCallSettings listSchemasTransportSettings = GrpcCallSettings.newBuilder() @@ -289,6 +291,7 @@ protected GrpcSchemaServiceStub( builder.add("parent", String.valueOf(request.getParent())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getParent()) .build(); GrpcCallSettings listSchemaRevisionsTransportSettings = @@ -300,6 +303,7 @@ protected GrpcSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); GrpcCallSettings commitSchemaTransportSettings = GrpcCallSettings.newBuilder() @@ -310,6 +314,7 @@ protected GrpcSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); GrpcCallSettings rollbackSchemaTransportSettings = GrpcCallSettings.newBuilder() @@ -320,6 +325,7 @@ protected GrpcSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); GrpcCallSettings deleteSchemaRevisionTransportSettings = GrpcCallSettings.newBuilder() @@ -330,6 +336,7 @@ protected GrpcSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); GrpcCallSettings deleteSchemaTransportSettings = GrpcCallSettings.newBuilder() @@ -340,6 +347,7 @@ protected GrpcSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); GrpcCallSettings validateSchemaTransportSettings = @@ -351,6 +359,7 @@ protected GrpcSchemaServiceStub( builder.add("parent", String.valueOf(request.getParent())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getParent()) .build(); GrpcCallSettings validateMessageTransportSettings = @@ -362,6 +371,7 @@ protected GrpcSchemaServiceStub( builder.add("parent", String.valueOf(request.getParent())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getParent()) .build(); GrpcCallSettings setIamPolicyTransportSettings = GrpcCallSettings.newBuilder() @@ -372,6 +382,7 @@ protected GrpcSchemaServiceStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); GrpcCallSettings getIamPolicyTransportSettings = GrpcCallSettings.newBuilder() @@ -382,6 +393,7 @@ protected GrpcSchemaServiceStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); GrpcCallSettings testIamPermissionsTransportSettings = @@ -393,6 +405,7 @@ protected GrpcSchemaServiceStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); this.createSchemaCallable = diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java index 7669b2cd6..6c51332e6 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java @@ -348,6 +348,7 @@ protected GrpcSubscriberStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); GrpcCallSettings getSubscriptionTransportSettings = GrpcCallSettings.newBuilder() @@ -358,6 +359,7 @@ protected GrpcSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); GrpcCallSettings updateSubscriptionTransportSettings = GrpcCallSettings.newBuilder() @@ -380,6 +382,7 @@ protected GrpcSubscriberStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getProject()) .build(); GrpcCallSettings deleteSubscriptionTransportSettings = GrpcCallSettings.newBuilder() @@ -390,6 +393,7 @@ protected GrpcSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); GrpcCallSettings modifyAckDeadlineTransportSettings = GrpcCallSettings.newBuilder() @@ -400,6 +404,7 @@ protected GrpcSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); GrpcCallSettings acknowledgeTransportSettings = GrpcCallSettings.newBuilder() @@ -410,6 +415,7 @@ protected GrpcSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); GrpcCallSettings pullTransportSettings = GrpcCallSettings.newBuilder() @@ -420,10 +426,12 @@ protected GrpcSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); GrpcCallSettings streamingPullTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(streamingPullMethodDescriptor) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); GrpcCallSettings modifyPushConfigTransportSettings = GrpcCallSettings.newBuilder() @@ -434,6 +442,7 @@ protected GrpcSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); GrpcCallSettings getSnapshotTransportSettings = GrpcCallSettings.newBuilder() @@ -444,6 +453,7 @@ protected GrpcSubscriberStub( builder.add("snapshot", String.valueOf(request.getSnapshot())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSnapshot()) .build(); GrpcCallSettings listSnapshotsTransportSettings = GrpcCallSettings.newBuilder() @@ -454,6 +464,7 @@ protected GrpcSubscriberStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getProject()) .build(); GrpcCallSettings createSnapshotTransportSettings = GrpcCallSettings.newBuilder() @@ -464,6 +475,7 @@ protected GrpcSubscriberStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); GrpcCallSettings updateSnapshotTransportSettings = GrpcCallSettings.newBuilder() @@ -484,6 +496,7 @@ protected GrpcSubscriberStub( builder.add("snapshot", String.valueOf(request.getSnapshot())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSnapshot()) .build(); GrpcCallSettings seekTransportSettings = GrpcCallSettings.newBuilder() @@ -494,6 +507,7 @@ protected GrpcSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); GrpcCallSettings setIamPolicyTransportSettings = GrpcCallSettings.newBuilder() @@ -504,6 +518,7 @@ protected GrpcSubscriberStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); GrpcCallSettings getIamPolicyTransportSettings = GrpcCallSettings.newBuilder() @@ -514,6 +529,7 @@ protected GrpcSubscriberStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); GrpcCallSettings testIamPermissionsTransportSettings = @@ -525,6 +541,7 @@ protected GrpcSubscriberStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); this.createSubscriptionCallable = diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonPublisherStub.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonPublisherStub.java index 09c5f83f8..011a019de 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonPublisherStub.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonPublisherStub.java @@ -582,6 +582,7 @@ protected HttpJsonPublisherStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); HttpJsonCallSettings updateTopicTransportSettings = HttpJsonCallSettings.newBuilder() @@ -604,6 +605,7 @@ protected HttpJsonPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); HttpJsonCallSettings getTopicTransportSettings = HttpJsonCallSettings.newBuilder() @@ -615,6 +617,7 @@ protected HttpJsonPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); HttpJsonCallSettings listTopicsTransportSettings = HttpJsonCallSettings.newBuilder() @@ -626,6 +629,7 @@ protected HttpJsonPublisherStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getProject()) .build(); HttpJsonCallSettings listTopicSubscriptionsTransportSettings = @@ -639,6 +643,7 @@ protected HttpJsonPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); HttpJsonCallSettings listTopicSnapshotsTransportSettings = @@ -651,6 +656,7 @@ protected HttpJsonPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); HttpJsonCallSettings deleteTopicTransportSettings = HttpJsonCallSettings.newBuilder() @@ -662,6 +668,7 @@ protected HttpJsonPublisherStub( builder.add("topic", String.valueOf(request.getTopic())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getTopic()) .build(); HttpJsonCallSettings detachSubscriptionTransportSettings = @@ -674,6 +681,7 @@ protected HttpJsonPublisherStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -685,6 +693,7 @@ protected HttpJsonPublisherStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -696,6 +705,7 @@ protected HttpJsonPublisherStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -708,6 +718,7 @@ protected HttpJsonPublisherStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); this.createTopicCallable = diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonSchemaServiceStub.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonSchemaServiceStub.java index 0b9a729a4..d8f726b6f 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonSchemaServiceStub.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonSchemaServiceStub.java @@ -627,6 +627,7 @@ protected HttpJsonSchemaServiceStub( builder.add("parent", String.valueOf(request.getParent())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getParent()) .build(); HttpJsonCallSettings getSchemaTransportSettings = HttpJsonCallSettings.newBuilder() @@ -638,6 +639,7 @@ protected HttpJsonSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); HttpJsonCallSettings listSchemasTransportSettings = HttpJsonCallSettings.newBuilder() @@ -649,6 +651,7 @@ protected HttpJsonSchemaServiceStub( builder.add("parent", String.valueOf(request.getParent())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getParent()) .build(); HttpJsonCallSettings listSchemaRevisionsTransportSettings = @@ -662,6 +665,7 @@ protected HttpJsonSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); HttpJsonCallSettings commitSchemaTransportSettings = HttpJsonCallSettings.newBuilder() @@ -673,6 +677,7 @@ protected HttpJsonSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); HttpJsonCallSettings rollbackSchemaTransportSettings = HttpJsonCallSettings.newBuilder() @@ -684,6 +689,7 @@ protected HttpJsonSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); HttpJsonCallSettings deleteSchemaRevisionTransportSettings = @@ -696,6 +702,7 @@ protected HttpJsonSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); HttpJsonCallSettings deleteSchemaTransportSettings = HttpJsonCallSettings.newBuilder() @@ -707,6 +714,7 @@ protected HttpJsonSchemaServiceStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); HttpJsonCallSettings validateSchemaTransportSettings = @@ -719,6 +727,7 @@ protected HttpJsonSchemaServiceStub( builder.add("parent", String.valueOf(request.getParent())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getParent()) .build(); HttpJsonCallSettings validateMessageTransportSettings = @@ -731,6 +740,7 @@ protected HttpJsonSchemaServiceStub( builder.add("parent", String.valueOf(request.getParent())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getParent()) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -742,6 +752,7 @@ protected HttpJsonSchemaServiceStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -753,6 +764,7 @@ protected HttpJsonSchemaServiceStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -765,6 +777,7 @@ protected HttpJsonSchemaServiceStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); this.createSchemaCallable = diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonSubscriberStub.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonSubscriberStub.java index 4bb0774b8..ce9647bd2 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonSubscriberStub.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonSubscriberStub.java @@ -818,6 +818,7 @@ protected HttpJsonSubscriberStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); HttpJsonCallSettings getSubscriptionTransportSettings = HttpJsonCallSettings.newBuilder() @@ -829,6 +830,7 @@ protected HttpJsonSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); HttpJsonCallSettings updateSubscriptionTransportSettings = @@ -854,6 +856,7 @@ protected HttpJsonSubscriberStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getProject()) .build(); HttpJsonCallSettings deleteSubscriptionTransportSettings = HttpJsonCallSettings.newBuilder() @@ -865,6 +868,7 @@ protected HttpJsonSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); HttpJsonCallSettings modifyAckDeadlineTransportSettings = HttpJsonCallSettings.newBuilder() @@ -876,6 +880,7 @@ protected HttpJsonSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); HttpJsonCallSettings acknowledgeTransportSettings = HttpJsonCallSettings.newBuilder() @@ -887,6 +892,7 @@ protected HttpJsonSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); HttpJsonCallSettings pullTransportSettings = HttpJsonCallSettings.newBuilder() @@ -898,6 +904,7 @@ protected HttpJsonSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); HttpJsonCallSettings modifyPushConfigTransportSettings = HttpJsonCallSettings.newBuilder() @@ -909,6 +916,7 @@ protected HttpJsonSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); HttpJsonCallSettings getSnapshotTransportSettings = HttpJsonCallSettings.newBuilder() @@ -920,6 +928,7 @@ protected HttpJsonSubscriberStub( builder.add("snapshot", String.valueOf(request.getSnapshot())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSnapshot()) .build(); HttpJsonCallSettings listSnapshotsTransportSettings = @@ -932,6 +941,7 @@ protected HttpJsonSubscriberStub( builder.add("project", String.valueOf(request.getProject())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getProject()) .build(); HttpJsonCallSettings createSnapshotTransportSettings = HttpJsonCallSettings.newBuilder() @@ -943,6 +953,7 @@ protected HttpJsonSubscriberStub( builder.add("name", String.valueOf(request.getName())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getName()) .build(); HttpJsonCallSettings updateSnapshotTransportSettings = HttpJsonCallSettings.newBuilder() @@ -965,6 +976,7 @@ protected HttpJsonSubscriberStub( builder.add("snapshot", String.valueOf(request.getSnapshot())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSnapshot()) .build(); HttpJsonCallSettings seekTransportSettings = HttpJsonCallSettings.newBuilder() @@ -976,6 +988,7 @@ protected HttpJsonSubscriberStub( builder.add("subscription", String.valueOf(request.getSubscription())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getSubscription()) .build(); HttpJsonCallSettings setIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -987,6 +1000,7 @@ protected HttpJsonSubscriberStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); HttpJsonCallSettings getIamPolicyTransportSettings = HttpJsonCallSettings.newBuilder() @@ -998,6 +1012,7 @@ protected HttpJsonSubscriberStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); HttpJsonCallSettings testIamPermissionsTransportSettings = @@ -1010,6 +1025,7 @@ protected HttpJsonSubscriberStub( builder.add("resource", String.valueOf(request.getResource())); return builder.build(); }) + .setResourceNameExtractor(request -> request.getResource()) .build(); this.createSubscriptionCallable = diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java index ed148fe35..a0c47d70d 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java @@ -602,6 +602,7 @@ protected LibraryMetadata getLibraryMetadata() { return LibraryMetadata.newBuilder() .setArtifactName("com.google.cloud:google-cloud-pubsub") .setRepository("googleapis/java-pubsub") + .setVersion(Version.VERSION) .build(); } diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java index 1509bd98e..2e879a074 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java @@ -467,6 +467,7 @@ protected LibraryMetadata getLibraryMetadata() { return LibraryMetadata.newBuilder() .setArtifactName("com.google.cloud:google-cloud-pubsub") .setRepository("googleapis/java-pubsub") + .setVersion(Version.VERSION) .build(); } diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java index 82446684a..5f03d7b03 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java @@ -517,6 +517,7 @@ protected LibraryMetadata getLibraryMetadata() { return LibraryMetadata.newBuilder() .setArtifactName("com.google.cloud:google-cloud-pubsub") .setRepository("googleapis/java-pubsub") + .setVersion(Version.VERSION) .build(); } @@ -630,10 +631,10 @@ public static class Builder extends StubSettings.Builder * @@ -1041,7 +1041,7 @@ public java.lang.String getServiceAccountEmail() { * endpoints. The resource creator or updater that specifies this field must * have `iam.serviceAccounts.actAs` permission on the service account. If not * specified, the Pub/Sub [service - * agent]({$universe.dns_names.final_documentation_domain}/iam/docs/service-agents), + * agent](https://cloud.google.com/iam/docs/service-agents), * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. * * @@ -1841,7 +1841,7 @@ public Builder clearUnstructuredInference() { * endpoints. The resource creator or updater that specifies this field must * have `iam.serviceAccounts.actAs` permission on the service account. If not * specified, the Pub/Sub [service - * agent]({$universe.dns_names.final_documentation_domain}/iam/docs/service-agents), + * agent](https://cloud.google.com/iam/docs/service-agents), * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. * * @@ -1869,7 +1869,7 @@ public java.lang.String getServiceAccountEmail() { * endpoints. The resource creator or updater that specifies this field must * have `iam.serviceAccounts.actAs` permission on the service account. If not * specified, the Pub/Sub [service - * agent]({$universe.dns_names.final_documentation_domain}/iam/docs/service-agents), + * agent](https://cloud.google.com/iam/docs/service-agents), * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. * * @@ -1897,7 +1897,7 @@ public com.google.protobuf.ByteString getServiceAccountEmailBytes() { * endpoints. The resource creator or updater that specifies this field must * have `iam.serviceAccounts.actAs` permission on the service account. If not * specified, the Pub/Sub [service - * agent]({$universe.dns_names.final_documentation_domain}/iam/docs/service-agents), + * agent](https://cloud.google.com/iam/docs/service-agents), * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. * * @@ -1924,7 +1924,7 @@ public Builder setServiceAccountEmail(java.lang.String value) { * endpoints. The resource creator or updater that specifies this field must * have `iam.serviceAccounts.actAs` permission on the service account. If not * specified, the Pub/Sub [service - * agent]({$universe.dns_names.final_documentation_domain}/iam/docs/service-agents), + * agent](https://cloud.google.com/iam/docs/service-agents), * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. * * @@ -1947,7 +1947,7 @@ public Builder clearServiceAccountEmail() { * endpoints. The resource creator or updater that specifies this field must * have `iam.serviceAccounts.actAs` permission on the service account. If not * specified, the Pub/Sub [service - * agent]({$universe.dns_names.final_documentation_domain}/iam/docs/service-agents), + * agent](https://cloud.google.com/iam/docs/service-agents), * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. * * diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AIInferenceOrBuilder.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AIInferenceOrBuilder.java index c7039d308..07aa76e61 100644 --- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AIInferenceOrBuilder.java +++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AIInferenceOrBuilder.java @@ -110,7 +110,7 @@ public interface AIInferenceOrBuilder * endpoints. The resource creator or updater that specifies this field must * have `iam.serviceAccounts.actAs` permission on the service account. If not * specified, the Pub/Sub [service - * agent]({$universe.dns_names.final_documentation_domain}/iam/docs/service-agents), + * agent](https://cloud.google.com/iam/docs/service-agents), * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. * * @@ -128,7 +128,7 @@ public interface AIInferenceOrBuilder * endpoints. The resource creator or updater that specifies this field must * have `iam.serviceAccounts.actAs` permission on the service account. If not * specified, the Pub/Sub [service - * agent]({$universe.dns_names.final_documentation_domain}/iam/docs/service-agents), + * agent](https://cloud.google.com/iam/docs/service-agents), * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. * * diff --git a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto index 3f07ec45c..382343c6a 100644 --- a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto +++ b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto @@ -834,7 +834,7 @@ message AIInference { // endpoints. The resource creator or updater that specifies this field must // have `iam.serviceAccounts.actAs` permission on the service account. If not // specified, the Pub/Sub [service - // agent]({$universe.dns_names.final_documentation_domain}/iam/docs/service-agents), + // agent](https://cloud.google.com/iam/docs/service-agents), // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. string service_account_email = 3 [(google.api.field_behavior) = OPTIONAL]; }