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

- [ ] Regenerate this pull request now. PiperOrigin-RevId: 456641589 Source-Link: googleapis/googleapis@8a251f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ca52a529cf01308d9714950edffbea3560cfbdb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGNhNTJhNTI5Y2YwMTMwOGQ5NzE0OTUwZWRmZmJlYTM1NjBjZmJkYiJ9

Author: gcf-owl-bot[bot]

README.md

@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-iot'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-iot:2.2.0'
+implementation 'com.google.cloud:google-cloud-iot:2.2.1'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-iot" % "2.2.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-iot" % "2.2.1"
 ```
 
 ## Authentication

google-cloud-iot/pom.xml

@@ -62,6 +62,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>
@@ -85,12 +89,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>
 
  <profiles>

google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerClient.java

@@ -106,6 +106,20 @@
  * DeviceManagerClient deviceManagerClient = DeviceManagerClient.create(deviceManagerSettings);
  * }</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.
+ * DeviceManagerSettings deviceManagerSettings =
+ * DeviceManagerSettings.newBuilder()
+ * .setTransportChannelProvider(
+ * DeviceManagerSettings.defaultHttpJsonTransportProviderBuilder().build())
+ * .build();
+ * DeviceManagerClient deviceManagerClient = DeviceManagerClient.create(deviceManagerSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")

google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerSettings.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;
@@ -211,11 +212,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
  return DeviceManagerStubSettings.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 DeviceManagerStubSettings.defaultGrpcTransportProviderBuilder();
  }
 
+ /** Returns a builder for the default REST ChannelProvider for this service. */
+ @BetaApi
+ public static InstantiatingHttpJsonChannelProvider.Builder
+ defaultHttpJsonTransportProviderBuilder() {
+ return DeviceManagerStubSettings.defaultHttpJsonTransportProviderBuilder();
+ }
+
  public static TransportChannelProvider defaultTransportChannelProvider() {
  return DeviceManagerStubSettings.defaultTransportChannelProvider();
  }
@@ -225,11 +233,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
  return DeviceManagerStubSettings.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);
@@ -267,6 +281,11 @@ private static Builder createDefault() {
  return new Builder(DeviceManagerStubSettings.newBuilder());
  }
 
+ @BetaApi
+ private static Builder createHttpJsonDefault() {
+ return new Builder(DeviceManagerStubSettings.newHttpJsonBuilder());
+ }
+
  public DeviceManagerStubSettings.Builder getStubSettingsBuilder() {
  return ((DeviceManagerStubSettings.Builder) getStubSettings());
  }

google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/DeviceManagerStubSettings.java

@@ -28,6 +28,9 @@
 import com.google.api.gax.grpc.GaxGrpcProperties;
 import com.google.api.gax.grpc.GrpcTransportChannel;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.GaxHttpJsonProperties;
+import com.google.api.gax.httpjson.HttpJsonTransportChannel;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
@@ -391,6 +394,11 @@ public DeviceManagerStub createStub() throws IOException {
  .equals(GrpcTransportChannel.getGrpcTransportName())) {
  return GrpcDeviceManagerStub.create(this);
  }
+ if (getTransportChannelProvider()
+ .getTransportName()
+ .equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
+ return HttpJsonDeviceManagerStub.create(this);
+ }
  throw new UnsupportedOperationException(
  String.format(
  "Transport not supported: %s", getTransportChannelProvider().getTransportName()));
@@ -423,30 +431,56 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
  .setUseJwtAccessWithScope(true);
  }
 
- /** 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 InstantiatingGrpcChannelProvider.newBuilder()
  .setMaxInboundMessageSize(Integer.MAX_VALUE);
  }
 
+ /** Returns a builder for the default REST ChannelProvider for this service. */
+ @BetaApi
+ public static InstantiatingHttpJsonChannelProvider.Builder
+ defaultHttpJsonTransportProviderBuilder() {
+ return InstantiatingHttpJsonChannelProvider.newBuilder();
+ }
+
  public static TransportChannelProvider defaultTransportChannelProvider() {
  return defaultGrpcTransportProviderBuilder().build();
  }
 
  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
- public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+ public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
  return ApiClientHeaderProvider.newBuilder()
  .setGeneratedLibToken(
  "gapic", GaxProperties.getLibraryVersion(DeviceManagerStubSettings.class))
  .setTransportToken(
  GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
  }
 
- /** Returns a new builder for this class. */
+ @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+ public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
+ return ApiClientHeaderProvider.newBuilder()
+ .setGeneratedLibToken(
+ "gapic", GaxProperties.getLibraryVersion(DeviceManagerStubSettings.class))
+ .setTransportToken(
+ GaxHttpJsonProperties.getHttpJsonTokenName(),
+ GaxHttpJsonProperties.getHttpJsonVersion());
+ }
+
+ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+ return DeviceManagerStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
+ }
+
+ /** Returns a new gRPC builder for this class. */
  public static Builder newBuilder() {
  return Builder.createDefault();
  }
 
+ /** Returns a new REST builder for this class. */
+ public static Builder newHttpJsonBuilder() {
+ return Builder.createHttpJsonDefault();
+ }
+
  /** Returns a new builder for this class. */
  public static Builder newBuilder(ClientContext clientContext) {
  return new Builder(clientContext);
@@ -694,6 +728,19 @@ private static Builder createDefault() {
  return initDefaults(builder);
  }
 
+ private static Builder createHttpJsonDefault() {
+ Builder builder = new Builder(((ClientContext) null));
+
+ builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
+ builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
+ builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
+ builder.setEndpoint(getDefaultEndpoint());
+ builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
+ builder.setSwitchToMtlsEndpointAllowed(true);
+
+ return initDefaults(builder);
+ }
+
  private static Builder initDefaults(Builder builder) {
  builder
  .createDeviceRegistrySettings()

google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/HttpJsonDeviceManagerCallableFactory.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package com.google.cloud.iot.v1.stub;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.httpjson.HttpJsonCallSettings;
+import com.google.api.gax.httpjson.HttpJsonCallableFactory;
+import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
+import com.google.api.gax.httpjson.HttpJsonStubCallableFactory;
+import com.google.api.gax.httpjson.longrunning.stub.OperationsStub;
+import com.google.api.gax.rpc.BatchingCallSettings;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.OperationCallSettings;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallable;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.longrunning.Operation;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS.
+/**
+ * REST callable factory implementation for the DeviceManager service API.
+ *
+ * <p>This class is for advanced usage.
+ */
+@Generated("by gapic-generator-java")
+@BetaApi
+public class HttpJsonDeviceManagerCallableFactory
+ implements HttpJsonStubCallableFactory<Operation, OperationsStub> {
+
+ @Override
+ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCallable(
+ HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
+ UnaryCallSettings<RequestT, ResponseT> callSettings,
+ ClientContext clientContext) {
+ return HttpJsonCallableFactory.createUnaryCallable(
+ httpJsonCallSettings, callSettings, clientContext);
+ }
+
+ @Override
+ public <RequestT, ResponseT, PagedListResponseT>
+ UnaryCallable<RequestT, PagedListResponseT> createPagedCallable(
+ HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
+ PagedCallSettings<RequestT, ResponseT, PagedListResponseT> callSettings,
+ ClientContext clientContext) {
+ return HttpJsonCallableFactory.createPagedCallable(
+ httpJsonCallSettings, callSettings, clientContext);
+ }
+
+ @Override
+ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCallable(
+ HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
+ BatchingCallSettings<RequestT, ResponseT> callSettings,
+ ClientContext clientContext) {
+ return HttpJsonCallableFactory.createBatchingCallable(
+ httpJsonCallSettings, callSettings, clientContext);
+ }
+
+ @BetaApi(
+ "The surface for long-running operations is not stable yet and may change in the future.")
+ @Override
+ public <RequestT, ResponseT, MetadataT>
+ OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
+ HttpJsonCallSettings<RequestT, Operation> httpJsonCallSettings,
+ OperationCallSettings<RequestT, ResponseT, MetadataT> callSettings,
+ ClientContext clientContext,
+ OperationsStub operationsStub) {
+ UnaryCallable<RequestT, Operation> innerCallable =
+ HttpJsonCallableFactory.createBaseUnaryCallable(
+ httpJsonCallSettings, callSettings.getInitialCallSettings(), clientContext);
+ HttpJsonOperationSnapshotCallable<RequestT, Operation> initialCallable =
+ new HttpJsonOperationSnapshotCallable<RequestT, Operation>(
+ innerCallable,
+ httpJsonCallSettings.getMethodDescriptor().getOperationSnapshotFactory());
+ return HttpJsonCallableFactory.createOperationCallable(
+ callSettings, clientContext, operationsStub.longRunningClient(), initialCallable);
+ }
+
+ @Override
+ public <RequestT, ResponseT>
+ ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
+ HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
+ ServerStreamingCallSettings<RequestT, ResponseT> callSettings,
+ ClientContext clientContext) {
+ return HttpJsonCallableFactory.createServerStreamingCallable(
+ httpJsonCallSettings, callSettings, clientContext);
+ }
+}