#23 iterable instead of iterator

yegor256 · Nov 20, 2016 · 76eeb53 · 76eeb53
1 parent e0ff7cb
commit 76eeb53
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 24 deletions.
diff --git a/src/main/java/io/jare/Logs.java b/src/main/java/io/jare/Logs.java
@@ -149,7 +149,7 @@ private long process(final String name) throws IOException {
             for (final Map.Entry<Date, Long> usg
                 : entry.getValue().entrySet()) {
                 final Iterator<Domain> domains =
-                    this.base.domain(entry.getKey());
+                    this.base.domain(entry.getKey()).iterator();
                 if (domains.hasNext()) {
                     domains.next().usage().add(
                         usg.getKey(),

diff --git a/src/main/java/io/jare/cached/CdBase.java b/src/main/java/io/jare/cached/CdBase.java
@@ -23,12 +23,10 @@
 package io.jare.cached;
 
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
 import com.jcabi.aspects.Cacheable;
 import io.jare.model.Base;
 import io.jare.model.Domain;
 import io.jare.model.User;
-import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -61,8 +59,8 @@ public User user(final String name) {
 
     @Override
     @Cacheable(lifetime = 1, unit = TimeUnit.MINUTES)
-    public Iterator<Domain> domain(final String name) {
-        return Iterators.transform(
+    public Iterable<Domain> domain(final String name) {
+        return Iterables.transform(
             this.origin.domain(name),
             CdDomain::new
         );

diff --git a/src/main/java/io/jare/dynamo/DyBase.java b/src/main/java/io/jare/dynamo/DyBase.java
@@ -32,7 +32,6 @@
 import io.jare.model.Base;
 import io.jare.model.Domain;
 import io.jare.model.User;
-import java.util.Iterator;
 import java.util.Locale;
 import java.util.stream.Collectors;
 
@@ -72,7 +71,7 @@ public User user(final String name) {
     }
 
     @Override
-    public Iterator<Domain> domain(final String name) {
+    public Iterable<Domain> domain(final String name) {
         return this.table()
             .frame()
             .through(
@@ -87,8 +86,7 @@ public Iterator<Domain> domain(final String name) {
             )
             .stream()
             .map(DyDomain::new)
-            .collect(Collectors.<Domain>toList())
-            .iterator();
+            .collect(Collectors.<Domain>toList());
     }
 
     @Override

diff --git a/src/main/java/io/jare/dynamo/DyUser.java b/src/main/java/io/jare/dynamo/DyUser.java
@@ -87,7 +87,7 @@ public Iterable<Domain> mine() {
     public void add(final String name) throws IOException {
         synchronized (this.region) {
             final Iterator<Domain> before = new DyBase(this.region)
-                .domain(name);
+                .domain(name).iterator();
             if (before.hasNext()) {
                 final Domain domain = before.next();
                 if (!domain.owner().equals(this.handle)) {

diff --git a/src/main/java/io/jare/fake/FkBase.java b/src/main/java/io/jare/fake/FkBase.java
@@ -26,7 +26,6 @@
 import io.jare.model.Domain;
 import io.jare.model.User;
 import java.util.Collections;
-import java.util.Iterator;
 
 /**
  * Fake Base.
@@ -43,8 +42,8 @@ public User user(final String name) {
     }
 
     @Override
-    public Iterator<Domain> domain(final String name) {
-        return Collections.<Domain>singleton(new FkDomain()).iterator();
+    public Iterable<Domain> domain(final String name) {
+        return Collections.<Domain>singleton(new FkDomain());
     }
 
     @Override

diff --git a/src/main/java/io/jare/model/Base.java b/src/main/java/io/jare/model/Base.java
@@ -22,8 +22,6 @@
  */
 package io.jare.model;
 
-import java.util.Iterator;
-
 /**
  * Base.
  *
@@ -45,7 +43,7 @@ public interface Base {
      * @param name The name
      * @return The domain
      */
-    Iterator<Domain> domain(String name);
+    Iterable<Domain> domain(String name);
 
     /**
      * All domains.

diff --git a/src/main/java/io/jare/tk/TkDelete.java b/src/main/java/io/jare/tk/TkDelete.java
@@ -59,7 +59,7 @@ final class TkDelete implements Take {
     public Response act(final Request req) throws IOException {
         final String name = new RqHref.Base(req).href()
             .param("name").iterator().next();
-        final Iterator<Domain> domains = this.base.domain(name);
+        final Iterator<Domain> domains = this.base.domain(name).iterator();
         if (!domains.hasNext()) {
             throw new RsForward(
                 new RsFlash(

diff --git a/src/main/java/io/jare/tk/TkRelay.java b/src/main/java/io/jare/tk/TkRelay.java
@@ -93,7 +93,7 @@ public Response act(final Request req) throws IOException {
         }
         final URI uri = URI.create(target);
         final String host = uri.getHost().toLowerCase(Locale.ENGLISH);
-        final Iterator<Domain> domains = this.base.domain(host);
+        final Iterator<Domain> domains = this.base.domain(host).iterator();
         if (!domains.hasNext()) {
             throw new HttpException(
                 HttpURLConnection.HTTP_BAD_REQUEST,

diff --git a/src/test/java/io/jare/cached/CdUsageTest.java b/src/test/java/io/jare/cached/CdUsageTest.java
@@ -43,7 +43,8 @@ public final class CdUsageTest {
      */
     @Test
     public void makesObjects() throws Exception {
-        final Usage usage = new CdBase(new FkBase()).domain("").next().usage();
+        final Usage usage = new CdBase(new FkBase()).domain("")
+            .iterator().next().usage();
         MatcherAssert.assertThat(usage.total(), Matchers.notNullValue());
     }
 

diff --git a/src/test/java/io/jare/dynamo/DyDomainITCase.java b/src/test/java/io/jare/dynamo/DyDomainITCase.java
@@ -49,12 +49,12 @@ public void addsAndRemoveDomains() throws Exception {
         final User user = base.user(john);
         final String name = "google.com";
         user.add(name);
-        final Domain domain = base.domain(name).next();
+        final Domain domain = base.domain(name).iterator().next();
         MatcherAssert.assertThat(domain.name(), Matchers.equalTo(name));
         MatcherAssert.assertThat(domain.owner(), Matchers.equalTo(john));
         domain.delete();
         MatcherAssert.assertThat(
-            base.domain(name).hasNext(),
+            base.domain(name).iterator().hasNext(),
             Matchers.equalTo(false)
         );
     }

diff --git a/src/test/java/io/jare/dynamo/DyUsageITCase.java b/src/test/java/io/jare/dynamo/DyUsageITCase.java
@@ -50,7 +50,7 @@ public void recordsUsage() throws Exception {
         final User user = base.user("Erik");
         final String name = "yegor256.com";
         user.add(name);
-        final Domain domain = base.domain(name).next();
+        final Domain domain = base.domain(name).iterator().next();
         final Usage usage = domain.usage();
         usage.add(new Date(), 1L);
         usage.add(new Date(), 1L);

diff --git a/src/test/java/io/jare/dynamo/DyUserITCase.java b/src/test/java/io/jare/dynamo/DyUserITCase.java
@@ -50,14 +50,14 @@ public void addsAndRemoveDomains() throws Exception {
         final User user = base.user("jeffrey");
         final String name = "google.com";
         user.add(name);
-        final Domain domain = base.domain(name).next();
+        final Domain domain = base.domain(name).iterator().next();
         MatcherAssert.assertThat(
             domain.name(),
             Matchers.equalTo(name)
         );
         domain.delete();
         MatcherAssert.assertThat(
-            base.domain(name).hasNext(),
+            base.domain(name).iterator().hasNext(),
             Matchers.equalTo(false)
         );
     }