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

- [ ] 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

@@ -22,20 +22,20 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-gke-multi-cloud</artifactId>
- <version>0.1.0</version>
+ <version>0.1.1</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-gke-multi-cloud:0.1.0'
+implementation 'com.google.cloud:google-cloud-gke-multi-cloud:0.1.1'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-gke-multi-cloud" % "0.1.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-gke-multi-cloud" % "0.1.1"
 ```
 
 ## Authentication

google-cloud-gke-multi-cloud/pom.xml

@@ -58,6 +58,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>
@@ -77,12 +81,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-gke-multi-cloud/src/main/java/com/google/cloud/gkemulticloud/v1/AwsClustersClient.java

@@ -19,6 +19,7 @@
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.httpjson.longrunning.OperationsClient;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.AbstractFixedSizeCollection;
 import com.google.api.gax.paging.AbstractPage;
@@ -30,7 +31,6 @@
 import com.google.cloud.gkemulticloud.v1.stub.AwsClustersStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.longrunning.Operation;
-import com.google.longrunning.OperationsClient;
 import com.google.protobuf.Empty;
 import com.google.protobuf.FieldMask;
 import java.io.IOException;
@@ -103,13 +103,28 @@
  * AwsClustersClient awsClustersClient = AwsClustersClient.create(awsClustersSettings);
  * }</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.
+ * AwsClustersSettings awsClustersSettings =
+ * AwsClustersSettings.newBuilder()
+ * .setTransportChannelProvider(
+ * AwsClustersSettings.defaultHttpJsonTransportProviderBuilder().build())
+ * .build();
+ * AwsClustersClient awsClustersClient = AwsClustersClient.create(awsClustersSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")
 public class AwsClustersClient implements BackgroundResource {
  private final AwsClustersSettings settings;
  private final AwsClustersStub stub;
- private final OperationsClient operationsClient;
+ private final OperationsClient httpJsonOperationsClient;
+ private final com.google.longrunning.OperationsClient operationsClient;
 
  /** Constructs an instance of AwsClustersClient with default settings. */
  public static final AwsClustersClient create() throws IOException {
@@ -140,13 +155,17 @@ public static final AwsClustersClient create(AwsClustersStub stub) {
  protected AwsClustersClient(AwsClustersSettings settings) throws IOException {
  this.settings = settings;
  this.stub = ((AwsClustersStubSettings) settings.getStubSettings()).createStub();
- this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
+ this.operationsClient =
+ com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
+ this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
  }
 
  protected AwsClustersClient(AwsClustersStub stub) {
  this.settings = null;
  this.stub = stub;
- this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
+ this.operationsClient =
+ com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
+ this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
  }
 
  public final AwsClustersSettings getSettings() {
@@ -161,10 +180,18 @@ public AwsClustersStub getStub() {
  * Returns the OperationsClient that can be used to query the status of a long-running operation
  * returned by another API method call.
  */
- public final OperationsClient getOperationsClient() {
+ public final com.google.longrunning.OperationsClient getOperationsClient() {
  return operationsClient;
  }
 
+ /**
+ * Returns the OperationsClient that can be used to query the status of a long-running operation
+ * returned by another API method call.
+ */
+ public final OperationsClient getHttpJsonOperationsClient() {
+ return httpJsonOperationsClient;
+ }
+
  // AUTO-GENERATED DOCUMENTATION AND METHOD.
  /**
  * Creates a new [AwsCluster][google.cloud.gkemulticloud.v1.AwsCluster] resource on a given GCP

google-cloud-gke-multi-cloud/src/main/java/com/google/cloud/gkemulticloud/v1/AwsClustersSettings.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;
@@ -200,11 +201,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
  return AwsClustersStubSettings.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 AwsClustersStubSettings.defaultGrpcTransportProviderBuilder();
  }
 
+ /** Returns a builder for the default REST ChannelProvider for this service. */
+ @BetaApi
+ public static InstantiatingHttpJsonChannelProvider.Builder
+ defaultHttpJsonTransportProviderBuilder() {
+ return AwsClustersStubSettings.defaultHttpJsonTransportProviderBuilder();
+ }
+
  public static TransportChannelProvider defaultTransportChannelProvider() {
  return AwsClustersStubSettings.defaultTransportChannelProvider();
  }
@@ -214,11 +222,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
  return AwsClustersStubSettings.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);
@@ -256,6 +270,11 @@ private static Builder createDefault() {
  return new Builder(AwsClustersStubSettings.newBuilder());
  }
 
+ @BetaApi
+ private static Builder createHttpJsonDefault() {
+ return new Builder(AwsClustersStubSettings.newHttpJsonBuilder());
+ }
+
  public AwsClustersStubSettings.Builder getStubSettingsBuilder() {
  return ((AwsClustersStubSettings.Builder) getStubSettings());
  }

google-cloud-gke-multi-cloud/src/main/java/com/google/cloud/gkemulticloud/v1/AzureClustersClient.java

@@ -19,6 +19,7 @@
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.httpjson.longrunning.OperationsClient;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.AbstractFixedSizeCollection;
 import com.google.api.gax.paging.AbstractPage;
@@ -30,7 +31,6 @@
 import com.google.cloud.gkemulticloud.v1.stub.AzureClustersStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.longrunning.Operation;
-import com.google.longrunning.OperationsClient;
 import com.google.protobuf.Empty;
 import com.google.protobuf.FieldMask;
 import java.io.IOException;
@@ -103,13 +103,28 @@
  * AzureClustersClient azureClustersClient = AzureClustersClient.create(azureClustersSettings);
  * }</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.
+ * AzureClustersSettings azureClustersSettings =
+ * AzureClustersSettings.newBuilder()
+ * .setTransportChannelProvider(
+ * AzureClustersSettings.defaultHttpJsonTransportProviderBuilder().build())
+ * .build();
+ * AzureClustersClient azureClustersClient = AzureClustersClient.create(azureClustersSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")
 public class AzureClustersClient implements BackgroundResource {
  private final AzureClustersSettings settings;
  private final AzureClustersStub stub;
- private final OperationsClient operationsClient;
+ private final OperationsClient httpJsonOperationsClient;
+ private final com.google.longrunning.OperationsClient operationsClient;
 
  /** Constructs an instance of AzureClustersClient with default settings. */
  public static final AzureClustersClient create() throws IOException {
@@ -141,13 +156,17 @@ public static final AzureClustersClient create(AzureClustersStub stub) {
  protected AzureClustersClient(AzureClustersSettings settings) throws IOException {
  this.settings = settings;
  this.stub = ((AzureClustersStubSettings) settings.getStubSettings()).createStub();
- this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
+ this.operationsClient =
+ com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
+ this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
  }
 
  protected AzureClustersClient(AzureClustersStub stub) {
  this.settings = null;
  this.stub = stub;
- this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
+ this.operationsClient =
+ com.google.longrunning.OperationsClient.create(this.stub.getOperationsStub());
+ this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub());
  }
 
  public final AzureClustersSettings getSettings() {
@@ -162,10 +181,18 @@ public AzureClustersStub getStub() {
  * Returns the OperationsClient that can be used to query the status of a long-running operation
  * returned by another API method call.
  */
- public final OperationsClient getOperationsClient() {
+ public final com.google.longrunning.OperationsClient getOperationsClient() {
  return operationsClient;
  }
 
+ /**
+ * Returns the OperationsClient that can be used to query the status of a long-running operation
+ * returned by another API method call.
+ */
+ public final OperationsClient getHttpJsonOperationsClient() {
+ return httpJsonOperationsClient;
+ }
+
  // AUTO-GENERATED DOCUMENTATION AND METHOD.
  /**
  * Creates a new [AzureClient][google.cloud.gkemulticloud.v1.AzureClient] resource on a given

google-cloud-gke-multi-cloud/src/main/java/com/google/cloud/gkemulticloud/v1/AzureClustersSettings.java

@@ -25,6 +25,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;
@@ -236,11 +237,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
  return AzureClustersStubSettings.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 AzureClustersStubSettings.defaultGrpcTransportProviderBuilder();
  }
 
+ /** Returns a builder for the default REST ChannelProvider for this service. */
+ @BetaApi
+ public static InstantiatingHttpJsonChannelProvider.Builder
+ defaultHttpJsonTransportProviderBuilder() {
+ return AzureClustersStubSettings.defaultHttpJsonTransportProviderBuilder();
+ }
+
  public static TransportChannelProvider defaultTransportChannelProvider() {
  return AzureClustersStubSettings.defaultTransportChannelProvider();
  }
@@ -250,11 +258,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
  return AzureClustersStubSettings.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);
@@ -292,6 +306,11 @@ private static Builder createDefault() {
  return new Builder(AzureClustersStubSettings.newBuilder());
  }
 
+ @BetaApi
+ private static Builder createHttpJsonDefault() {
+ return new Builder(AzureClustersStubSettings.newHttpJsonBuilder());
+ }
+
  public AzureClustersStubSettings.Builder getStubSettingsBuilder() {
  return ((AzureClustersStubSettings.Builder) getStubSettings());
  }

google-cloud-gke-multi-cloud/src/main/java/com/google/cloud/gkemulticloud/v1/stub/AwsClustersStub.java

@@ -56,7 +56,11 @@
 public abstract class AwsClustersStub implements BackgroundResource {
 
  public OperationsStub getOperationsStub() {
- throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
+ return null;
+ }
+
+ public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() {
+ return null;
  }
 
  public OperationCallable<CreateAwsClusterRequest, AwsCluster, OperationMetadata>