From 3bff648f7e1b8880cde37073dff1946b943ce0d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pap=20L=C5=91rinc?= <paplorinc@yahoo.com>
Date: Thu, 23 Jun 2016 14:44:27 +0300
Subject: [PATCH] Added a few methods to the public API of collections

---
 javaslang/src/main/java/javaslang/Lazy.java   | 27 ++++++--------
 .../main/java/javaslang/collection/Array.java | 12 +++----
 .../java/javaslang/collection/CharSeq.java    | 20 +++++------
 .../javaslang/collection/LinkedHashSet.java   |  2 +-
 .../main/java/javaslang/collection/List.java  |  8 ++---
 .../javaslang/collection/PriorityQueue.java   |  8 ++---
 .../main/java/javaslang/collection/Queue.java | 10 +++---
 .../java/javaslang/collection/Stream.java     | 31 ++++++++--------
 .../java/javaslang/collection/TreeMap.java    | 11 +++---
 .../java/javaslang/collection/Vector.java     |  8 ++---
 .../src/main/java/javaslang/control/Try.java  | 35 ++++++++-----------
 11 files changed, 79 insertions(+), 93 deletions(-)

diff --git a/javaslang/src/main/java/javaslang/Lazy.java b/javaslang/src/main/java/javaslang/Lazy.java
index 689b70e78d..28f5a19053 100644
--- a/javaslang/src/main/java/javaslang/Lazy.java
+++ b/javaslang/src/main/java/javaslang/Lazy.java
@@ -7,25 +7,18 @@
 
 import javaslang.collection.Iterator;
 import javaslang.collection.List;
-import javaslang.collection.Seq;
+import javaslang.collection.*;
 import javaslang.control.Option;
 
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.function.*;
 
 /**
  * Represents a lazy evaluated value. Compared to a Supplier, Lazy is memoizing, i.e. it evaluates only once and
  * therefore is referential transparent.
- *
+ * <p>
  * <pre>
  * <code>
  * final Lazy&lt;Double&gt; l = Lazy.of(Math::random);
@@ -35,9 +28,9 @@
  * l.get();         // = 0.123 (memoized)
  * </code>
  * </pre>
- *
+ * <p>
  * Since 2.0.0 you may also create a <em>real</em> lazy value (works only with interfaces):
- *
+ * <p>
  * <pre><code>final CharSequence chars = Lazy.val(() -&gt; "Yay!", CharSequence.class);</code></pre>
  *
  * @author Daniel Dietrich
@@ -68,7 +61,7 @@ private Lazy(Supplier<? extends T> supplier) {
      * @return the given {@code lazy} instance as narrowed type {@code Lazy<T>}.
      */
     @SuppressWarnings("unchecked")
-    static <T> Lazy<T> narrow(Lazy<? extends T> lazy) {
+    public static <T> Lazy<T> narrow(Lazy<? extends T> lazy) {
         return (Lazy<T>) lazy;
     }
 
@@ -127,7 +120,7 @@ public static <T> T val(Supplier<? extends T> supplier, Class<T> type) {
     }
 
     public Option<T> filter(Predicate<? super T> predicate) {
-        T v = get();
+        final T v = get();
         return predicate.test(v) ? Option.some(v) : Option.none();
     }
 
diff --git a/javaslang/src/main/java/javaslang/collection/Array.java b/javaslang/src/main/java/javaslang/collection/Array.java
index df143f944e..1c7ec7fc22 100644
--- a/javaslang/src/main/java/javaslang/collection/Array.java
+++ b/javaslang/src/main/java/javaslang/collection/Array.java
@@ -127,7 +127,7 @@ public static <T> Array<T> ofAll(Iterable<? extends T> elements) {
      * @param <T>        Component type of the Stream.
      * @return A Array containing the given elements in the same order.
      */
-    static <T> Array<T> ofAll(java.util.stream.Stream<? extends T> javaStream) {
+    public static <T> Array<T> ofAll(java.util.stream.Stream<? extends T> javaStream) {
         Objects.requireNonNull(javaStream, "javaStream is null");
         return wrap(javaStream.toArray());
     }
@@ -482,7 +482,7 @@ public static Array<Long> rangeClosedBy(long from, long toInclusive, long step)
      * @return an Array with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T, U> Array<U> unfoldRight(T seed, Function<? super T, Option<Tuple2<? extends U, ? extends T>>> f) {
+    public static <T, U> Array<U> unfoldRight(T seed, Function<? super T, Option<Tuple2<? extends U, ? extends T>>> f) {
         return Iterator.unfoldRight(seed, f).toArray();
     }
 
@@ -509,7 +509,7 @@ static <T, U> Array<U> unfoldRight(T seed, Function<? super T, Option<Tuple2<? e
      * @return an Array with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T, U> Array<U> unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends U>>> f) {
+    public static <T, U> Array<U> unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends U>>> f) {
         return Iterator.unfoldLeft(seed, f).toArray();
     }
 
@@ -536,7 +536,7 @@ static <T, U> Array<U> unfoldLeft(T seed, Function<? super T, Option<Tuple2<? ex
      * @return an Array with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T> Array<T> unfold(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends T>>> f) {
+    public static <T> Array<T> unfold(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends T>>> f) {
         return Iterator.unfold(seed, f).toArray();
     }
 
@@ -1052,13 +1052,13 @@ public <U> Array<U> scanLeft(U zero, BiFunction<? super U, ? super T, ? extends
                 new java.util.ArrayList<>(), (c, u) -> {
                     c.add(u);
                     return c;
-                }, list -> Array.<U> wrap(list.toArray()));
+                }, list -> Array.wrap(list.toArray()));
     }
 
     @Override
     public <U> Array<U> scanRight(U zero, BiFunction<? super T, ? super U, ? extends U> operation) {
         Objects.requireNonNull(operation, "operation is null");
-        return Collections.scanRight(this, zero, operation, List.empty(), List::prepend, list -> Array.<U> wrap(list.toJavaArray()));
+        return Collections.scanRight(this, zero, operation, List.empty(), List::prepend, list -> Array.wrap(list.toJavaArray()));
     }
 
     @Override
diff --git a/javaslang/src/main/java/javaslang/collection/CharSeq.java b/javaslang/src/main/java/javaslang/collection/CharSeq.java
index f4064740d1..d8335fe7a3 100644
--- a/javaslang/src/main/java/javaslang/collection/CharSeq.java
+++ b/javaslang/src/main/java/javaslang/collection/CharSeq.java
@@ -238,7 +238,7 @@ public static CharSeq rangeClosedBy(char from, char toInclusive, int step) {
      * @return a CharSeq with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T> CharSeq unfoldRight(T seed, Function<? super T, Option<Tuple2<? extends Character, ? extends T>>> f) {
+    public static <T> CharSeq unfoldRight(T seed, Function<? super T, Option<Tuple2<? extends Character, ? extends T>>> f) {
         return CharSeq.ofAll(Iterator.unfoldRight(seed, f));
     }
 
@@ -265,7 +265,7 @@ static <T> CharSeq unfoldRight(T seed, Function<? super T, Option<Tuple2<? exten
      * @return a CharSeq with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T> CharSeq unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends Character>>> f) {
+    public static <T> CharSeq unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends Character>>> f) {
         return CharSeq.ofAll(Iterator.unfoldLeft(seed, f));
     }
 
@@ -292,7 +292,7 @@ static <T> CharSeq unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extend
      * @return a CharSeq with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static CharSeq unfold(Character seed, Function<? super Character, Option<Tuple2<? extends Character, ? extends Character>>> f) {
+    public static CharSeq unfold(Character seed, Function<? super Character, Option<Tuple2<? extends Character, ? extends Character>>> f) {
         return CharSeq.ofAll(Iterator.unfold(seed, f));
     }
 
@@ -1839,7 +1839,7 @@ public int lastIndexOf(int ch, int fromIndex) {
      * @param fromIndex the index to start the search from.
      * @return {@code Some(index)} or {@code None} if not found.
      */
-    Option<Integer> lastIndexOfOption(int ch, int fromIndex) {
+    public Option<Integer> lastIndexOfOption(int ch, int fromIndex) {
         return Collections.indexOption(lastIndexOf(ch, fromIndex));
     }
 
@@ -1867,7 +1867,7 @@ public int indexOf(CharSeq str) {
      * @param str the substring to search for.
      * @return {@code Some(index)} or {@code None} if not found.
      */
-    Option<Integer> indexOfOption(CharSeq str) {
+    public Option<Integer> indexOfOption(CharSeq str) {
         return Collections.indexOption(indexOf(str));
     }
 
@@ -1899,7 +1899,7 @@ public int indexOf(CharSeq str, int fromIndex) {
      * @param fromIndex the index from which to start the search.
      * @return {@code Some(index)} or {@code None} if not found.
      */
-    Option<Integer> indexOfOption(CharSeq str, int fromIndex) {
+    public Option<Integer> indexOfOption(CharSeq str, int fromIndex) {
         return Collections.indexOption(indexOf(str, fromIndex));
     }
 
@@ -1928,7 +1928,7 @@ public int lastIndexOf(CharSeq str) {
      * @param str the substring to search for.
      * @return {@code Some(index)} or {@code None} if not found.
      */
-    Option<Integer> lastIndexOfOption(CharSeq str) {
+    public Option<Integer> lastIndexOfOption(CharSeq str) {
         return Collections.indexOption(lastIndexOf(str));
     }
 
@@ -1960,7 +1960,7 @@ public int lastIndexOf(CharSeq str, int fromIndex) {
      * @param fromIndex the index to start the search from.
      * @return {@code Some(index)} or {@code None} if not found.
      */
-    Option<Integer> lastIndexOfOption(CharSeq str, int fromIndex) {
+    public Option<Integer> lastIndexOfOption(CharSeq str, int fromIndex) {
         return Collections.indexOption(lastIndexOf(str, fromIndex));
     }
 
@@ -2500,12 +2500,12 @@ public char[] toCharArray() {
     }
 
     @FunctionalInterface
-    interface CharUnaryOperator {
+    public interface CharUnaryOperator {
         char apply(char c);
     }
 
     @FunctionalInterface
-    interface CharFunction<R> {
+    public interface CharFunction<R> {
         R apply(char c);
     }
 }
diff --git a/javaslang/src/main/java/javaslang/collection/LinkedHashSet.java b/javaslang/src/main/java/javaslang/collection/LinkedHashSet.java
index 8ab51eb6e3..ffe6a584aa 100644
--- a/javaslang/src/main/java/javaslang/collection/LinkedHashSet.java
+++ b/javaslang/src/main/java/javaslang/collection/LinkedHashSet.java
@@ -154,7 +154,7 @@ public static <T> LinkedHashSet<T> ofAll(Iterable<? extends T> elements) {
      * @param <T>        Component type of the Stream.
      * @return A LinkedHashSet containing the given elements in the same order.
      */
-    static <T> LinkedHashSet<T> ofAll(java.util.stream.Stream<? extends T> javaStream) {
+    public static <T> LinkedHashSet<T> ofAll(java.util.stream.Stream<? extends T> javaStream) {
         Objects.requireNonNull(javaStream, "javaStream is null");
         return ofAll(Iterator.ofAll(javaStream.iterator()));
     }
diff --git a/javaslang/src/main/java/javaslang/collection/List.java b/javaslang/src/main/java/javaslang/collection/List.java
index bba054308d..d68c57764b 100644
--- a/javaslang/src/main/java/javaslang/collection/List.java
+++ b/javaslang/src/main/java/javaslang/collection/List.java
@@ -580,7 +580,7 @@ static List<Long> rangeClosedBy(long from, long toInclusive, long step) {
      * @return a list with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T,U> List<U> unfoldRight(T seed, Function<? super T,Option<Tuple2<? extends U, ? extends T>>> f) {
+    static <T, U> List<U> unfoldRight(T seed, Function<? super T, Option<Tuple2<? extends U, ? extends T>>> f) {
         return Iterator.unfoldRight(seed, f).toList();
     }
 
@@ -607,7 +607,7 @@ static <T,U> List<U> unfoldRight(T seed, Function<? super T,Option<Tuple2<? exte
      * @return a list with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T,U> List<U> unfoldLeft(T seed, Function<? super T,Option<Tuple2<? extends T, ? extends U>>> f) {
+    static <T, U> List<U> unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends U>>> f) {
         return Iterator.unfoldLeft(seed, f).toList();
     }
 
@@ -634,7 +634,7 @@ static <T,U> List<U> unfoldLeft(T seed, Function<? super T,Option<Tuple2<? exten
      * @return a list with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T> List<T> unfold(T seed, Function<? super T,Option<Tuple2<? extends T, ? extends T>>> f) {
+    static <T> List<T> unfold(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends T>>> f) {
         return Iterator.unfold(seed, f).toList();
     }
 
@@ -646,7 +646,7 @@ default List<T> append(T element) {
     @Override
     default List<T> appendAll(Iterable<? extends T> elements) {
         Objects.requireNonNull(elements, "elements is null");
-        return List.<T>ofAll(elements).prependAll(this);
+        return List.<T> ofAll(elements).prependAll(this);
     }
 
     @Override
diff --git a/javaslang/src/main/java/javaslang/collection/PriorityQueue.java b/javaslang/src/main/java/javaslang/collection/PriorityQueue.java
index 0fb036735f..b052533108 100644
--- a/javaslang/src/main/java/javaslang/collection/PriorityQueue.java
+++ b/javaslang/src/main/java/javaslang/collection/PriorityQueue.java
@@ -133,7 +133,7 @@ public static <T> PriorityQueue<T> empty(Comparator<? super T> comparator) {
      * @param <T> Component type of the {@code PriorityQueue}.
      * @return A {@code PriorityQueue<T>} Collector.
      */
-    static <T> Collector<T, ArrayList<T>, PriorityQueue<T>> collector() {
+    public static <T> Collector<T, ArrayList<T>, PriorityQueue<T>> collector() {
         final Supplier<ArrayList<T>> supplier = ArrayList::new;
         final BiConsumer<ArrayList<T>, T> accumulator = ArrayList::add;
         final BinaryOperator<ArrayList<T>> combiner = (left, right) -> {
@@ -213,7 +213,7 @@ public static <T> PriorityQueue<T> ofAll(Comparator<? super T> comparator, java.
      * @throws NullPointerException if {@code function} is null
      */
     @GwtIncompatible
-    static <T> PriorityQueue<T> tabulate(int size, Function<? super Integer, ? extends T> function) {
+    public static <T> PriorityQueue<T> tabulate(int size, Function<? super Integer, ? extends T> function) {
         Objects.requireNonNull(function, "function is null");
         final Comparator<? super T> comparator = naturalComparator();
         return Collections.tabulate(size, function, empty(comparator), values -> ofAll(comparator, List.of(values)));
@@ -228,9 +228,9 @@ static <T> PriorityQueue<T> tabulate(int size, Function<? super Integer, ? exten
      * @return A {@link PriorityQueue} of size {@code size}, where each element contains the result supplied by {@code supplier}.
      * @throws NullPointerException if {@code supplier} is null
      */
-    @SuppressWarnings("unchecked")
     @GwtIncompatible
-    static <T> PriorityQueue<T> fill(int size, Supplier<? extends T> supplier) {
+    @SuppressWarnings("unchecked")
+    public static <T> PriorityQueue<T> fill(int size, Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         final Comparator<? super T> comparator = naturalComparator();
         return Collections.fill(size, supplier, empty(comparator), values -> ofAll(comparator, List.of(values)));
diff --git a/javaslang/src/main/java/javaslang/collection/Queue.java b/javaslang/src/main/java/javaslang/collection/Queue.java
index e4132278a7..199859d9c2 100644
--- a/javaslang/src/main/java/javaslang/collection/Queue.java
+++ b/javaslang/src/main/java/javaslang/collection/Queue.java
@@ -6,7 +6,7 @@
 package javaslang.collection;
 
 import javaslang.*;
-import javaslang.control.*;
+import javaslang.control.Option;
 
 import java.util.*;
 import java.util.function.*;
@@ -162,7 +162,7 @@ public static <T> Queue<T> ofAll(Iterable<? extends T> elements) {
      * @param <T>        Component type of the Stream.
      * @return A Queue containing the given elements in the same order.
      */
-    static <T> Queue<T> ofAll(java.util.stream.Stream<? extends T> javaStream) {
+    public static <T> Queue<T> ofAll(java.util.stream.Stream<? extends T> javaStream) {
         Objects.requireNonNull(javaStream, "javaStream is null");
         return new Queue<>(List.ofAll(javaStream), List.empty());
     }
@@ -525,7 +525,7 @@ public static Queue<Long> rangeClosedBy(long from, long toInclusive, long step)
      * @return a Queue with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T,U> Queue<U> unfoldRight(T seed, Function<? super T,Option<Tuple2<? extends U, ? extends T>>> f) {
+    public static <T, U> Queue<U> unfoldRight(T seed, Function<? super T, Option<Tuple2<? extends U, ? extends T>>> f) {
         return Iterator.unfoldRight(seed, f).toQueue();
     }
 
@@ -552,7 +552,7 @@ static <T,U> Queue<U> unfoldRight(T seed, Function<? super T,Option<Tuple2<? ext
      * @return a Queue with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T,U> Queue<U> unfoldLeft(T seed, Function<? super T,Option<Tuple2<? extends T, ? extends U>>> f) {
+    public static <T, U> Queue<U> unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends U>>> f) {
         return Iterator.unfoldLeft(seed, f).toQueue();
     }
 
@@ -579,7 +579,7 @@ static <T,U> Queue<U> unfoldLeft(T seed, Function<? super T,Option<Tuple2<? exte
      * @return a Queue with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T> Queue<T> unfold(T seed, Function<? super T,Option<Tuple2<? extends T, ? extends T>>> f) {
+    public static <T> Queue<T> unfold(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends T>>> f) {
         return Iterator.unfold(seed, f).toQueue();
     }
 
diff --git a/javaslang/src/main/java/javaslang/collection/Stream.java b/javaslang/src/main/java/javaslang/collection/Stream.java
index 36700d0829..4ed500ad7d 100644
--- a/javaslang/src/main/java/javaslang/collection/Stream.java
+++ b/javaslang/src/main/java/javaslang/collection/Stream.java
@@ -6,8 +6,7 @@
 package javaslang.collection;
 
 import javaslang.*;
-import javaslang.collection.Stream.Cons;
-import javaslang.collection.Stream.Empty;
+import javaslang.collection.Stream.*;
 import javaslang.collection.StreamModule.*;
 import javaslang.control.Option;
 
@@ -48,9 +47,9 @@
  * Stream.iterate(Object, Function)// e.g. Stream.iterate(1, i -&gt; i * 2);
  * </code>
  * </pre>
- *
+ * <p>
  * Factory method applications:
- *
+ * <p>
  * <pre>
  * <code>
  * Stream&lt;Integer&gt;       s1 = Stream.of(1);
@@ -67,9 +66,9 @@
  * Stream&lt;Integer[]&gt;     s7 = Stream.&lt;Integer[]&gt; of(new Integer[] {1, 2, 3});
  * </code>
  * </pre>
- *
+ * <p>
  * Example: Generating prime numbers
- *
+ * <p>
  * <pre>
  * <code>
  * // = Stream(2L, 3L, 5L, 7L, ...)
@@ -86,7 +85,7 @@
  * }
  * </code>
  * </pre>
- *
+ * <p>
  * See Okasaki, Chris: <em>Purely Functional Data Structures</em> (p. 34 ff.). Cambridge, 2003.
  *
  * @param <T> component type of this Stream
@@ -245,7 +244,7 @@ static <T> Stream<T> of(T element) {
 
     /**
      * Creates a Stream of the given elements.
-     *
+     * <p>
      * <pre><code>  Stream.of(1, 2, 3, 4)
      * = Nil.instance().prepend(4).prepend(3).prepend(2).prepend(1)
      * = new Cons(1, new Cons(2, new Cons(3, new Cons(4, Nil.instance()))))</code></pre>
@@ -651,7 +650,7 @@ static Stream<Long> rangeClosedBy(long from, long toInclusive, long step) {
      * @return a Stream with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T,U> Stream<U> unfoldRight(T seed, Function<? super T,Option<Tuple2<? extends U, ? extends T>>> f) {
+    static <T, U> Stream<U> unfoldRight(T seed, Function<? super T, Option<Tuple2<? extends U, ? extends T>>> f) {
         return Iterator.unfoldRight(seed, f).toStream();
     }
 
@@ -678,7 +677,7 @@ static <T,U> Stream<U> unfoldRight(T seed, Function<? super T,Option<Tuple2<? ex
      * @return a Stream with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T,U> Stream<U> unfoldLeft(T seed, Function<? super T,Option<Tuple2<? extends T, ? extends U>>> f) {
+    static <T, U> Stream<U> unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends U>>> f) {
         return Iterator.unfoldLeft(seed, f).toStream();
     }
 
@@ -705,7 +704,7 @@ static <T,U> Stream<U> unfoldLeft(T seed, Function<? super T,Option<Tuple2<? ext
      * @return a Stream with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T> Stream<T> unfold(T seed, Function<? super T,Option<Tuple2<? extends T, ? extends T>>> f) {
+    static <T> Stream<T> unfold(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends T>>> f) {
         return Iterator.unfold(seed, f).toStream();
     }
 
@@ -1007,7 +1006,7 @@ default Stream<T> insertAll(int index, Iterable<? extends T> elements) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("insertAll(" + index + ", elements)");
         } else if (index == 0) {
-            return isEmpty() ? Stream.ofAll(elements) : Stream.<T>ofAll(elements).appendAll(this);
+            return isEmpty() ? Stream.ofAll(elements) : Stream.<T> ofAll(elements).appendAll(this);
         } else if (isEmpty()) {
             throw new IndexOutOfBoundsException("insertAll(" + index + ", elements) on Nil");
         } else {
@@ -1133,7 +1132,7 @@ default Stream<T> prepend(T element) {
     @Override
     default Stream<T> prependAll(Iterable<? extends T> elements) {
         Objects.requireNonNull(elements, "elements is null");
-        return Stream.<T>ofAll(elements).appendAll(this);
+        return Stream.<T> ofAll(elements).appendAll(this);
     }
 
     @Override
@@ -1754,15 +1753,15 @@ public Stream<T> appendAll(Iterable<? extends T> elements) {
 
         @Override
         public Stream<T> tail() {
-            Stream<T> t = tail.get();
+            final Stream<T> t = tail.get();
             if (t.isEmpty()) {
                 return Stream.ofAll(queue);
             } else {
                 if (t instanceof ConsImpl) {
-                    ConsImpl<T> c = (ConsImpl<T>) t;
+                    final ConsImpl<T> c = (ConsImpl<T>) t;
                     return new AppendElements<>(c.head(), queue, c.tail);
                 } else {
-                    AppendElements<T> a = (AppendElements<T>) t;
+                    final AppendElements<T> a = (AppendElements<T>) t;
                     return new AppendElements<>(a.head(), a.queue.appendAll(queue), a.tail);
                 }
             }
diff --git a/javaslang/src/main/java/javaslang/collection/TreeMap.java b/javaslang/src/main/java/javaslang/collection/TreeMap.java
index 93d12a0b30..634a908772 100644
--- a/javaslang/src/main/java/javaslang/collection/TreeMap.java
+++ b/javaslang/src/main/java/javaslang/collection/TreeMap.java
@@ -54,8 +54,8 @@ public static <K extends Comparable<? super K>, V> Collector<Tuple2<K, V>, Array
      * {@link java.util.stream.Stream#collect(java.util.stream.Collector)} to obtain a
      * {@link javaslang.collection.TreeMap}.
      *
-     * @param <K> The key type
-     * @param <V> The value type
+     * @param <K>           The key type
+     * @param <V>           The value type
      * @param keyComparator A key comparator
      * @return A {@link javaslang.collection.TreeMap} Collector.
      */
@@ -108,7 +108,7 @@ public static <K, V> TreeMap<K, V> empty(Comparator<? super K> keyComparator) {
      * @return the given {@code treeMap} instance as narrowed type {@code TreeMap<K, V>}.
      */
     @SuppressWarnings("unchecked")
-    static <K, V> TreeMap<K, V> narrow(TreeMap<? extends K, ? extends V> treeMap) {
+    public static <K, V> TreeMap<K, V> narrow(TreeMap<? extends K, ? extends V> treeMap) {
         return (TreeMap<K, V>) treeMap;
     }
 
@@ -477,7 +477,6 @@ public SortedSet<K> keySet() {
         return TreeSet.ofAll(keyComparator(), iterator().map(Tuple2::_1));
     }
 
-
     @Override
     public <K2, V2> TreeMap<K2, V2> map(BiFunction<? super K, ? super V, Tuple2<K2, V2>> mapper) {
         return map(naturalComparator(), mapper);
@@ -500,7 +499,7 @@ public <K2> TreeMap<K2, V> mapKeys(Function<? super K, ? extends K2> keyMapper)
     @Override
     public <K2> TreeMap<K2, V> mapKeys(Function<? super K, ? extends K2> keyMapper, BiFunction<? super V, ? super V, ? extends V> valueMerge) {
         final Comparator<K2> comparator = Comparators.naturalComparator();
-        return Collections.mapKeys(this, TreeMap.<K2, V>empty(comparator), keyMapper, valueMerge);
+        return Collections.mapKeys(this, TreeMap.<K2, V> empty(comparator), keyMapper, valueMerge);
     }
 
     @Override
@@ -596,7 +595,7 @@ private static <K, V> TreeMap<K, V> createTreeMap(Comparator<? super Tuple2<K, V
             tree = tree.insert((Tuple2<K, V>) entry);
         }
         return tree.isEmpty() ? (TreeMap<K, V>) TreeMap.empty()
-                              : new TreeMap<>(tree);
+                : new TreeMap<>(tree);
     }
 
     // -- Object
diff --git a/javaslang/src/main/java/javaslang/collection/Vector.java b/javaslang/src/main/java/javaslang/collection/Vector.java
index e79765dafb..95e5e99f15 100644
--- a/javaslang/src/main/java/javaslang/collection/Vector.java
+++ b/javaslang/src/main/java/javaslang/collection/Vector.java
@@ -173,7 +173,7 @@ public static <T> Vector<T> ofAll(Iterable<? extends T> elements) {
      * @param <T>        Component type of the Stream.
      * @return A Vector containing the given elements in the same order.
      */
-    static <T> Vector<T> ofAll(java.util.stream.Stream<? extends T> javaStream) {
+    public static <T> Vector<T> ofAll(java.util.stream.Stream<? extends T> javaStream) {
         Objects.requireNonNull(javaStream, "javaStream is null");
         return ofAll(Iterator.ofAll(javaStream.iterator()));
     }
@@ -499,7 +499,7 @@ public static Vector<Long> rangeClosedBy(long from, long toInclusive, long step)
      * @return a Vector with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T, U> Vector<U> unfoldRight(T seed, Function<? super T, Option<Tuple2<? extends U, ? extends T>>> f) {
+    public static <T, U> Vector<U> unfoldRight(T seed, Function<? super T, Option<Tuple2<? extends U, ? extends T>>> f) {
         return Iterator.unfoldRight(seed, f).toVector();
     }
 
@@ -526,7 +526,7 @@ static <T, U> Vector<U> unfoldRight(T seed, Function<? super T, Option<Tuple2<?
      * @return a Vector with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T, U> Vector<U> unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends U>>> f) {
+    public static <T, U> Vector<U> unfoldLeft(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends U>>> f) {
         return Iterator.unfoldLeft(seed, f).toVector();
     }
 
@@ -553,7 +553,7 @@ static <T, U> Vector<U> unfoldLeft(T seed, Function<? super T, Option<Tuple2<? e
      * @return a Vector with the values built up by the iteration
      * @throws IllegalArgumentException if {@code f} is null
      */
-    static <T> Vector<T> unfold(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends T>>> f) {
+    public static <T> Vector<T> unfold(T seed, Function<? super T, Option<Tuple2<? extends T, ? extends T>>> f) {
         return Iterator.unfold(seed, f).toVector();
     }
 
diff --git a/javaslang/src/main/java/javaslang/control/Try.java b/javaslang/src/main/java/javaslang/control/Try.java
index 3e6ee789fd..1267de0333 100644
--- a/javaslang/src/main/java/javaslang/control/Try.java
+++ b/javaslang/src/main/java/javaslang/control/Try.java
@@ -8,16 +8,11 @@
 import javaslang.Value;
 import javaslang.collection.Iterator;
 import javaslang.collection.List;
-import javaslang.collection.Seq;
+import javaslang.collection.*;
 
 import java.io.Serializable;
-import java.util.Arrays;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
+import java.util.*;
+import java.util.function.*;
 
 /**
  * An implementation similar to Scala's Try control.
@@ -136,7 +131,7 @@ default Try<T> andThen(Consumer<? super T> consumer) {
      * Passes the result to the given {@code consumer} if this is a {@code Success}.
      * <p>
      * The main use case is chaining checked functions using method references:
-     *
+     * <p>
      * <pre>
      * <code>
      * Try.of(() -&gt; 100)
@@ -181,15 +176,15 @@ default Try<T> andThen(Runnable runnable) {
      * Runs the given runnable if this is a {@code Success}, otherwise returns this {@code Failure}.
      * <p>
      * The main use case is chaining runnables using method references:
-     *
+     * <p>
      * <pre>
      * <code>
      * Try.run(A::methodRef).andThen(B::methodRef).andThen(C::methodRef);
      * </code>
      * </pre>
-     *
+     * <p>
      * Please note that these lines are semantically the same:
-     *
+     * <p>
      * <pre>
      * <code>
      * Try.run(this::doStuff)
@@ -416,9 +411,9 @@ default <U> Try<U> map(Function<? super T, ? extends U> mapper) {
      * passing the result of the current expression to it.
      * If this expression is a {@code Failure} then it'll return a new
      * {@code Failure} of type R with the original exception.
-     *
+     * <p>
      * The main use case is chaining checked functions using method references:
-     *
+     * <p>
      * <pre>
      * <code>
      * Try.of(() -&gt; 0)
@@ -860,7 +855,7 @@ private FatalException(Throwable exception) {
         @Override
         public boolean equals(Object o) {
             return (o == this) || (o instanceof FatalException
-                    && Arrays.deepEquals(getCause().getStackTrace(), ((FatalException) o).getCause().getStackTrace()));
+                                   && Arrays.deepEquals(getCause().getStackTrace(), ((FatalException) o).getCause().getStackTrace()));
         }
 
         @Override
@@ -906,7 +901,7 @@ private NonFatalException(Throwable exception) {
          * @throws Error                if the given exception is fatal, i.e. not recoverable
          * @throws NullPointerException if exception is null
          */
-        static NonFatalException of(Throwable exception) {
+        public static NonFatalException of(Throwable exception) {
             Objects.requireNonNull(exception, "exception is null");
             if (exception instanceof NonFatalException) {
                 return (NonFatalException) exception;
@@ -914,9 +909,9 @@ static NonFatalException of(Throwable exception) {
                 throw (FatalException) exception;
             } else {
                 final boolean isFatal = exception instanceof InterruptedException
-                        || exception instanceof LinkageError
-                        || exception instanceof ThreadDeath
-                        || exception instanceof VirtualMachineError;
+                                        || exception instanceof LinkageError
+                                        || exception instanceof ThreadDeath
+                                        || exception instanceof VirtualMachineError;
                 if (isFatal) {
                     throw new FatalException(exception);
                 } else {
@@ -934,7 +929,7 @@ static NonFatalException of(Throwable exception) {
         @Override
         public boolean equals(Object o) {
             return (o == this) || (o instanceof NonFatalException
-                    && Arrays.deepEquals(getCause().getStackTrace(), ((NonFatalException) o).getCause().getStackTrace()));
+                                   && Arrays.deepEquals(getCause().getStackTrace(), ((NonFatalException) o).getCause().getStackTrace()));
         }
 
         @Override