Even more new javac warnings

jnape · jnape · commit 5186c1164bdd · 2019-04-19T18:06:14.000-05:00
diff --git a/src/main/java/com/jnape/palatable/lambda/iteration/MappingIterable.java b/src/main/java/com/jnape/palatable/lambda/iteration/MappingIterable.java
@@ -9,15 +9,15 @@
 import static java.util.Collections.singletonList;
 
 public final class MappingIterable<A, B> implements Iterable<B> {
-    private final Iterable       as;
-    private final List<Function> mappers;
+    private final Iterable<A>          as;
+    private final List<Function<?, ?>> mappers;
 
     @SuppressWarnings("unchecked")
     public MappingIterable(Function<? super A, ? extends B> fn, Iterable<A> as) {
-        List<Function> mappers = new ArrayList<>(singletonList(fn));
-        while (as instanceof MappingIterable) {
+        List<Function<?, ?>> mappers = new ArrayList<>(singletonList(fn));
+        while (as instanceof MappingIterable<?, ?>) {
             MappingIterable<?, ?> nested = (MappingIterable<?, ?>) as;
-            as = (Iterable) nested.as;
+            as = (Iterable<A>) nested.as;
             mappers.addAll(0, nested.mappers);
         }
         this.as = as;
@@ -27,7 +27,8 @@ public MappingIterable(Function<? super A, ? extends B> fn, Iterable<A> as) {
     @Override
     @SuppressWarnings("unchecked")
     public Iterator<B> iterator() {
-        Function fnComposedOnTheHeap = o -> foldLeft((x, fn) -> fn.apply(x), o, mappers);
-        return new MappingIterator<>(fnComposedOnTheHeap, as.iterator());
+        Function<Object, Object> fnComposedOnTheHeap = a -> foldLeft((x, fn) -> ((Function<Object, Object>) fn).apply(x),
+                                                                     a, mappers);
+        return new MappingIterator<>((Function<? super A, ? extends B>) fnComposedOnTheHeap, as.iterator());
     }
 }
diff --git a/src/main/java/com/jnape/palatable/lambda/iteration/UnfoldingIterator.java b/src/main/java/com/jnape/palatable/lambda/iteration/UnfoldingIterator.java
@@ -27,7 +27,6 @@ public boolean hasNext() {
     }
 
     @Override
-    @SuppressWarnings("ConstantConditions")
     public A next() {
         if (!hasNext())
             throw new NoSuchElementException();
diff --git a/src/test/java/com/jnape/palatable/lambda/functor/BifunctorTest.java b/src/test/java/com/jnape/palatable/lambda/functor/BifunctorTest.java
@@ -14,7 +14,7 @@ public class BifunctorTest {
 
     @Test
     public void biMapLUsesIdentityForRightBiMapFunction() {
-        AtomicReference<Function> rightInvocation = new AtomicReference<>();
+        AtomicReference<Function<?, ?>> rightInvocation = new AtomicReference<>();
         Bifunctor<String, Integer, InvocationRecordingBifunctor<?, ?>> bifunctor =
                 new InvocationRecordingBifunctor<>(new AtomicReference<>(), rightInvocation);
         bifunctor.biMapL(String::toUpperCase);
@@ -23,7 +23,7 @@ public void biMapLUsesIdentityForRightBiMapFunction() {
 
     @Test
     public void biMapRUsesIdentityForLeftBiMapFunction() {
-        AtomicReference<Function> leftInvocation = new AtomicReference<>();
+        AtomicReference<Function<?, ?>> leftInvocation = new AtomicReference<>();
         Bifunctor<String, Integer, InvocationRecordingBifunctor<?, ?>> bifunctor =
                 new InvocationRecordingBifunctor<>(leftInvocation, new AtomicReference<>());
         bifunctor.biMapR(String::valueOf);
diff --git a/src/test/java/com/jnape/palatable/lambda/functor/ProfunctorTest.java b/src/test/java/com/jnape/palatable/lambda/functor/ProfunctorTest.java
@@ -14,7 +14,7 @@ public class ProfunctorTest {
 
     @Test
     public void diMapLUsesIdentityForRightDiMapFunction() {
-        AtomicReference<Function> rightInvocation = new AtomicReference<>();
+        AtomicReference<Function<?, ?>> rightInvocation = new AtomicReference<>();
         Profunctor<String, Integer, InvocationRecordingProfunctor<?, ?>> profunctor =
                 new InvocationRecordingProfunctor<>(new AtomicReference<>(), rightInvocation);
         profunctor.diMapL(Object::toString);
@@ -23,7 +23,7 @@ public void diMapLUsesIdentityForRightDiMapFunction() {
 
     @Test
     public void diMapRUsesIdentityForLeftDiMapFunction() {
-        AtomicReference<Function> leftInvocation = new AtomicReference<>();
+        AtomicReference<Function<?, ?>> leftInvocation = new AtomicReference<>();
         Profunctor<String, Integer, InvocationRecordingProfunctor<?, ?>> profunctor =
                 new InvocationRecordingProfunctor<>(leftInvocation, new AtomicReference<>());
         profunctor.diMapR(String::valueOf);
diff --git a/src/test/java/com/jnape/palatable/lambda/iteration/DroppingIteratorTest.java b/src/test/java/com/jnape/palatable/lambda/iteration/DroppingIteratorTest.java
@@ -17,7 +17,7 @@ public class DroppingIteratorTest {
 
     @Mock private Iterator<Object> iterator;
 
-    private DroppingIterator droppingIterator;
+    private DroppingIterator<?> droppingIterator;
 
     @Before
     public void setUp() {
diff --git a/src/test/java/com/jnape/palatable/lambda/iteration/ImmutableIteratorTest.java b/src/test/java/com/jnape/palatable/lambda/iteration/ImmutableIteratorTest.java
@@ -7,11 +7,11 @@
 
 public class ImmutableIteratorTest {
 
-    private ImmutableIterator immutableIterator;
+    private ImmutableIterator<?> immutableIterator;
 
     @Before
     public void setUp() {
-        immutableIterator = new ImmutableIterator() {
+        immutableIterator = new ImmutableIterator<Object>() {
             @Override
             public boolean hasNext() {
                 throw outOfScope();
diff --git a/src/test/java/com/jnape/palatable/lambda/iteration/InfiniteIteratorTest.java b/src/test/java/com/jnape/palatable/lambda/iteration/InfiniteIteratorTest.java
@@ -9,11 +9,11 @@
 
 public class InfiniteIteratorTest {
 
-    private InfiniteIterator infiniteIterator;
+    private InfiniteIterator<?> infiniteIterator;
 
     @Before
     public void setUp() {
-        infiniteIterator = new InfiniteIterator() {
+        infiniteIterator = new InfiniteIterator<Object>() {
             @Override
             public Object next() {
                 throw outOfScope();
diff --git a/src/test/java/com/jnape/palatable/lambda/iteration/ReversingIteratorTest.java b/src/test/java/com/jnape/palatable/lambda/iteration/ReversingIteratorTest.java
@@ -22,7 +22,7 @@ public class ReversingIteratorTest {
 
     @Mock private Iterator<Object> iterator;
 
-    private ReversingIterator reversingIterator;
+    private ReversingIterator<?> reversingIterator;
 
     @Before
     public void setUp() {
@@ -47,6 +47,7 @@ public void reversesIterator() {
     }
 
     @Test
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     public void doesNotReverseUntilNextIsCalled() {
         reversingIterator.hasNext();
         verify(iterator, never()).next();
@@ -63,6 +64,7 @@ public void doesNotHaveNextIfFinishedReversingIterator() {
     }
 
     @Test
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     public void neverInteractsWithIteratorAgainAfterInitialReverse() {
         mockIteratorToHaveValues(iterator, 1, 2, 3);
 
diff --git a/src/test/java/com/jnape/palatable/lambda/iteration/RewindableIteratorTest.java b/src/test/java/com/jnape/palatable/lambda/iteration/RewindableIteratorTest.java
@@ -18,7 +18,7 @@ public class RewindableIteratorTest {
 
     @Mock private Iterator<Object> iterator;
 
-    private RewindableIterator rewindableIterator;
+    private RewindableIterator<?> rewindableIterator;
 
     @Before
     public void setUp() {
diff --git a/src/test/java/testsupport/Mocking.java b/src/test/java/testsupport/Mocking.java
@@ -18,8 +18,9 @@ public static <A> Iterable<A> mockIterable() {
     }
 
     @SafeVarargs
-    public static <T> void mockIteratorToHaveValues(Iterator iterator, T... values) {
-        Iterator real = asList(values).iterator();
+    @SuppressWarnings("varargs")
+    public static <T> void mockIteratorToHaveValues(Iterator<?> iterator, T... values) {
+        Iterator<?> real = asList(values).iterator();
 
         when(iterator.hasNext()).then(delegateTo(real));
         when(iterator.next()).then(delegateTo(real));
diff --git a/src/test/java/testsupport/applicatives/InvocationRecordingBifunctor.java b/src/test/java/testsupport/applicatives/InvocationRecordingBifunctor.java
@@ -6,11 +6,11 @@
 import java.util.function.Function;
 
 public final class InvocationRecordingBifunctor<A, B> implements Bifunctor<A, B, InvocationRecordingBifunctor<?, ?>> {
-    private final AtomicReference<Function> leftFn;
-    private final AtomicReference<Function> rightFn;
+    private final AtomicReference<Function<?, ?>> leftFn;
+    private final AtomicReference<Function<?, ?>> rightFn;
 
-    public InvocationRecordingBifunctor(AtomicReference<Function> leftFn,
-                                        AtomicReference<Function> rightFn) {
+    public InvocationRecordingBifunctor(AtomicReference<Function<?, ?>> leftFn,
+                                        AtomicReference<Function<?, ?>> rightFn) {
         this.leftFn = leftFn;
         this.rightFn = rightFn;
     }
diff --git a/src/test/java/testsupport/applicatives/InvocationRecordingProfunctor.java b/src/test/java/testsupport/applicatives/InvocationRecordingProfunctor.java
@@ -6,11 +6,11 @@
 import java.util.function.Function;
 
 public final class InvocationRecordingProfunctor<A, B> implements Profunctor<A, B, InvocationRecordingProfunctor<?, ?>> {
-    private final AtomicReference<Function> leftFn;
-    private final AtomicReference<Function> rightFn;
+    private final AtomicReference<Function<?, ?>> leftFn;
+    private final AtomicReference<Function<?, ?>> rightFn;
 
-    public InvocationRecordingProfunctor(AtomicReference<Function> leftFn,
-                                         AtomicReference<Function> rightFn) {
+    public InvocationRecordingProfunctor(AtomicReference<Function<?, ?>> leftFn,
+                                         AtomicReference<Function<?, ?>> rightFn) {
         this.leftFn = leftFn;
         this.rightFn = rightFn;
     }
diff --git a/src/test/java/testsupport/exceptions/OutOfScopeException.java b/src/test/java/testsupport/exceptions/OutOfScopeException.java
@@ -1,5 +1,6 @@
 package testsupport.exceptions;
 
+@SuppressWarnings("serial")
 public class OutOfScopeException extends RuntimeException {
 
     public OutOfScopeException(String s) {
diff --git a/src/test/java/testsupport/matchers/FiniteIterableMatcher.java b/src/test/java/testsupport/matchers/FiniteIterableMatcher.java
@@ -3,7 +3,7 @@
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 
-public class FiniteIterableMatcher extends BaseMatcher<Iterable> {
+public class FiniteIterableMatcher extends BaseMatcher<Iterable<?>> {
 
     @Override
     public boolean matches(Object item) {
@@ -21,7 +21,7 @@ public void describeMismatch(Object item, Description description) {
     }
 
     @SuppressWarnings("UnusedDeclaration")
-    private boolean supportsLessThanInfiniteIterations(Iterable iterable) {
+    private boolean supportsLessThanInfiniteIterations(Iterable<?> iterable) {
         long sufficientlyInfinite = 1000000;
         long elementsIterated = 0;
         for (Object ignored : iterable)
diff --git a/src/test/java/testsupport/matchers/IterableMatcher.java b/src/test/java/testsupport/matchers/IterableMatcher.java
@@ -37,16 +37,16 @@ public void describeMismatch(Object item, Description description) {
             super.describeMismatch(item, description);
     }
 
-    private boolean iterablesIterateSameElementsInOrder(Iterable expected, Iterable actual) {
-        Iterator actualIterator = actual.iterator();
-        Iterator expectedIterator = expected.iterator();
+    private boolean iterablesIterateSameElementsInOrder(Iterable<?> expected, Iterable<?> actual) {
+        Iterator<?> actualIterator = actual.iterator();
+        Iterator<?> expectedIterator = expected.iterator();
 
         while (expectedIterator.hasNext() && actualIterator.hasNext()) {
             Object nextExpected = expectedIterator.next();
             Object nextActual = actualIterator.next();
 
             if (nextExpected instanceof Iterable && nextActual instanceof Iterable) {
-                if (!iterablesIterateSameElementsInOrder((Iterable) nextExpected, (Iterable) nextActual))
+                if (!iterablesIterateSameElementsInOrder((Iterable<?>) nextExpected, (Iterable<?>) nextActual))
                     return false;
             } else if (!reflectionEquals(nextExpected, nextActual))
                 return false;
@@ -55,9 +55,9 @@ private boolean iterablesIterateSameElementsInOrder(Iterable expected, Iterable
         return actualIterator.hasNext() == expectedIterator.hasNext();
     }
 
-    private String stringify(Iterable iterable) {
+    private String stringify(Iterable<?> iterable) {
         StringBuilder stringBuilder = new StringBuilder().append("[");
-        Iterator iterator = iterable.iterator();
+        Iterator<?> iterator = iterable.iterator();
         while (iterator.hasNext()) {
             Object next = iterator.next();
             if (next instanceof Iterable)
@@ -71,6 +71,7 @@ private String stringify(Iterable iterable) {
     }
 
     @SafeVarargs
+    @SuppressWarnings("varargs")
     public static <E> IterableMatcher<E> iterates(E... es) {
         return new IterableMatcher<>(asList(es));
     }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ public boolean hasNext() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- @SuppressWarnings("ConstantConditions")`
`31`	`30`	`public A next() {`
`32`	`31`	`if (!hasNext())`
`33`	`32`	`throw new NoSuchElementException();`