chore: remove old appendble upload implementation

Author: BenWhitehead

google-cloud-storage/src/main/java/com/google/cloud/storage/BidiAppendableUnbufferedWritableByteChannel.java

@@ -17,8 +17,8 @@
 package com.google.cloud.storage;
 
 import com.google.cloud.BaseServiceException;
-import com.google.cloud.storage.BlobAppendableUploadImpl.AppendableUnbufferedWritableByteChannel;
 import com.google.cloud.storage.ChunkSegmenter.ChunkSegment;
+import com.google.cloud.storage.UnbufferedWritableByteChannelSession.UnbufferedWritableByteChannel;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.nio.ByteBuffer;
@@ -27,8 +27,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-final class BidiAppendableUnbufferedWritableByteChannel
-    implements AppendableUnbufferedWritableByteChannel {
+final class BidiAppendableUnbufferedWritableByteChannel implements UnbufferedWritableByteChannel {
 
   private final BidiUploadStreamingStream stream;
   private final ChunkSegmenter chunkSegmenter;

google-cloud-storage/src/main/java/com/google/cloud/storage/BidiBlobWriteSessionConfig.java

@@ -111,7 +111,8 @@ public WritableByteChannelSession<?, BlobInfo> writeSession(
                       GrpcStorageImpl grpc = (GrpcStorageImpl) s;
                       GrpcCallContext grpcCallContext =
                           opts.grpcMetadataMapper().apply(GrpcCallContext.createDefault());
-                      BidiWriteObjectRequest req = grpc.getBidiWriteObjectRequest(info, opts);
+                      BidiWriteObjectRequest req =
+                          grpc.getBidiWriteObjectRequest(info, opts, false);
 
                       ApiFuture<BidiResumableWrite> startResumableWrite =
                           grpc.startResumableWrite(grpcCallContext, req, opts);

google-cloud-storage/src/main/java/com/google/cloud/storage/BidiResumableWrite.java

@@ -94,73 +94,3 @@ static BidiResumableWrite identity(BidiResumableWrite w) {
     return w;
   }
 }
-
-final class BidiAppendableWrite implements BidiWriteObjectRequestBuilderFactory {
-
-  private final BidiWriteObjectRequest req;
-
-  public BidiAppendableWrite(BidiWriteObjectRequest req) {
-    this(req, false);
-  }
-
-  public BidiAppendableWrite(BidiWriteObjectRequest req, boolean takeOver) {
-    if (takeOver) {
-      this.req = req;
-    } else {
-      req =
-          req.toBuilder()
-              .setWriteObjectSpec(req.getWriteObjectSpec().toBuilder().setAppendable(true).build())
-              .build();
-      this.req = req;
-    }
-  }
-
-  public BidiWriteObjectRequest getReq() {
-    return req;
-  }
-
-  @Override
-  public BidiWriteObjectRequest.Builder newBuilder() {
-    return req.toBuilder();
-  }
-
-  @Override
-  public @Nullable String bucketName() {
-    if (req.hasWriteObjectSpec() && req.getWriteObjectSpec().hasResource()) {
-      return req.getWriteObjectSpec().getResource().getBucket();
-    } else if (req.hasAppendObjectSpec()) {
-      return req.getAppendObjectSpec().getBucket();
-    }
-    return null;
-  }
-
-  @Override
-  public String toString() {
-    return "BidiAppendableWrite{" + "req=" + fmtProto(req) + '}';
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof BidiAppendableWrite)) {
-      return false;
-    }
-    BidiAppendableWrite BidiAppendableWrite = (BidiAppendableWrite) o;
-    return Objects.equals(req, BidiAppendableWrite.getReq());
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(req);
-  }
-
-  /**
-   * Helper function which is more specific than {@link Function#identity()}. Constraining the input
-   * and output to be exactly {@link BidiAppendableWrite}.
-   */
-  static BidiAppendableWrite identity(BidiAppendableWrite w) {
-    return w;
-  }
-}

google-cloud-storage/src/main/java/com/google/cloud/storage/BlobAppendableUploadConfig.java

@@ -24,9 +24,6 @@
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.core.SettableApiFuture;
-import com.google.api.gax.retrying.BasicResultRetryAlgorithm;
-import com.google.api.gax.rpc.AbortedException;
-import com.google.api.gax.rpc.ApiException;
 import com.google.cloud.storage.BidiUploadState.AppendableUploadState;
 import com.google.cloud.storage.BidiUploadState.TakeoverAppendableUploadState;
 import com.google.cloud.storage.BlobAppendableUpload.AppendableUploadWriteableByteChannel;
@@ -36,9 +33,7 @@
 import com.google.cloud.storage.UnifiedOpts.ObjectTargetOpt;
 import com.google.cloud.storage.UnifiedOpts.Opts;
 import com.google.common.base.MoreObjects;
-import com.google.storage.v2.BidiWriteObjectRequest;
 import com.google.storage.v2.BidiWriteObjectResponse;
-import com.google.storage.v2.Object;
 import com.google.storage.v2.ServiceConstants.Values;
 import java.util.function.BiFunction;
 import javax.annotation.concurrent.Immutable;
@@ -60,20 +55,17 @@ public final class BlobAppendableUploadConfig {
       new BlobAppendableUploadConfig(
           FlushPolicy.minFlushSize(_256KiB),
           Hasher.enabled(),
-          CloseAction.CLOSE_WITHOUT_FINALIZING,
-          false);
+          CloseAction.CLOSE_WITHOUT_FINALIZING);
 
   private final FlushPolicy flushPolicy;
   private final Hasher hasher;
   private final CloseAction closeAction;
-  private final boolean newImpl;
 
   private BlobAppendableUploadConfig(
-      FlushPolicy flushPolicy, Hasher hasher, CloseAction closeAction, boolean newImpl) {
+      FlushPolicy flushPolicy, Hasher hasher, CloseAction closeAction) {
     this.flushPolicy = flushPolicy;
     this.hasher = hasher;
     this.closeAction = closeAction;
-    this.newImpl = newImpl;
   }
 
   /**
@@ -104,7 +96,7 @@ public BlobAppendableUploadConfig withFlushPolicy(FlushPolicy flushPolicy) {
     if (this.flushPolicy.equals(flushPolicy)) {
       return this;
     }
-    return new BlobAppendableUploadConfig(flushPolicy, hasher, closeAction, newImpl);
+    return new BlobAppendableUploadConfig(flushPolicy, hasher, closeAction);
   }
 
   /**
@@ -134,7 +126,7 @@ public BlobAppendableUploadConfig withCloseAction(CloseAction closeAction) {
     if (this.closeAction == closeAction) {
       return this;
     }
-    return new BlobAppendableUploadConfig(flushPolicy, hasher, closeAction, newImpl);
+    return new BlobAppendableUploadConfig(flushPolicy, hasher, closeAction);
   }
 
   /**
@@ -166,7 +158,7 @@ BlobAppendableUploadConfig withCrc32cValidationEnabled(boolean enabled) {
       return this;
     }
     return new BlobAppendableUploadConfig(
-        flushPolicy, enabled ? Hasher.enabled() : Hasher.noop(), closeAction, newImpl);
+        flushPolicy, enabled ? Hasher.enabled() : Hasher.noop(), closeAction);
   }
 
   /** Never to be made public until {@link Hasher} is public */
@@ -175,10 +167,6 @@ Hasher getHasher() {
     return hasher;
   }
 
-  BlobAppendableUploadConfig useNewImpl() {
-    return new BlobAppendableUploadConfig(flushPolicy, hasher, closeAction, true);
-  }
-
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
@@ -239,109 +227,50 @@ public enum CloseAction {
   }
 
   BlobAppendableUpload create(GrpcStorageImpl storage, BlobInfo info, Opts<ObjectTargetOpt> opts) {
-    if (newImpl) {
-      // TODO: make configurable
-      int maxRedirectsAllowed = 3;
-
-      long maxPendingBytes = this.getFlushPolicy().getMaxPendingBytes();
-      AppendableUploadState state = storage.getAppendableState(info, opts, maxPendingBytes);
-      WritableByteChannelSession<
-              AppendableObjectBufferedWritableByteChannel, BidiWriteObjectResponse>
-          build =
-              new AppendableSession(
-                  ApiFutures.immediateFuture(state),
-                  (start, resultFuture) -> {
-                    BidiUploadStreamingStream stream =
-                        new BidiUploadStreamingStream(
-                            start,
-                            storage.storageDataClient.executor,
-                            storage.storageClient.bidiWriteObjectCallable(),
-                            maxRedirectsAllowed,
-                            storage.storageDataClient.retryContextProvider.create());
-                    ChunkSegmenter chunkSegmenter =
-                        new ChunkSegmenter(
-                            Hasher.enabled(),
-                            ByteStringStrategy.copy(),
-                            Math.min(
-                                Values.MAX_WRITE_CHUNK_BYTES_VALUE,
-                                Math.toIntExact(maxPendingBytes)),
-                            /* blockSize= */ 1);
-                    BidiAppendableUnbufferedWritableByteChannel c;
-                    if (state instanceof TakeoverAppendableUploadState) {
-                      // start the takeover reconciliation
-                      stream.awaitTakeoverStateReconciliation();
-                      c =
-                          new BidiAppendableUnbufferedWritableByteChannel(
-                              stream, chunkSegmenter, state.getConfirmedBytes());
-                    } else {
-                      c =
-                          new BidiAppendableUnbufferedWritableByteChannel(
-                              stream, chunkSegmenter, 0);
-                    }
-                    return new AppendableObjectBufferedWritableByteChannel(
-                        flushPolicy.createBufferedChannel(c),
-                        c,
-                        this.closeAction == CloseAction.FINALIZE_WHEN_CLOSING,
-                        newImpl);
-                  },
-                  state.getResultFuture());
+    // TODO: make configurable
+    int maxRedirectsAllowed = 3;
 
-      return new BlobAppendableUploadImpl(
-          new DefaultBlobWriteSessionConfig.DecoratedWritableByteChannelSession<>(
-              build, BidiBlobWriteSessionConfig.Factory.WRITE_OBJECT_RESPONSE_BLOB_INFO_DECODER));
-    } else {
-      boolean takeOver = info.getGeneration() != null;
-      BidiWriteObjectRequest req =
-          takeOver
-              ? storage.getBidiWriteObjectRequestForTakeover(info, opts)
-              : storage.getBidiWriteObjectRequest(info, opts);
+    long maxPendingBytes = this.getFlushPolicy().getMaxPendingBytes();
+    AppendableUploadState state = storage.getAppendableState(info, opts, maxPendingBytes);
+    WritableByteChannelSession<AppendableObjectBufferedWritableByteChannel, BidiWriteObjectResponse>
+        build =
+            new AppendableSession(
+                ApiFutures.immediateFuture(state),
+                (start, resultFuture) -> {
+                  BidiUploadStreamingStream stream =
+                      new BidiUploadStreamingStream(
+                          start,
+                          storage.storageDataClient.executor,
+                          storage.storageClient.bidiWriteObjectCallable(),
+                          maxRedirectsAllowed,
+                          storage.storageDataClient.retryContextProvider.create());
+                  ChunkSegmenter chunkSegmenter =
+                      new ChunkSegmenter(
+                          Hasher.enabled(),
+                          ByteStringStrategy.copy(),
+                          Math.min(
+                              Values.MAX_WRITE_CHUNK_BYTES_VALUE, Math.toIntExact(maxPendingBytes)),
+                          /* blockSize= */ 1);
+                  BidiAppendableUnbufferedWritableByteChannel c;
+                  if (state instanceof TakeoverAppendableUploadState) {
+                    // start the takeover reconciliation
+                    stream.awaitTakeoverStateReconciliation();
+                    c =
+                        new BidiAppendableUnbufferedWritableByteChannel(
+                            stream, chunkSegmenter, state.getConfirmedBytes());
+                  } else {
+                    c = new BidiAppendableUnbufferedWritableByteChannel(stream, chunkSegmenter, 0);
+                  }
+                  return new AppendableObjectBufferedWritableByteChannel(
+                      flushPolicy.createBufferedChannel(c),
+                      c,
+                      this.closeAction == CloseAction.FINALIZE_WHEN_CLOSING);
+                },
+                state.getResultFuture());
 
-      BidiAppendableWrite baw = new BidiAppendableWrite(req, takeOver);
-
-      WritableByteChannelSession<
-              AppendableObjectBufferedWritableByteChannel, BidiWriteObjectResponse>
-          build =
-              ResumableMedia.gapic()
-                  .write()
-                  .bidiByteChannel(storage.storageClient.bidiWriteObjectCallable())
-                  .setHasher(this.getHasher())
-                  .setByteStringStrategy(ByteStringStrategy.copy())
-                  .appendable()
-                  .withRetryConfig(
-                      storage.retrier.withAlg(
-                          new BasicResultRetryAlgorithm<Object>() {
-                            @Override
-                            public boolean shouldRetry(
-                                Throwable previousThrowable, Object previousResponse) {
-                              // TODO: remove this later once the redirects are not handled by the
-                              // retry loop
-                              ApiException apiEx = null;
-                              if (previousThrowable instanceof StorageException) {
-                                StorageException se = (StorageException) previousThrowable;
-                                Throwable cause = se.getCause();
-                                if (cause instanceof ApiException) {
-                                  apiEx = (ApiException) cause;
-                                }
-                              }
-                              if (apiEx instanceof AbortedException) {
-                                return true;
-                              }
-                              return storage
-                                  .retryAlgorithmManager
-                                  .idempotent()
-                                  .shouldRetry(previousThrowable, null);
-                            }
-                          }))
-                  .buffered(this.getFlushPolicy())
-                  .setStartAsync(ApiFutures.immediateFuture(baw))
-                  .setGetCallable(storage.storageClient.getObjectCallable())
-                  .setFinalizeOnClose(this.closeAction == CloseAction.FINALIZE_WHEN_CLOSING)
-                  .build();
-
-      return new BlobAppendableUploadImpl(
-          new DefaultBlobWriteSessionConfig.DecoratedWritableByteChannelSession<>(
-              build, BidiBlobWriteSessionConfig.Factory.WRITE_OBJECT_RESPONSE_BLOB_INFO_DECODER));
-    }
+    return new BlobAppendableUploadImpl(
+        new DefaultBlobWriteSessionConfig.DecoratedWritableByteChannelSession<>(
+            build, BidiBlobWriteSessionConfig.Factory.WRITE_OBJECT_RESPONSE_BLOB_INFO_DECODER));
   }
 
   private static final class AppendableSession