streams

yegor256 · Dec 23, 2016 · 20a6791 · 20a6791
1 parent 1d06f08
commit 20a6791
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/io/jare/dynamo/DyBase.java b/src/main/java/io/jare/dynamo/DyBase.java
@@ -33,7 +33,6 @@
 import io.jare.model.Domain;
 import io.jare.model.User;
 import java.util.Locale;
-import java.util.stream.Collectors;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -90,7 +89,8 @@ public Iterable<Domain> domain(final String name) {
             )
             .stream()
             .map(DyDomain::new)
-            .collect(Collectors.<Domain>toList());
+            .map(Domain.class::cast)
+            ::iterator;
     }
 
     @Override
@@ -104,7 +104,8 @@ public Iterable<Domain> all() {
             )
             .stream()
             .map(DyDomain::new)
-            .collect(Collectors.<Domain>toList());
+            .map(Domain.class::cast)
+            ::iterator;
     }
 
     /**

diff --git a/src/main/java/io/jare/dynamo/DyUser.java b/src/main/java/io/jare/dynamo/DyUser.java
@@ -34,7 +34,6 @@
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.stream.Collectors;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -84,7 +83,8 @@ public Iterable<Domain> mine() {
             .where("user", Conditions.equalTo(this.handle))
             .stream()
             .map(DyDomain::new)
-            .collect(Collectors.toList());
+            .map(Domain.class::cast)
+            ::iterator;
     }
 
     @Override

diff --git a/src/test/java/io/jare/dynamo/DyUserITCase.java b/src/test/java/io/jare/dynamo/DyUserITCase.java
@@ -74,8 +74,8 @@ public void listsMineDomains() throws Exception {
             user.add(String.format("facebook-%d.com", idx));
         }
         MatcherAssert.assertThat(
-            user.mine().spliterator().getExactSizeIfKnown(),
-            Matchers.equalTo((long) Tv.TEN)
+            user.mine(),
+            Matchers.iterableWithSize(Tv.TEN)
         );
     }