Introduce Loader#collect(Collector<? super T, A, R> collector) (#11)

PicnicSupermarket · Jan 3, 2020 · f9fd5e1 · f9fd5e1
1 parent 31546cf
commit f9fd5e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/tech/picnic/jolo/Loader.java b/src/main/java/tech/picnic/jolo/Loader.java
@@ -6,6 +6,7 @@
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.jooq.Record;
@@ -65,9 +66,14 @@ public Stream<T> stream() {
     return get().stream();
   }
 
+  /** Collects and then returns all objects loaded by this loader. */
+  public <R, A> R collect(Collector<? super T, A, R> collector) {
+    return stream().collect(collector);
+  }
+
   /** Returns all objects loaded by this loader. */
   public List<T> getList() {
-    return stream().collect(Collectors.toList());
+    return collect(Collectors.toList());
   }
 
   /**
@@ -76,7 +82,7 @@ public List<T> getList() {
    * correct result.
    */
   public Set<T> getSet() {
-    return stream().collect(Collectors.toSet());
+    return collect(Collectors.toSet());
   }
 
   /**

diff --git a/src/test/java/tech/picnic/jolo/LoaderTest.java b/src/test/java/tech/picnic/jolo/LoaderTest.java
@@ -1,5 +1,6 @@
 package tech.picnic.jolo;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static tech.picnic.jolo.TestUtil.createRecord;
@@ -245,7 +246,7 @@ public void testZeroOrOneToManyRecursiveReference() {
     expectedBar1.setOtherBar(Optional.of(expectedBar2));
     expectedBar2.setOtherBar(Optional.of(expectedBar2));
 
-    assertEquals(ImmutableList.of(expectedBar1, expectedBar2), l.getList());
+    assertEquals(ImmutableList.of(expectedBar1, expectedBar2), l.collect(toImmutableList()));
   }
 
   @Test