Using simpler lens type signature in MapLens#values; weakening constraint in CheckedSupplier to Throwable

jnape · jnape · commit d5984527c5c7 · 2017-01-02T15:13:38.000-06:00
diff --git a/src/main/java/com/jnape/palatable/lambda/functions/specialized/checked/CheckedSupplier.java b/src/main/java/com/jnape/palatable/lambda/functions/specialized/checked/CheckedSupplier.java
@@ -12,7 +12,7 @@
  * @see CheckedFn1
  */
 @FunctionalInterface
-public interface CheckedSupplier<E extends Exception, T> extends Supplier<T> {
+public interface CheckedSupplier<E extends Throwable, T> extends Supplier<T> {
 
     @Override
     default T get() {
diff --git a/src/main/java/com/jnape/palatable/lambda/lens/lenses/MapLens.java b/src/main/java/com/jnape/palatable/lambda/lens/lenses/MapLens.java
@@ -91,8 +91,8 @@ public static <K, V> Lens.Simple<Map<K, V>, Set<K>> keys() {
      * @param <V> the value type
      * @return a lens that focuses on the values of a map
      */
-    public static <K, V> Lens<Map<K, V>, Map<K, V>, Collection<V>, Collection<V>> values() {
-        return lens(Map::values, (m, vs) -> {
+    public static <K, V> Lens.Simple<Map<K, V>, Collection<V>> values() {
+        return simpleLens(Map::values, (m, vs) -> {
             Set<V> valueSet = new HashSet<>(vs);
             Set<K> matchingKeys = m.entrySet().stream()
                     .filter(kv -> valueSet.contains(kv.getValue()))
