Merge branch '__rultor'

yegor256 · Sep 4, 2020 · 82a1422 · 82a1422 · 0pdd · Sep 4, 2020
2 parents 02f7902 + 072fdcb
commit 82a1422
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/src/main/java/org/cactoos/iterable/Matched.java b/src/main/java/org/cactoos/iterable/Matched.java
@@ -23,12 +23,12 @@
  */
 package org.cactoos.iterable;
 
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import org.cactoos.BiFunc;
 import org.cactoos.Scalar;
+import org.cactoos.list.Immutable;
 import org.cactoos.scalar.Unchecked;
 import org.cactoos.text.FormattedText;
 
@@ -92,7 +92,7 @@ public Matched(
                         );
                     }
                 }
-                return Collections.unmodifiableList(rslt).iterator();
+                return new Immutable<>(rslt).iterator();
             }
         );
     }

diff --git a/src/main/java/org/cactoos/iterator/Partitioned.java b/src/main/java/org/cactoos/iterator/Partitioned.java
@@ -23,11 +23,10 @@
  */
 package org.cactoos.iterator;
 
-import java.util.Collections;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
+import org.cactoos.list.Immutable;
 import org.cactoos.list.ListOf;
 
 /**
@@ -72,12 +71,8 @@ public List<T> next() {
         if (this.size < 1) {
             throw new IllegalArgumentException("Partition size < 1");
         }
-        return Collections.unmodifiableList(
-            new LinkedList<>(
-                new ListOf<>(
-                    new Sliced<>(0, this.size, this.decorated)
-                )
-            )
+        return new Immutable<>(
+            new ListOf<>(new Sliced<>(0, this.size, this.decorated))
         );
     }
 

diff --git a/src/main/java/org/cactoos/list/Immutable.java b/src/main/java/org/cactoos/list/Immutable.java
@@ -36,9 +36,6 @@
  * @param <T> Element type
  * @since 1.16
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
- * @todo #898:30min Replace all the Collections.unmodifiableList
- *  with the {@link org.cactoos.list.Immutable} from the cactoos codebase.
- *  That should be done because Elegant Object principles are against static methods.
  */
 @SuppressWarnings(
     {
@@ -79,7 +76,7 @@ public boolean contains(final Object item) {
 
     @Override
     public Iterator<T> iterator() {
-        return this.list.iterator();
+        return new org.cactoos.iterator.Immutable<>(this.list.iterator());
     }
 
     @Override

diff --git a/src/test/resources/forbidden-apis.txt b/src/test/resources/forbidden-apis.txt
@@ -6,3 +6,6 @@ org.hamcrest.MatcherAssert#assertThat(java.lang.Object, org.hamcrest.Matcher)
 
 @defaultMessage Please specify failure reason
 org.junit.Assert#assertThat(java.lang.Object, org.hamcrest.Matcher)
+
+@defaultMessage Please avoid using static methods.
+java.util.Collections#unmodifiableList(java.util.List)