Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,49 @@

import com.google.api.core.BetaApi;
import java.io.InputStream;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

/**
* A ResumableUploadCallable is an API-transport-independent wrapper for the Resumable Upload
* protocol. Operates directly on the request object and input stream payload.
*
* @param <RequestT> request type
* @param <ResponseT> response type
* @param <RequestT> the type of the initial request message that initiates the upload session
* @param <ResponseT> the type of the final response message returned once the upload completes
*/
@BetaApi
@NullMarked
public abstract class ResumableUploadCallable<RequestT, ResponseT> {

protected ResumableUploadCallable() {}

/**
* Performs a new resumable upload asynchronously.
*
* <p>The provided {@code payload} stream is consumed asynchronously by the returned {@link
* ResumableUploadFuture} and will be closed automatically upon completion, failure, or
* cancellation.
*
* @param request the request message
* @param payload the data payload input stream
* @param payload the data payload input stream to upload and close
* @param settings call settings overrides; may be {@code null}
* @return future for tracking and controlling the upload
*/
public abstract ResumableUploadFuture<ResponseT> futureCall(
RequestT request, InputStream payload, ResumableUploadCallSettings settings);
RequestT request, InputStream payload, @Nullable ResumableUploadCallSettings settings);

/**
* Resumes an existing resumable upload session asynchronously using a saved session URL.
*
* <p>The provided {@code payload} stream is consumed asynchronously by the returned {@link
* ResumableUploadFuture} and will be closed automatically upon completion, failure, or
* cancellation.
*
* @param sessionUrl the upload session URL
* @param payload the data payload input stream
* @param payload the data payload input stream to upload and close
* @param settings call settings overrides; may be {@code null}
* @return future for tracking and controlling the upload
*/
public abstract ResumableUploadFuture<ResponseT> resumeCall(
String sessionUrl, InputStream payload, ResumableUploadCallSettings settings);
String sessionUrl, InputStream payload, @Nullable ResumableUploadCallSettings settings);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/*
* Copyright 2026 Google LLC
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google LLC nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.google.api.gax.rpc;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.core.ApiFuture;
import com.google.api.core.ApiFutures;
import com.google.api.core.BetaApi;
import com.google.api.core.InternalApi;
import com.google.api.gax.resumable.ResumableUploadClient;
import com.google.api.gax.resumable.ResumableUploadSession;
import java.io.InputStream;
import java.util.concurrent.ScheduledExecutorService;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

/**
* Concrete implementation of {@link ResumableUploadCallable} that delegates the end-to-end
* management of a resumable upload session to {@link ResumableUploadFutureImpl}.
*
* @param <RequestT> the type of the initial request message that initiates the upload session
* @param <ResponseT> the type of the final response message returned once the upload completes
*/
@BetaApi
@InternalApi
@NullMarked
public class ResumableUploadCallableImpl<RequestT, ResponseT>

Check warning on line 55 in sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ResumableUploadCallableImpl.java

View check run for this annotation

SonarQubeCloud / [gapic-generator-java-root] SonarCloud Code Analysis

Rename this generic name to match the regular expression '^[A-Z][0-9]?$'.

See more on https://sonarcloud.io/project/issues?id=googleapis_google-cloud-java_showcase&issues=AaBjHfHMrogTGW5ttZkL&open=AaBjHfHMrogTGW5ttZkL&pullRequest=14241

Check warning on line 55 in sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ResumableUploadCallableImpl.java

View check run for this annotation

SonarQubeCloud / [gapic-generator-java-root] SonarCloud Code Analysis

Rename this generic name to match the regular expression '^[A-Z][0-9]?$'.

See more on https://sonarcloud.io/project/issues?id=googleapis_google-cloud-java_showcase&issues=AaBjHfHMrogTGW5ttZkM&open=AaBjHfHMrogTGW5ttZkM&pullRequest=14241
extends ResumableUploadCallable<RequestT, ResponseT> {

private final ResumableUploadClient<RequestT, ResponseT> client;
private final ResumableUploadCallSettings defaultCallSettings;
private final ApiCallContext defaultCallContext;
private final ScheduledExecutorService executor;

public ResumableUploadCallableImpl(
ResumableUploadClient<RequestT, ResponseT> client,
ResumableUploadCallSettings defaultCallSettings,
ApiCallContext defaultCallContext,
ScheduledExecutorService executor) {
this.client = checkNotNull(client, "client must not be null");
this.defaultCallSettings =
checkNotNull(defaultCallSettings, "defaultCallSettings must not be null");
this.defaultCallContext =
checkNotNull(defaultCallContext, "defaultCallContext must not be null");
this.executor = checkNotNull(executor, "executor must not be null");
}

@Override
public ResumableUploadFuture<ResponseT> futureCall(
RequestT request, InputStream payload, @Nullable ResumableUploadCallSettings settings) {
checkNotNull(request, "request must not be null");
checkNotNull(payload, "payload must not be null");
ResumableUploadCallSettings effectiveSettings = defaultCallSettings.merge(settings);

ApiFuture<ResumableUploadSession> startFuture;
try {
startFuture = client.startUploadCallable().futureCall(request, defaultCallContext);
} catch (Throwable t) {

Check warning on line 86 in sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ResumableUploadCallableImpl.java

View check run for this annotation

SonarQubeCloud / [gapic-generator-java-root] SonarCloud Code Analysis

Catch Exception instead of Throwable.

See more on https://sonarcloud.io/project/issues?id=googleapis_google-cloud-java_showcase&issues=AaBt_534goxudivldlEW&open=AaBt_534goxudivldlEW&pullRequest=14241
startFuture = ApiFutures.immediateFailedFuture(t);
}

return ResumableUploadFutureImpl.create(
startFuture,
client.uploadChunkCallable(),
payload,
effectiveSettings,
defaultCallContext,
executor);
}

@Override
public ResumableUploadFuture<ResponseT> resumeCall(
String sessionUrl, InputStream payload, @Nullable ResumableUploadCallSettings settings) {
throw new UnsupportedOperationException("Session resumption is not yet implemented.");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
/*
* Copyright 2026 Google LLC
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google LLC nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.google.api.gax.rpc;

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.core.ApiFuture;
import com.google.api.core.ApiFutureCallback;
import com.google.api.core.ApiFutures;
import com.google.api.core.InternalApi;
import com.google.api.gax.resumable.ChunkUploadRequest;
import com.google.api.gax.resumable.ChunkUploadResponse;
import com.google.common.io.ByteStreams;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ScheduledExecutorService;
import org.jspecify.annotations.NullMarked;

/**
* Coordinates chunk transmission steps of a resumable upload session.
*
* @param <ResponseT> the type of the final response message returned once the upload completes
*/
@InternalApi
@NullMarked
final class ResumableUploadChunkCoordinator<ResponseT> {

Check warning on line 55 in sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ResumableUploadChunkCoordinator.java

View check run for this annotation

SonarQubeCloud / [gapic-generator-java-root] SonarCloud Code Analysis

Rename this generic name to match the regular expression '^[A-Z][0-9]?$'.

See more on https://sonarcloud.io/project/issues?id=googleapis_google-cloud-java_showcase&issues=AaBt_59HgoxudivldlEX&open=AaBt_59HgoxudivldlEX&pullRequest=14241

private static final byte[] EMPTY_PAYLOAD = new byte[0];

private final UnaryCallable<ChunkUploadRequest, ChunkUploadResponse<ResponseT>>
uploadChunkCallable;
private final String uploadUrl;
private final InputStream payload;
private final int chunkSize;
private final ApiCallContext callContext;
private final ScheduledExecutorService executor;
private final ResumableUploadFutureImpl<ResponseT> sessionFuture;

ResumableUploadChunkCoordinator(
UnaryCallable<ChunkUploadRequest, ChunkUploadResponse<ResponseT>> uploadChunkCallable,
String uploadUrl,
InputStream payload,
int chunkSize,
ApiCallContext callContext,
ScheduledExecutorService executor,
ResumableUploadFutureImpl<ResponseT> sessionFuture) {
this.uploadChunkCallable =
checkNotNull(uploadChunkCallable, "uploadChunkCallable must not be null");
this.uploadUrl = checkNotNull(uploadUrl, "uploadUrl must not be null");
this.payload = checkNotNull(payload, "payload must not be null");
this.chunkSize = chunkSize;
this.callContext = checkNotNull(callContext, "callContext must not be null");
this.executor = checkNotNull(executor, "executor must not be null");
this.sessionFuture = checkNotNull(sessionFuture, "sessionFuture must not be null");
}

void start() {
transmitChunk(0L);
}

private void transmitChunk(long currentOffset) {
// Abort if the session was already completed or canceled.
if (sessionFuture.isDone()) {
return;
}

// Read the next chunk slice from the payload stream.
byte[] buffer = new byte[chunkSize];
int bytesRead;
try {
bytesRead = ByteStreams.read(payload, buffer, 0, chunkSize);
} catch (IOException e) {
sessionFuture.fail(e);
return;
}

// Determine if this is the final chunk and build the chunk request.
boolean isFinal = bytesRead < chunkSize;
byte[] chunkPayload;
if (bytesRead == chunkSize) {
chunkPayload = buffer;
} else if (bytesRead == 0) {
chunkPayload = EMPTY_PAYLOAD;
} else {
chunkPayload = Arrays.copyOf(buffer, bytesRead);
}

ChunkUploadRequest chunkRequest =
ChunkUploadRequest.newBuilder()
.setUploadUrl(uploadUrl)
.setPayload(chunkPayload)
.setOffset(currentOffset)
.setFinal(isFinal)
.build();

// Dispatch the chunk upload call and register the in-flight future for cancellation.
long chunkLength = chunkPayload.length;
try {
ApiFuture<ChunkUploadResponse<ResponseT>> chunkFuture =
uploadChunkCallable.futureCall(chunkRequest, callContext);
sessionFuture.setInFlightFuture(chunkFuture);

// Asynchronously handle the response: complete, fail, or chain the next chunk.
ApiFutures.addCallback(
chunkFuture,
new ApiFutureCallback<ChunkUploadResponse<ResponseT>>() {
@Override
public void onSuccess(ChunkUploadResponse<ResponseT> response) {
if (sessionFuture.isDone()) {
return;
}
long nextOffset = currentOffset + chunkLength;
if (response.isComplete()) {
sessionFuture.succeed(response.getResponse());
} else if (isFinal) {
sessionFuture.fail(
new IllegalStateException(
"Upload stream ended and final chunk was transmitted, but server returned"
+ " incomplete status"));
} else {
transmitChunk(nextOffset);
}
}

@Override
public void onFailure(Throwable t) {
if (t instanceof CancellationException || sessionFuture.isDone()) {
return;
}
sessionFuture.fail(t);
}
},
executor);
} catch (Throwable t) {

Check warning on line 163 in sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ResumableUploadChunkCoordinator.java

View check run for this annotation

SonarQubeCloud / [gapic-generator-java-root] SonarCloud Code Analysis

Catch Exception instead of Throwable.

See more on https://sonarcloud.io/project/issues?id=googleapis_google-cloud-java_showcase&issues=AaBt_59HgoxudivldlEY&open=AaBt_59HgoxudivldlEY&pullRequest=14241
sessionFuture.fail(t);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,21 @@

import com.google.api.core.ApiFuture;
import com.google.api.core.BetaApi;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

/**
* A specialized {@link ApiFuture} for tracking and controlling an in-flight resumable upload.
*
* @param <ResponseT> response type
* <p>The payload {@link java.io.InputStream} supplied when initiating the upload is managed by this
* future and will be closed automatically upon completion, failure, or cancellation.
*
* @param <ResponseT> the type of the final response message returned once the upload completes
*/
@BetaApi
@NullMarked
public interface ResumableUploadFuture<ResponseT> extends ApiFuture<ResponseT> {

/** Returns the upload session URL, or {@code null} if session initiation is in progress. */
String getUploadSessionUrl();
@Nullable String getUploadSessionUrl();
}
Loading
Loading