Drop Guava
diff --git a/indexer-reader/pom.xml b/indexer-reader/pom.xml
index 11f1f5b..e8b7024 100644
--- a/indexer-reader/pom.xml
+++ b/indexer-reader/pom.xml
@@ -43,11 +43,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
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.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.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..65fddc5 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
@@ -21,14 +21,13 @@
import org.apache.maven.index.reader.Record.Type;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.TreeSet;
import java.util.function.Function;
-import java.util.stream.Collectors;
-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.*;
/**
@@ -55,40 +54,44 @@
* stream, by adding the {@link Type#DESCRIPTOR}, {@link Type#ROOT_GROUPS} and {@link Type#ALL_GROUPS} special
* records.
*/
- public static Iterable<Record> decorate(final Iterable<Record> iterable,
+ public static Iterable<Record> decorate(final List<Record> iterable,
final String repoId)
{
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 ->
+ List<Record> records = new ArrayList<>();
+ records.add( getRecord( allGroupsSet, rootGroupsSet, descriptor( repoId ) ) );
+ iterable.stream().map( rec -> getRecord( allGroupsSet, rootGroupsSet, rec ) ).forEach( records::add );
+ records.add( getRecord( allGroupsSet, rootGroupsSet, allGroups( allGroupsSet ) ) );
+ records.add( getRecord( allGroupsSet, rootGroupsSet, rootGroups( rootGroupsSet ) ) );
+ return records;
+ }
+
+ private static Record getRecord( Set<String> allGroupsSet, Set<String> rootGroupsSet, Record rec )
+ {
+ Record result;
+ if ( Type.DESCRIPTOR == rec.getType() )
{
- if ( Type.DESCRIPTOR == rec.getType() )
+ result = rec;
+ }
+ else if ( Type.ALL_GROUPS == rec.getType() )
+ {
+ result = allGroups( allGroupsSet );
+ }
+ else if ( Type.ROOT_GROUPS == rec.getType() )
+ {
+ result = rootGroups( rootGroupsSet );
+ }
+ else
+ {
+ final String groupId = rec.get( Record.GROUP_ID );
+ if ( groupId != null )
{
- return rec;
+ allGroupsSet.add( groupId );
+ rootGroupsSet.add( rootGroup( groupId ) );
}
- else if ( Type.ALL_GROUPS == rec.getType() )
- {
- return allGroups( allGroupsSet );
- }
- else if ( Type.ROOT_GROUPS == rec.getType() )
- {
- return rootGroups( rootGroupsSet );
- }
- else
- {
- final String groupId = rec.get( Record.GROUP_ID );
- if ( groupId != null )
- {
- allGroupsSet.add( groupId );
- rootGroupsSet.add( rootGroup( groupId ) );
- }
- return rec;
- }
- } ).collect( Collectors.toList() );
+ result = rec;
+ }
+ return result;
}
}
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.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;
diff --git a/pom.xml b/pom.xml
index 2bbc912..0d30475 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,12 +136,6 @@
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
- </dependency>
-
- <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
