From 5ca9afd75b2011fbfdd808658bffa6b0f3417d13 Mon Sep 17 00:00:00 2001
From: Daniel Collins <dpcollins@google.com>
Date: Mon, 28 Sep 2020 12:17:19 -0400
Subject: [PATCH] fix: Make BufferingPullSubscriber use List instead of
 ImmutableList so it is beam friendly.

---
 .../cloud/pubsublite/internal/BufferingPullSubscriber.java  | 6 +++---
 .../google/cloud/pubsublite/internal/PullSubscriber.java    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriber.java b/google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriber.java
index 6a6fda24e..9132bc40f 100644
--- a/google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriber.java
+++ b/google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriber.java
@@ -25,10 +25,10 @@
 import com.google.cloud.pubsublite.proto.FlowControlRequest;
 import com.google.cloud.pubsublite.proto.SeekRequest;
 import com.google.cloud.pubsublite.proto.SeekRequest.NamedTarget;
-import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.MoreExecutors;
 import io.grpc.StatusException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicReference;
@@ -75,7 +75,7 @@ public void failed(State state, Throwable throwable) {
   }
 
   @Override
-  public ImmutableList<SequencedMessage> pull() throws StatusException {
+  public List<SequencedMessage> pull() throws StatusException {
     @Nullable StatusException maybeError = error.get();
     if (maybeError != null) {
       throw maybeError;
@@ -88,7 +88,7 @@ public ImmutableList<SequencedMessage> pull() throws StatusException {
             .setAllowedBytes(bytes)
             .setAllowedMessages(collection.size())
             .build());
-    return ImmutableList.copyOf(collection);
+    return collection;
   }
 
   @Override
diff --git a/google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/PullSubscriber.java b/google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/PullSubscriber.java
index 9b8540878..bfe6d8783 100644
--- a/google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/PullSubscriber.java
+++ b/google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/PullSubscriber.java
@@ -16,11 +16,11 @@
 
 package com.google.cloud.pubsublite.internal;
 
-import com.google.common.collect.ImmutableList;
 import io.grpc.StatusException;
+import java.util.List;
 
 // A PullSubscriber exposes a "pull" mechanism for retrieving messages.
 public interface PullSubscriber<T> extends AutoCloseable {
   // Pull currently available messages from this subscriber. Does not block.
-  ImmutableList<T> pull() throws StatusException;
+  List<T> pull() throws StatusException;
 }