feat: Enable REST transport for most of Java and Go clients (#1162)

* chore: Integrate new gapic-generator-java and rules_gapic PiperOrigin-RevId: 454027580 Source-Link: googleapis/googleapis@1b22277 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Enable REST transport for most of Java and Go clients PiperOrigin-RevId: 456641589 Source-Link: googleapis/googleapis@8a251f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Update pom.xml Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Neenu Shaji <Neenu1995@users.noreply.github.com>

Author: gcf-owl-bot[bot]

google-cloud-pubsub/pom.xml

@@ -65,6 +65,10 @@
  <groupId>com.google.api</groupId>
  <artifactId>gax-grpc</artifactId>
  </dependency>
+ <dependency>
+ <groupId>com.google.api</groupId>
+ <artifactId>gax-httpjson</artifactId>
+ </dependency>
  <dependency>
  <groupId>org.threeten</groupId>
  <artifactId>threetenbp</artifactId>
@@ -136,12 +140,24 @@
  <scope>test</scope>
  </dependency>
  <!-- Need testing utility classes for generated gRPC clients tests -->
+ <dependency>
+ <groupId>com.google.api</groupId>
+ <artifactId>gax</artifactId>
+ <classifier>testlib</classifier>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>com.google.api</groupId>
  <artifactId>gax-grpc</artifactId>
  <classifier>testlib</classifier>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.google.api</groupId>
+ <artifactId>gax-httpjson</artifactId>
+ <classifier>testlib</classifier>
+ <scope>test</scope>
+ </dependency>
  </dependencies>
 
  <build>

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SchemaServiceClient.java

@@ -116,6 +116,20 @@
  * SchemaServiceClient schemaServiceClient = SchemaServiceClient.create(schemaServiceSettings);
  * }</pre>
  *
+ * <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
+ * the wire:
+ *
+ * <pre>{@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
+ * SchemaServiceSettings schemaServiceSettings =
+ * SchemaServiceSettings.newBuilder()
+ * .setTransportChannelProvider(
+ * SchemaServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
+ * .build();
+ * SchemaServiceClient schemaServiceClient = SchemaServiceClient.create(schemaServiceSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")
@@ -531,7 +545,7 @@ public final ListSchemasPagedResponse listSchemas(ListSchemasRequest request) {
  * .build();
  * while (true) {
  * ListSchemasResponse response = schemaServiceClient.listSchemasCallable().call(request);
- * for (Schema element : response.getResponsesList()) {
+ * for (Schema element : response.getSchemasList()) {
  * // doThingsWith(element);
  * }
  * String nextPageToken = response.getNextPageToken();
@@ -825,7 +839,7 @@ public final ValidateMessageResponse validateMessage(ValidateMessageRequest requ
  * try (SchemaServiceClient schemaServiceClient = SchemaServiceClient.create()) {
  * SetIamPolicyRequest request =
  * SetIamPolicyRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .setPolicy(Policy.newBuilder().build())
  * .setUpdateMask(FieldMask.newBuilder().build())
  * .build();
@@ -854,7 +868,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
  * try (SchemaServiceClient schemaServiceClient = SchemaServiceClient.create()) {
  * SetIamPolicyRequest request =
  * SetIamPolicyRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .setPolicy(Policy.newBuilder().build())
  * .setUpdateMask(FieldMask.newBuilder().build())
  * .build();
@@ -881,7 +895,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
  * try (SchemaServiceClient schemaServiceClient = SchemaServiceClient.create()) {
  * GetIamPolicyRequest request =
  * GetIamPolicyRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .setOptions(GetPolicyOptions.newBuilder().build())
  * .build();
  * Policy response = schemaServiceClient.getIamPolicy(request);
@@ -908,7 +922,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
  * try (SchemaServiceClient schemaServiceClient = SchemaServiceClient.create()) {
  * GetIamPolicyRequest request =
  * GetIamPolicyRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .setOptions(GetPolicyOptions.newBuilder().build())
  * .build();
  * ApiFuture<Policy> future = schemaServiceClient.getIamPolicyCallable().futureCall(request);
@@ -938,7 +952,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
  * try (SchemaServiceClient schemaServiceClient = SchemaServiceClient.create()) {
  * TestIamPermissionsRequest request =
  * TestIamPermissionsRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .addAllPermissions(new ArrayList<String>())
  * .build();
  * TestIamPermissionsResponse response = schemaServiceClient.testIamPermissions(request);
@@ -969,7 +983,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
  * try (SchemaServiceClient schemaServiceClient = SchemaServiceClient.create()) {
  * TestIamPermissionsRequest request =
  * TestIamPermissionsRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .addAllPermissions(new ArrayList<String>())
  * .build();
  * ApiFuture<TestIamPermissionsResponse> future =

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SchemaServiceSettings.java

@@ -23,6 +23,7 @@
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ClientSettings;
@@ -159,11 +160,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
  return SchemaServiceStubSettings.defaultCredentialsProviderBuilder();
  }
 
- /** Returns a builder for the default ChannelProvider for this service. */
+ /** Returns a builder for the default gRPC ChannelProvider for this service. */
  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
  return SchemaServiceStubSettings.defaultGrpcTransportProviderBuilder();
  }
 
+ /** Returns a builder for the default REST ChannelProvider for this service. */
+ @BetaApi
+ public static InstantiatingHttpJsonChannelProvider.Builder
+ defaultHttpJsonTransportProviderBuilder() {
+ return SchemaServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
+ }
+
  public static TransportChannelProvider defaultTransportChannelProvider() {
  return SchemaServiceStubSettings.defaultTransportChannelProvider();
  }
@@ -173,11 +181,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
  return SchemaServiceStubSettings.defaultApiClientHeaderProviderBuilder();
  }
 
- /** Returns a new builder for this class. */
+ /** Returns a new gRPC builder for this class. */
  public static Builder newBuilder() {
  return Builder.createDefault();
  }
 
+ /** Returns a new REST builder for this class. */
+ @BetaApi
+ public static Builder newHttpJsonBuilder() {
+ return Builder.createHttpJsonDefault();
+ }
+
  /** Returns a new builder for this class. */
  public static Builder newBuilder(ClientContext clientContext) {
  return new Builder(clientContext);
@@ -215,6 +229,11 @@ private static Builder createDefault() {
  return new Builder(SchemaServiceStubSettings.newBuilder());
  }
 
+ @BetaApi
+ private static Builder createHttpJsonDefault() {
+ return new Builder(SchemaServiceStubSettings.newHttpJsonBuilder());
+ }
+
  public SchemaServiceStubSettings.Builder getStubSettingsBuilder() {
  return ((SchemaServiceStubSettings.Builder) getStubSettings());
  }

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java

@@ -142,6 +142,21 @@
  * SubscriptionAdminClient.create(subscriptionAdminSettings);
  * }</pre>
  *
+ * <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
+ * the wire:
+ *
+ * <pre>{@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
+ * SubscriptionAdminSettings subscriptionAdminSettings =
+ * SubscriptionAdminSettings.newBuilder()
+ * .setTransportChannelProvider(
+ * SubscriptionAdminSettings.defaultHttpJsonTransportProviderBuilder().build())
+ * .build();
+ * SubscriptionAdminClient subscriptionAdminClient =
+ * SubscriptionAdminClient.create(subscriptionAdminSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")
@@ -1091,7 +1106,7 @@ public final ListSubscriptionsPagedResponse listSubscriptions(ListSubscriptionsR
  * while (true) {
  * ListSubscriptionsResponse response =
  * subscriptionAdminClient.listSubscriptionsCallable().call(request);
- * for (Subscription element : response.getResponsesList()) {
+ * for (Subscription element : response.getSubscriptionsList()) {
  * // doThingsWith(element);
  * }
  * String nextPageToken = response.getNextPageToken();
@@ -2383,7 +2398,7 @@ public final ListSnapshotsPagedResponse listSnapshots(ListSnapshotsRequest reque
  * while (true) {
  * ListSnapshotsResponse response =
  * subscriptionAdminClient.listSnapshotsCallable().call(request);
- * for (Snapshot element : response.getResponsesList()) {
+ * for (Snapshot element : response.getSnapshotsList()) {
  * // doThingsWith(element);
  * }
  * String nextPageToken = response.getNextPageToken();
@@ -3114,7 +3129,7 @@ public final UnaryCallable<SeekRequest, SeekResponse> seekCallable() {
  * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
  * SetIamPolicyRequest request =
  * SetIamPolicyRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .setPolicy(Policy.newBuilder().build())
  * .setUpdateMask(FieldMask.newBuilder().build())
  * .build();
@@ -3174,7 +3189,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
  * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
  * SetIamPolicyRequest request =
  * SetIamPolicyRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .setPolicy(Policy.newBuilder().build())
  * .setUpdateMask(FieldMask.newBuilder().build())
  * .build();
@@ -3201,7 +3216,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
  * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
  * GetIamPolicyRequest request =
  * GetIamPolicyRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .setOptions(GetPolicyOptions.newBuilder().build())
  * .build();
  * Policy response = subscriptionAdminClient.getIamPolicy(request);
@@ -3253,7 +3268,7 @@ public final Policy getIamPolicy(String resource) {
  * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
  * GetIamPolicyRequest request =
  * GetIamPolicyRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .setOptions(GetPolicyOptions.newBuilder().build())
  * .build();
  * ApiFuture<Policy> future = subscriptionAdminClient.getIamPolicyCallable().futureCall(request);
@@ -3283,7 +3298,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
  * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
  * TestIamPermissionsRequest request =
  * TestIamPermissionsRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .addAllPermissions(new ArrayList<String>())
  * .build();
  * TestIamPermissionsResponse response = subscriptionAdminClient.testIamPermissions(request);
@@ -3352,7 +3367,7 @@ public final TestIamPermissionsResponse testIamPermissions(
  * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
  * TestIamPermissionsRequest request =
  * TestIamPermissionsRequest.newBuilder()
- * .setResource(ProjectName.of("[PROJECT]").toString())
+ * .setResource(SchemaName.of("[PROJECT]", "[SCHEMA]").toString())
  * .addAllPermissions(new ArrayList<String>())
  * .build();
  * ApiFuture<TestIamPermissionsResponse> future =

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminSettings.java

@@ -24,6 +24,7 @@
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ClientSettings;
@@ -226,11 +227,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
  return SubscriberStubSettings.defaultCredentialsProviderBuilder();
  }
 
- /** Returns a builder for the default ChannelProvider for this service. */
+ /** Returns a builder for the default gRPC ChannelProvider for this service. */
  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
  return SubscriberStubSettings.defaultGrpcTransportProviderBuilder();
  }
 
+ /** Returns a builder for the default REST ChannelProvider for this service. */
+ @BetaApi
+ public static InstantiatingHttpJsonChannelProvider.Builder
+ defaultHttpJsonTransportProviderBuilder() {
+ return SubscriberStubSettings.defaultHttpJsonTransportProviderBuilder();
+ }
+
  public static TransportChannelProvider defaultTransportChannelProvider() {
  return SubscriberStubSettings.defaultTransportChannelProvider();
  }
@@ -240,11 +248,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
  return SubscriberStubSettings.defaultApiClientHeaderProviderBuilder();
  }
 
- /** Returns a new builder for this class. */
+ /** Returns a new gRPC builder for this class. */
  public static Builder newBuilder() {
  return Builder.createDefault();
  }
 
+ /** Returns a new REST builder for this class. */
+ @BetaApi
+ public static Builder newHttpJsonBuilder() {
+ return Builder.createHttpJsonDefault();
+ }
+
  /** Returns a new builder for this class. */
  public static Builder newBuilder(ClientContext clientContext) {
  return new Builder(clientContext);
@@ -282,6 +296,11 @@ private static Builder createDefault() {
  return new Builder(SubscriberStubSettings.newBuilder());
  }
 
+ @BetaApi
+ private static Builder createHttpJsonDefault() {
+ return new Builder(SubscriberStubSettings.newHttpJsonBuilder());
+ }
+
  public SubscriberStubSettings.Builder getStubSettingsBuilder() {
  return ((SubscriberStubSettings.Builder) getStubSettings());
  }