[maven-indexer] branch guava updated: Reomve Guava from tests

[sl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch guava
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git


The following commit(s) were added to refs/heads/guava by this push:
     new 953fd87  Reomve Guava from tests
953fd87 is described below

commit 953fd8747c80cea6986bddf3d6c2ad023a7ecec2
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Feb 3 01:42:12 2020 +0100

    Reomve Guava from tests
---
 .../apache/maven/index/reader/IndexReaderTest.java    |  1 -
 .../apache/maven/index/reader/IndexWriterTest.java    |  1 -
 .../java/org/apache/maven/index/reader/TestUtils.java | 19 ++++++++++---------
 .../org/apache/maven/index/reader/TransformTest.java  |  1 -
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
index cc5c2d2..e7f4917 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
@@ -33,7 +33,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import static com.google.common.collect.Iterables.transform;
 import static org.apache.maven.index.reader.TestUtils.expandFunction;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsNot.not;
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java
index 48aadb2..548022f 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java
@@ -26,7 +26,6 @@ import java.util.Arrays;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import static com.google.common.collect.Iterables.transform;
 import static org.apache.maven.index.reader.TestUtils.expandFunction;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestUtils.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestUtils.java
index 2e6912b..cc58d36 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestUtils.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestUtils.java
@@ -25,14 +25,13 @@ import java.util.Map;
 import java.util.TreeSet;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import static com.google.common.collect.Iterables.concat;
-import static java.util.Collections.singletonList;
 import static org.apache.maven.index.reader.Utils.*;
 
 /**
- * Helpers to transform records from one to another representation, and, some helpers for publishing using Guava.
+ * Helpers to transform records from one to another representation, and, some helpers.
  */
 public final class TestUtils
 {
@@ -60,12 +59,14 @@ public final class TestUtils
   {
     final TreeSet<String> allGroupsSet = new TreeSet<>();
     final TreeSet<String> rootGroupsSet = new TreeSet<>();
-    return StreamSupport.stream(
-            concat( singletonList( descriptor( repoId ) ), iterable, singletonList( allGroups( allGroupsSet ) ),
-                    // placeholder, will be recreated at the end with proper content
-                    singletonList( rootGroups( rootGroupsSet ) )
-                    // placeholder, will be recreated at the end with proper content
-            ).spliterator(), false ).map( rec ->
+    return Stream.of(
+            Stream.of( descriptor( repoId ) ),
+            StreamSupport.stream( iterable.spliterator(), false ),
+            Stream.of( allGroups( allGroupsSet ) ),
+            // placeholder, will be recreated at the end with proper content
+            Stream.of( rootGroups( rootGroupsSet ) )
+            // placeholder, will be recreated at the end with proper content
+        ).flatMap( s -> s ).map( rec ->
     {
       if ( Type.DESCRIPTOR == rec.getType() )
       {
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
index 1ea6155..f75e45b 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
@@ -31,7 +31,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import static com.google.common.collect.Iterables.transform;
 import static org.apache.maven.index.reader.TestUtils.compactFunction;
 import static org.apache.maven.index.reader.TestUtils.decorate;
 import static org.hamcrest.CoreMatchers.nullValue;