Fix up static analysis issues (FindBugs and Intellij IDEA analysis)

1 files changed, 9 insertions, 8 deletions

diff --git a/src/main/java/au/id/zancanaro/javacheck/Iterators.java b/src/main/java/au/id/zancanaro/javacheck/Iterators.java
index 347a927..33652b2 100644
--- a/src/main/java/au/id/zancanaro/javacheck/Iterators.java
+++ b/src/main/java/au/id/zancanaro/javacheck/Iterators.java
@@ -3,6 +3,7 @@ package au.id.zancanaro.javacheck;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
@@ -11,7 +12,7 @@ public final class Iterators {
     }
 
     public static <T> RangeIterator<T> rangeIterator(int countTo, Function<Integer,T> fn) {
-        return new RangeIterator<T>(countTo, fn);
+        return new RangeIterator<>(countTo, fn);
     }
 
     private static class RangeIterator<T> implements Iterator<T> {
@@ -39,9 +40,9 @@ public final class Iterators {
         return new FlattenIterator<>(iterators);
     }
     public static class FlattenIterator<T> implements Iterator<T> {
-        private Iterator<T> current;
+        private final Iterator<Iterator<T>> iterators;
 
-        private Iterator<Iterator<T>> iterators;
+        private Iterator<T> current;
 
         public FlattenIterator(Iterator<Iterator<T>> iterators) {
             this.current = Iterators.emptyIterator();
@@ -105,7 +106,7 @@ public final class Iterators {
         }
         @Override
         public T next() {
-            return null;
+            throw new NoSuchElementException("Empty iterators contain no elements");
         }
 
     }
@@ -134,8 +135,8 @@ public final class Iterators {
 
     }
 
-    public static <T> FilteringIterator<T> filteringIterator(Predicate<T> pred, Iterator<T> iterator) {
-        return new FilteringIterator<>(pred, iterator);
+    public static <T> FilteringIterator<T> filteringIterator(Predicate<T> predicate, Iterator<T> iterator) {
+        return new FilteringIterator<>(predicate, iterator);
     }
 
     private static class FilteringIterator<T> implements Iterator<T> {
@@ -143,8 +144,8 @@ public final class Iterators {
         private final Iterator<T> iterator;
         private List<T> nextValue;
 
-        public FilteringIterator(Predicate<T> pred, Iterator<T> iterator) {
-            this.predicate = pred;
+        public FilteringIterator(Predicate<T> predicate, Iterator<T> iterator) {
+            this.predicate = predicate;
             this.iterator = iterator;
             this.nextValue = null;
         }