Internal refactoring

Author: Gary Gregory

src/main/java/org/apache/commons/io/output/FilterCollectionWriter.java

@@ -24,7 +24,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import org.apache.commons.io.IOExceptionList;
@@ -47,14 +46,6 @@
  */
 public class FilterCollectionWriter extends Writer {
 
-    @SuppressWarnings("rawtypes")
-    private static final Predicate NOT_NULL = Objects::nonNull;
-
-    @SuppressWarnings("unchecked")
-    private static <T> Predicate<T> notNull() {
-        return NOT_NULL;
-    }
-
     /**
      * Empty and immutable collection of writers.
      */
@@ -85,20 +76,17 @@ protected FilterCollectionWriter(final Writer... writers) {
 
     @Override
     public Writer append(final char c) throws IOException {
-        forAllWriters(w -> w.append(c));
-        return this;
+        return forAllWriters(w -> w.append(c));
     }
 
     @Override
     public Writer append(final CharSequence csq) throws IOException {
-        forAllWriters(w -> w.append(csq));
-        return this;
+        return forAllWriters(w -> w.append(csq));
     }
 
     @Override
     public Writer append(final CharSequence csq, final int start, final int end) throws IOException {
-        forAllWriters(w -> w.append(csq, start, end));
-        return this;
+        return forAllWriters(w -> w.append(csq, start, end));
     }
 
     @Override
@@ -116,8 +104,9 @@ public void flush() throws IOException {
         forAllWriters(Writer::flush);
     }
 
-    private void forAllWriters(final IOConsumer<Writer> action) throws IOExceptionList {
+    private FilterCollectionWriter forAllWriters(final IOConsumer<Writer> action) throws IOExceptionList {
         IOConsumer.forAll(writers(), action);
+        return this;
     }
 
     @Override
@@ -169,7 +158,7 @@ public void write(final String str, final int off, final int len) throws IOExcep
     }
 
     private Stream<Writer> writers() {
-        return writers.stream().filter(notNull());
+        return writers.stream().filter(Objects::nonNull);
     }
 
 }