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

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

google-cloud-os-config/pom.xml

@@ -66,6 +66,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>
@@ -93,12 +97,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-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceClient.java

@@ -114,6 +114,21 @@
  * OsConfigServiceClient.create(osConfigServiceSettings);
  * }</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.
+ * OsConfigServiceSettings osConfigServiceSettings =
+ * OsConfigServiceSettings.newBuilder()
+ * .setTransportChannelProvider(
+ * OsConfigServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
+ * .build();
+ * OsConfigServiceClient osConfigServiceClient =
+ * OsConfigServiceClient.create(osConfigServiceSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")

google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceSettings.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;
@@ -184,11 +185,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
  return OsConfigServiceStubSettings.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 OsConfigServiceStubSettings.defaultGrpcTransportProviderBuilder();
  }
 
+ /** Returns a builder for the default REST ChannelProvider for this service. */
+ @BetaApi
+ public static InstantiatingHttpJsonChannelProvider.Builder
+ defaultHttpJsonTransportProviderBuilder() {
+ return OsConfigServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
+ }
+
  public static TransportChannelProvider defaultTransportChannelProvider() {
  return OsConfigServiceStubSettings.defaultTransportChannelProvider();
  }
@@ -198,11 +206,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
  return OsConfigServiceStubSettings.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);
@@ -240,6 +254,11 @@ private static Builder createDefault() {
  return new Builder(OsConfigServiceStubSettings.newBuilder());
  }
 
+ @BetaApi
+ private static Builder createHttpJsonDefault() {
+ return new Builder(OsConfigServiceStubSettings.newHttpJsonBuilder());
+ }
+
  public OsConfigServiceStubSettings.Builder getStubSettingsBuilder() {
  return ((OsConfigServiceStubSettings.Builder) getStubSettings());
  }

google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigZonalServiceClient.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.osconfig.v1.stub.OsConfigZonalServiceStubSettings;
 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;
@@ -110,13 +110,29 @@
  * OsConfigZonalServiceClient.create(osConfigZonalServiceSettings);
  * }</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.
+ * OsConfigZonalServiceSettings osConfigZonalServiceSettings =
+ * OsConfigZonalServiceSettings.newBuilder()
+ * .setTransportChannelProvider(
+ * OsConfigZonalServiceSettings.defaultHttpJsonTransportProviderBuilder().build())
+ * .build();
+ * OsConfigZonalServiceClient osConfigZonalServiceClient =
+ * OsConfigZonalServiceClient.create(osConfigZonalServiceSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")
 public class OsConfigZonalServiceClient implements BackgroundResource {
  private final OsConfigZonalServiceSettings settings;
  private final OsConfigZonalServiceStub stub;
- private final OperationsClient operationsClient;
+ private final OperationsClient httpJsonOperationsClient;
+ private final com.google.longrunning.OperationsClient operationsClient;
 
  /** Constructs an instance of OsConfigZonalServiceClient with default settings. */
  public static final OsConfigZonalServiceClient create() throws IOException {
@@ -148,13 +164,17 @@ public static final OsConfigZonalServiceClient create(OsConfigZonalServiceStub s
  protected OsConfigZonalServiceClient(OsConfigZonalServiceSettings settings) throws IOException {
  this.settings = settings;
  this.stub = ((OsConfigZonalServiceStubSettings) 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 OsConfigZonalServiceClient(OsConfigZonalServiceStub 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 OsConfigZonalServiceSettings getSettings() {
@@ -169,10 +189,18 @@ public OsConfigZonalServiceStub 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.
  /**
  * Create an OS policy assignment.

google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigZonalServiceSettings.java

@@ -27,6 +27,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;
@@ -219,11 +220,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
  return OsConfigZonalServiceStubSettings.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 OsConfigZonalServiceStubSettings.defaultGrpcTransportProviderBuilder();
  }
 
+ /** Returns a builder for the default REST ChannelProvider for this service. */
+ @BetaApi
+ public static InstantiatingHttpJsonChannelProvider.Builder
+ defaultHttpJsonTransportProviderBuilder() {
+ return OsConfigZonalServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
+ }
+
  public static TransportChannelProvider defaultTransportChannelProvider() {
  return OsConfigZonalServiceStubSettings.defaultTransportChannelProvider();
  }
@@ -233,11 +241,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
  return OsConfigZonalServiceStubSettings.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);
@@ -276,6 +290,11 @@ private static Builder createDefault() {
  return new Builder(OsConfigZonalServiceStubSettings.newBuilder());
  }
 
+ @BetaApi
+ private static Builder createHttpJsonDefault() {
+ return new Builder(OsConfigZonalServiceStubSettings.newHttpJsonBuilder());
+ }
+
  public OsConfigZonalServiceStubSettings.Builder getStubSettingsBuilder() {
  return ((OsConfigZonalServiceStubSettings.Builder) getStubSettings());
  }

google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/stub/HttpJsonOsConfigServiceCallableFactory.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.osconfig.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 OsConfigService service API.
+ *
+ * <p>This class is for advanced usage.
+ */
+@Generated("by gapic-generator-java")
+@BetaApi
+public class HttpJsonOsConfigServiceCallableFactory
+ 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);
+ }
+}