(yegor256#1533) Generify Joined

DmitryBarskov · Apr 1, 2022 · b7cbd17 · b7cbd17
1 parent a5d14ba
commit b7cbd17
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/org/cactoos/list/Joined.java b/src/main/java/org/cactoos/list/Joined.java
@@ -64,7 +64,7 @@ public Joined(final X item, final List<? extends X> items) {
      * Ctor.
      * @param src Source lists
      */
-    public Joined(final Iterable<List<? extends X>> src) {
+    public Joined(final Iterable<? extends List<? extends X>> src) {
         super(
             new ListOf<>(src).stream()
                 .flatMap(List::stream)

diff --git a/src/main/java/org/cactoos/list/JoinedListIterator.java b/src/main/java/org/cactoos/list/JoinedListIterator.java
@@ -47,7 +47,7 @@ public final class JoinedListIterator<T> implements ListIterator<T> {
     /**
      * {@link List} of {@link ListIterator}.
      */
-    private final List<ListIterator<T>> listiters;
+    private final List<ListIterator<? extends T>> listiters;
 
     /**
      * Cursor of the {@link List} of {@link ListIterator}.
@@ -74,7 +74,7 @@ public JoinedListIterator(final ListIterator<T>... items) {
      * @param items ListIterator
      */
     @SuppressWarnings("unchecked")
-    public JoinedListIterator(final T item, final ListIterator<T> items) {
+    public JoinedListIterator(final T item, final ListIterator<? extends T> items) {
         this(new ListOf<>(new ListOf<>(item).listIterator(), items));
     }
 
@@ -84,15 +84,15 @@ public JoinedListIterator(final T item, final ListIterator<T> items) {
      * @param item End item
      */
     @SuppressWarnings("unchecked")
-    public JoinedListIterator(final ListIterator<T> items, final T item) {
+    public JoinedListIterator(final ListIterator<? extends T> items, final T item) {
         this(new ListOf<>(items, new ListOf<>(item).listIterator()));
     }
 
     /**
      * Ctor.
      * @param items Items to concatenate
      */
-    public JoinedListIterator(final List<ListIterator<T>> items) {
+    public JoinedListIterator(final List<ListIterator<? extends T>> items) {
         this.listiters = items;
         this.cursorlit = new AtomicInteger(-1);
         this.cursor = new AtomicInteger(-1);
@@ -183,8 +183,8 @@ private boolean listHasPreviousElt() {
      * Get current {@link ListIterator}.
      * @return Current element
      */
-    private ListIterator<T> currentListIterator() {
-        final ListIterator<T> current;
+    private ListIterator<? extends T> currentListIterator() {
+        final ListIterator<? extends T> current;
         if (this.cursorlit.get() == -1) {
             current = Collections.emptyListIterator();
         } else {

diff --git a/src/test/java/org/cactoos/list/JoinedListIteratorTest.java b/src/test/java/org/cactoos/list/JoinedListIteratorTest.java
@@ -46,7 +46,7 @@ void joinsListIterators() {
         new Assertion<>(
             "Must concatenate iterable of listIterators together",
             new IterableOf<>(
-                new JoinedListIterator<>(
+                new JoinedListIterator<String>(
                     new ListOf<>("x").listIterator(),
                     new ListOf<>("y").listIterator()
                 )
@@ -58,7 +58,7 @@ void joinsListIterators() {
     @Test
     @SuppressWarnings("unchecked")
     void navigatesInNonEmptyIterator() {
-        final ListIterator<Integer> joined = new JoinedListIterator<>(
+        final ListIterator<Integer> joined = new JoinedListIterator<Integer>(
             new ListOf<>(1).listIterator(),
             new ListOf<>(2).listIterator()
         );