feat(generator): activate resumable upload allowlist and regenerate showcase client

Author: whowes

java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ResumableUploadServiceClient.java

@@ -23,7 +23,9 @@
 import com.google.api.gax.paging.AbstractFixedSizeCollection;
 import com.google.api.gax.paging.AbstractPage;
 import com.google.api.gax.paging.AbstractPagedListResponse;
+import com.google.api.gax.rpc.ApiExceptions;
 import com.google.api.gax.rpc.PageContext;
+import com.google.api.gax.rpc.ResumableUploadCallable;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
@@ -38,6 +40,7 @@
 import com.google.showcase.v1beta1.stub.ResumableUploadServiceStub;
 import com.google.showcase.v1beta1.stub.ResumableUploadServiceStubSettings;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
@@ -59,8 +62,8 @@
  * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * try (ResumableUploadServiceClient resumableUploadServiceClient =
  *     ResumableUploadServiceClient.create()) {
- *   UploadMediaRequest request = UploadMediaRequest.newBuilder().setName("name3373707").build();
- *   UploadMediaResponse response = resumableUploadServiceClient.uploadMedia(request);
+ *   GetLocationRequest request = GetLocationRequest.newBuilder().setName("name3373707").build();
+ *   Location response = resumableUploadServiceClient.getLocation(request);
  * }
  * }</pre>
  *
@@ -81,7 +84,7 @@
  *      <td>
  *      <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
  *      <ul>
- *           <li><p> uploadMedia(UploadMediaRequest request)
+ *           <li><p> uploadMedia(UploadMediaRequest request, InputStream payload)
  *      </ul>
  *      <p>Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.</p>
  *      <ul>
@@ -277,51 +280,29 @@ public ResumableUploadServiceStub getStub() {
   /**
    * A method with media_upload annotation enabled.
    *
-   * <p>Sample code:
-   *
-   * <pre>{@code
-   * // This snippet has been automatically generated and should be regarded as a code template only.
-   * // It will require modifications to work:
-   * // - It may require correct/in-range values for request initialization.
-   * // - It may require specifying regional endpoints when creating the service client as shown in
-   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
-   * try (ResumableUploadServiceClient resumableUploadServiceClient =
-   *     ResumableUploadServiceClient.create()) {
-   *   UploadMediaRequest request = UploadMediaRequest.newBuilder().setName("name3373707").build();
-   *   UploadMediaResponse response = resumableUploadServiceClient.uploadMedia(request);
-   * }
-   * }</pre>
+   * <p>Call context overrides (such as withTimeout, withRetrySettings, or credentials) apply
+   * strictly to the start request (session initiation). Per-chunk PUT calls rely on the configured
+   * timeout and retry settings from ResumableUploadCallSettings.
    *
    * @param request The request object containing all of the parameters for the API call.
+   * @param payload The payload data stream to upload.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final UploadMediaResponse uploadMedia(UploadMediaRequest request) {
-    return uploadMediaCallable().call(request);
+  public final UploadMediaResponse uploadMedia(UploadMediaRequest request, InputStream payload) {
+    return ApiExceptions.callAndTranslateApiException(
+        uploadMediaCallable().futureCall(request, payload));
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * A method with media_upload annotation enabled.
    *
-   * <p>Sample code:
-   *
-   * <pre>{@code
-   * // This snippet has been automatically generated and should be regarded as a code template only.
-   * // It will require modifications to work:
-   * // - It may require correct/in-range values for request initialization.
-   * // - It may require specifying regional endpoints when creating the service client as shown in
-   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
-   * try (ResumableUploadServiceClient resumableUploadServiceClient =
-   *     ResumableUploadServiceClient.create()) {
-   *   UploadMediaRequest request = UploadMediaRequest.newBuilder().setName("name3373707").build();
-   *   ApiFuture<UploadMediaResponse> future =
-   *       resumableUploadServiceClient.uploadMediaCallable().futureCall(request);
-   *   // Do something.
-   *   UploadMediaResponse response = future.get();
-   * }
-   * }</pre>
+   * <p>Call context overrides (such as withTimeout, withRetrySettings, or credentials) apply
+   * strictly to the start request (session initiation). Per-chunk PUT calls rely on the configured
+   * timeout and retry settings from ResumableUploadCallSettings.
    */
-  public final UnaryCallable<UploadMediaRequest, UploadMediaResponse> uploadMediaCallable() {
+  public final ResumableUploadCallable<UploadMediaRequest, UploadMediaResponse>
+      uploadMediaCallable() {
     return stub.uploadMediaCallable();
   }
 

java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ResumableUploadServiceSettings.java

@@ -28,6 +28,7 @@
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ClientSettings;
 import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.ResumableUploadCallSettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnaryCallSettings;
 import com.google.cloud.location.GetLocationRequest;
@@ -63,7 +64,7 @@
  *
  * <p>For example, to set the
  * [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings)
- * of uploadMedia:
+ * of getLocation:
  *
  * <pre>{@code
  * // This snippet has been automatically generated and should be regarded as a code template only.
@@ -74,10 +75,10 @@
  * ResumableUploadServiceSettings.Builder resumableUploadServiceSettingsBuilder =
  *     ResumableUploadServiceSettings.newBuilder();
  * resumableUploadServiceSettingsBuilder
- *     .uploadMediaSettings()
+ *     .getLocationSettings()
  *     .setRetrySettings(
  *         resumableUploadServiceSettingsBuilder
- *             .uploadMediaSettings()
+ *             .getLocationSettings()
  *             .getRetrySettings()
  *             .toBuilder()
  *             .setInitialRetryDelayDuration(Duration.ofSeconds(1))
@@ -102,8 +103,13 @@
 @Generated("by gapic-generator-java")
 public class ResumableUploadServiceSettings extends ClientSettings<ResumableUploadServiceSettings> {
 
-  /** Returns the object with the settings used for calls to uploadMedia. */
-  public UnaryCallSettings<UploadMediaRequest, UploadMediaResponse> uploadMediaSettings() {
+  /**
+   * Returns the object with the settings used for calls to uploadMedia.
+   *
+   * <p>Note that custom retry settings and headers configured via ApiCallContext apply strictly to
+   * the initial session initiation request.
+   */
+  public ResumableUploadCallSettings uploadMediaSettings() {
     return ((ResumableUploadServiceStubSettings) getStubSettings()).uploadMediaSettings();
   }
 
@@ -247,9 +253,13 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
-    /** Returns the builder for the settings used for calls to uploadMedia. */
-    public UnaryCallSettings.Builder<UploadMediaRequest, UploadMediaResponse>
-        uploadMediaSettings() {
+    /**
+     * Returns the builder for the settings used for calls to uploadMedia.
+     *
+     * <p>Note that custom retry settings and headers configured via ApiCallContext apply strictly
+     * to the initial session initiation request.
+     */
+    public ResumableUploadCallSettings.Builder uploadMediaSettings() {
       return getStubSettingsBuilder().uploadMediaSettings();
     }
 

java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/package-info.java

@@ -137,8 +137,8 @@
  * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
  * try (ResumableUploadServiceClient resumableUploadServiceClient =
  *     ResumableUploadServiceClient.create()) {
- *   UploadMediaRequest request = UploadMediaRequest.newBuilder().setName("name3373707").build();
- *   UploadMediaResponse response = resumableUploadServiceClient.uploadMedia(request);
+ *   GetLocationRequest request = GetLocationRequest.newBuilder().setName("name3373707").build();
+ *   Location response = resumableUploadServiceClient.getLocation(request);
  * }
  * }</pre>
  *

java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcResumableUploadServiceStub.java

@@ -22,14 +22,21 @@
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
 import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcStatusCode;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.httpjson.HttpJsonCallContext;
+import com.google.api.gax.httpjson.HttpJsonTransportChannel;
+import com.google.api.gax.httpjson.ManagedHttpJsonChannel;
 import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.FailedPreconditionException;
 import com.google.api.gax.rpc.RequestParamsBuilder;
+import com.google.api.gax.rpc.ResumableUploadCallable;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
 import com.google.cloud.location.ListLocationsResponse;
 import com.google.cloud.location.Location;
+import com.google.common.collect.ImmutableList;
 import com.google.iam.v1.GetIamPolicyRequest;
 import com.google.iam.v1.Policy;
 import com.google.iam.v1.SetIamPolicyRequest;
@@ -39,11 +46,14 @@
 import com.google.showcase.v1beta1.UploadMediaRequest;
 import com.google.showcase.v1beta1.UploadMediaResponse;
 import io.grpc.MethodDescriptor;
+import io.grpc.Status;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS.
 /**
@@ -55,17 +65,6 @@
 @BetaApi
 @Generated("by gapic-generator-java")
 public class GrpcResumableUploadServiceStub extends ResumableUploadServiceStub {
-  private static final MethodDescriptor<UploadMediaRequest, UploadMediaResponse>
-      uploadMediaMethodDescriptor =
-          MethodDescriptor.<UploadMediaRequest, UploadMediaResponse>newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.showcase.v1beta1.ResumableUploadService/UploadMedia")
-              .setRequestMarshaller(ProtoUtils.marshaller(UploadMediaRequest.getDefaultInstance()))
-              .setResponseMarshaller(
-                  ProtoUtils.marshaller(UploadMediaResponse.getDefaultInstance()))
-              .setSampledToLocalTracing(true)
-              .build();
-
   private static final MethodDescriptor<ListLocationsRequest, ListLocationsResponse>
       listLocationsMethodDescriptor =
           MethodDescriptor.<ListLocationsRequest, ListLocationsResponse>newBuilder()
@@ -117,7 +116,6 @@ public class GrpcResumableUploadServiceStub extends ResumableUploadServiceStub {
               .setSampledToLocalTracing(true)
               .build();
 
-  private final UnaryCallable<UploadMediaRequest, UploadMediaResponse> uploadMediaCallable;
   private final UnaryCallable<ListLocationsRequest, ListLocationsResponse> listLocationsCallable;
   private final UnaryCallable<ListLocationsRequest, ListLocationsPagedResponse>
       listLocationsPagedCallable;
@@ -129,6 +127,7 @@ public class GrpcResumableUploadServiceStub extends ResumableUploadServiceStub {
 
   private final BackgroundResource backgroundResources;
   private final GrpcOperationsStub operationsStub;
+  private final @Nullable HttpJsonResumableUploadServiceResumableUploadStub resumableUploadStub;
   private final GrpcStubCallableFactory callableFactory;
 
   public static final GrpcResumableUploadServiceStub create(
@@ -171,10 +170,6 @@ protected GrpcResumableUploadServiceStub(
     this.callableFactory = callableFactory;
     this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
 
-    GrpcCallSettings<UploadMediaRequest, UploadMediaResponse> uploadMediaTransportSettings =
-        GrpcCallSettings.<UploadMediaRequest, UploadMediaResponse>newBuilder()
-            .setMethodDescriptor(uploadMediaMethodDescriptor)
-            .build();
     GrpcCallSettings<ListLocationsRequest, ListLocationsResponse> listLocationsTransportSettings =
         GrpcCallSettings.<ListLocationsRequest, ListLocationsResponse>newBuilder()
             .setMethodDescriptor(listLocationsMethodDescriptor)
@@ -230,9 +225,6 @@ protected GrpcResumableUploadServiceStub(
                 .setResourceNameExtractor(request -> request.getResource())
                 .build();
 
-    this.uploadMediaCallable =
-        callableFactory.createUnaryCallable(
-            uploadMediaTransportSettings, settings.uploadMediaSettings(), clientContext);
     this.listLocationsCallable =
         callableFactory.createUnaryCallable(
             listLocationsTransportSettings, settings.listLocationsSettings(), clientContext);
@@ -254,19 +246,51 @@ protected GrpcResumableUploadServiceStub(
             settings.testIamPermissionsSettings(),
             clientContext);
 
-    this.backgroundResources =
-        new BackgroundResourceAggregation(clientContext.getBackgroundResources());
+    if (clientContext.getCredentials() != null) {
+      ManagedHttpJsonChannel httpJsonManagedChannel =
+          ManagedHttpJsonChannel.newBuilder()
+              .setEndpoint(settings.getEndpoint())
+              .setExecutor(clientContext.getExecutor())
+              .build();
+      HttpJsonTransportChannel httpJsonTransportChannel =
+          HttpJsonTransportChannel.create(httpJsonManagedChannel);
+      ClientContext httpJsonClientContext =
+          ClientContext.newBuilder()
+              .setCredentials(clientContext.getCredentials())
+              .setEndpoint(settings.getEndpoint())
+              .setExecutor(clientContext.getExecutor())
+              .setHeaders(clientContext.getHeaders())
+              .setInternalHeaders(clientContext.getInternalHeaders())
+              .setClock(clientContext.getClock())
+              .setTransportChannel(httpJsonTransportChannel)
+              .setDefaultCallContext(
+                  HttpJsonCallContext.createDefault()
+                      .withTransportChannel(httpJsonTransportChannel))
+              .setBackgroundResources(Arrays.asList(httpJsonTransportChannel))
+              .build();
+      this.resumableUploadStub =
+          HttpJsonResumableUploadServiceResumableUploadStub.create(httpJsonClientContext, settings);
+    } else {
+      this.resumableUploadStub = null;
+    }
+
+    if (resumableUploadStub != null) {
+      this.backgroundResources =
+          new BackgroundResourceAggregation(
+              ImmutableList.<BackgroundResource>builder()
+                  .addAll(clientContext.getBackgroundResources())
+                  .add(resumableUploadStub)
+                  .build());
+    } else {
+      this.backgroundResources =
+          new BackgroundResourceAggregation(clientContext.getBackgroundResources());
+    }
   }
 
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
-  @Override
-  public UnaryCallable<UploadMediaRequest, UploadMediaResponse> uploadMediaCallable() {
-    return uploadMediaCallable;
-  }
-
   @Override
   public UnaryCallable<ListLocationsRequest, ListLocationsResponse> listLocationsCallable() {
     return listLocationsCallable;
@@ -299,6 +323,20 @@ public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
     return testIamPermissionsCallable;
   }
 
+  @Override
+  public ResumableUploadCallable<UploadMediaRequest, UploadMediaResponse> uploadMediaCallable() {
+    if (resumableUploadStub == null) {
+      throw new FailedPreconditionException(
+          "Resumable uploads execute over HTTP/REST and require credentials. The client was"
+              + " initialized with a pre-constructed gRPC Channel, from which credentials cannot be"
+              + " extracted. Please configure a CredentialsProvider instead.",
+          null,
+          GrpcStatusCode.of(Status.Code.FAILED_PRECONDITION),
+          false);
+    }
+    return resumableUploadStub.uploadMediaCallable();
+  }
+
   @Override
   public final void close() {
     try {