NO-JIRA replace MoreCollectors.join with String.join or Collectors.joining

2 files changed, 0 insertions, 62 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java b/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java
index b1476dd613a..82c8c807370 100644
--- a/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/stream/MoreCollectors.java
@@ -19,14 +19,11 @@
  */
 package org.sonar.core.util.stream;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSetMultimap;
-import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.BinaryOperator;
@@ -315,26 +312,4 @@ public final class MoreCollectors {
     requireNonNull(valueFunction, "Value function can't be null");
   }
 
-  /**
-   * Applies the specified {@link Joiner} to the current stream.
-   *
-   * @throws NullPointerException of {@code joiner} is {@code null}
-   * @throws IllegalStateException if a merge operation happens because parallel processing has been enabled on the current stream
-   */
-  public static <E> Collector<E, List<E>, String> join(Joiner joiner) {
-    requireNonNull(joiner, "Joiner can't be null");
-
-    return Collector.of(
-      ArrayList::new,
-      List::add,
-      mergeNotSupportedMerger(),
-      joiner::join);
-  }
-
-  public static <R> BinaryOperator<R> mergeNotSupportedMerger() {
-    return (m1, m2) -> {
-      throw new IllegalStateException("Parallel processing is not supported");
-    };
-  }
-
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java b/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java
index fa4a9cc8cd5..852fa744c88 100644
--- a/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/util/stream/MoreCollectorsTest.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.core.util.stream;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.SetMultimap;
 import java.util.Arrays;
@@ -39,7 +38,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.entry;
 import static org.sonar.core.util.stream.MoreCollectors.index;
-import static org.sonar.core.util.stream.MoreCollectors.join;
 import static org.sonar.core.util.stream.MoreCollectors.uniqueIndex;
 import static org.sonar.core.util.stream.MoreCollectors.unorderedFlattenIndex;
 import static org.sonar.core.util.stream.MoreCollectors.unorderedIndex;
@@ -512,41 +510,6 @@ public class MoreCollectorsTest {
     assertThat(multimap.keySet()).isEqualTo(HUGE_SET);
   }
 
-  @Test
-  public void join_on_empty_stream_returns_empty_string() {
-    assertThat(Stream.empty().collect(join(Joiner.on(",")))).isEmpty();
-  }
-
-  @Test
-  public void join_fails_with_NPE_if_joiner_is_null() {
-    assertThatThrownBy(() -> join(null))
-      .isInstanceOf(NullPointerException.class)
-      .hasMessage("Joiner can't be null");
-  }
-
-  @Test
-  public void join_applies_joiner_to_stream() {
-    assertThat(Stream.of("1", "2", "3", "4").collect(join(Joiner.on(","))))
-      .isEqualTo("1,2,3,4");
-  }
-
-  @Test
-  public void join_does_not_support_parallel_stream_and_fails_with_ISE() {
-    Stream<String> hugeStream = HUGE_LIST.parallelStream();
-
-    assertThatThrownBy(() -> hugeStream.collect(join(Joiner.on(" "))))
-      .isInstanceOf(IllegalStateException.class)
-      .hasMessageContaining("Parallel processing is not supported");
-  }
-
-  @Test
-  public void join_supports_null_if_joiner_does() {
-    Stream<String> stream = Stream.of("1", null);
-
-    assertThatThrownBy(() -> stream.collect(join(Joiner.on(","))))
-      .isInstanceOf(NullPointerException.class);
-  }
-
   private static final class MyObj {
     private final int id;
     private final String text;