apache#2996 Rollback apache#2956

seoeun25 · Dec 24, 2019 · fc51fad · fc51fad
1 parent 0d4f2cc
commit fc51fad
Show file tree

Hide file tree

Showing 7 changed files with 173 additions and 342 deletions.
diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/SequenceWrapper.java b/java-util/src/main/java/io/druid/java/util/common/guava/SequenceWrapper.java
diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/Sequences.java b/java-util/src/main/java/io/druid/java/util/common/guava/Sequences.java
@@ -15,7 +15,6 @@
 package io.druid.java.util.common.guava;
 
 import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
@@ -44,6 +43,7 @@ public static <T> Sequence<T> empty()
     return (Sequence<T>) EMPTY_SEQUENCE;
   }
 
+  @SafeVarargs
   public static <T> Sequence<T> concat(Sequence<T>... sequences)
   {
     return concat(Arrays.asList(sequences));
@@ -79,17 +79,6 @@ public static <T> Sequence<T> withBaggage(final Sequence<T> seq, Closeable bagga
     return new ResourceClosingSequence<>(seq, baggage);
   }
 
-  /**
-   * Allows to execute something before, after or around the processing of the given sequence. See documentation to
-   * {@link SequenceWrapper} methods for some details.
-   */
-  public static <T> Sequence<T> wrap(Sequence<T> seq, SequenceWrapper wrapper)
-  {
-    Preconditions.checkNotNull(seq, "seq");
-    Preconditions.checkNotNull(wrapper, "wrapper");
-    return new WrappingSequence<>(seq, wrapper);
-  }
-
   public static <T> Sequence<T> withEffect(final Sequence <T> seq, final Runnable effect, final Executor exec)
   {
     return new Sequence<T>()

diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/WrappingSequence.java b/java-util/src/main/java/io/druid/java/util/common/guava/WrappingSequence.java
diff --git a/java-util/src/main/java/io/druid/java/util/common/guava/WrappingYielder.java b/java-util/src/main/java/io/druid/java/util/common/guava/WrappingYielder.java