Removing deprecated members

jnape · jnape · commit 77d6feef82da · 2018-07-16T23:24:34.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `liftA2` receives more parameters to aid inference
 - `Compose#getCompose` now supports inference
 
+### Removed
+- `MapLens#mappingValues`, deprecated in a prior release
+- `CollectionLens#asSet`, deprecated in a prior release
+- `CollectionLens#asStream`, deprecated in a prior release
+
 ## [3.0.3] - 2018-05-27
 ### Added
 - `Lens#toIso`, for converting a lens to an iso
diff --git a/src/main/java/com/jnape/palatable/lambda/lens/lenses/CollectionLens.java b/src/main/java/com/jnape/palatable/lambda/lens/lenses/CollectionLens.java
@@ -31,23 +31,6 @@ public static <X, CX extends Collection<X>> Lens.Simple<CX, CX> asCopy(Function<
         return simpleLens(copyFn, (__, copy) -> copy);
     }
 
-    /**
-     * Convenience static factory method for creating a lens that focuses on an arbitrary {@link Collection} as a
-     * {@link Set}.
-     *
-     * @param <X>  the collection element type
-     * @param <CX> the type of the collection
-     * @return a lens that focuses on a Collection as a Set
-     * @deprecated in favor of lawful {@link CollectionLens#asSet(Function)}
-     */
-    @Deprecated
-    public static <X, CX extends Collection<X>> Lens.Simple<CX, Set<X>> asSet() {
-        return simpleLens(HashSet::new, (xsL, xsS) -> {
-            xsL.retainAll(xsS);
-            return xsL;
-        });
-    }
-
     /**
      * Convenience static factory method for creating a lens that focuses on an arbitrary {@link Collection} as a
      * {@link Set}.
@@ -69,23 +52,6 @@ public static <X, CX extends Collection<X>> Lens.Simple<CX, Set<X>> asSet(
         });
     }
 
-    /**
-     * Convenience static factory method for creating a lens that focuses on a Collection as a Stream.
-     *
-     * @param <X>  the collection element type
-     * @param <CX> the type of the collection
-     * @return a lens that focuses on a Collection as a stream.
-     * @deprecated in favor of lawful {@link CollectionLens#asStream(Function)}
-     */
-    @Deprecated
-    public static <X, CX extends Collection<X>> Lens.Simple<CX, Stream<X>> asStream() {
-        return simpleLens(Collection::stream, (xsL, xsS) -> {
-            xsL.clear();
-            xsS.forEach(xsL::add);
-            return xsL;
-        });
-    }
-
     /**
      * Convenience static factory method for creating a lens that focuses on a Collection as a Stream.
      * <p>
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
@@ -12,10 +12,8 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Function;
 
 import static com.jnape.palatable.lambda.adt.Maybe.maybe;
-import static com.jnape.palatable.lambda.functions.builtin.fn2.Eq.eq;
 import static com.jnape.palatable.lambda.functions.builtin.fn2.Map.map;
 import static com.jnape.palatable.lambda.functions.builtin.fn2.ToCollection.toCollection;
 import static com.jnape.palatable.lambda.functions.builtin.fn2.ToMap.toMap;
@@ -149,36 +147,6 @@ public static <K, V> Lens.Simple<Map<K, V>, Map<V, K>> inverted() {
         });
     }
 
-    /**
-     * A lens that focuses on a map while mapping its values with the mapping function.
-     * <p>
-     * Note that this lens is very likely to NOT be lawful, since "you get back what you put in" will fail for all
-     * values <code>B</code> that do not map from the current values in <code>S</code> (new mappings cannot be
-     * preserved as the inversion of <code>fn</code> is not known). Furthermore, if <code>fn</code> is injective
-     * (multiple <code>V</code>s map to the same <code>V2</code>), this lens will also not be lawful for similar reasons
-     * as stated above.
-     *
-     * @param fn   the mapping function
-     * @param <K>  the key type
-     * @param <V>  the unfocused map value type
-     * @param <V2> the focused map value types
-     * @return a lens that focuses on a map while mapping its values
-     * @deprecated in favor of the lawful (and far more rational) {@link MapLens#mappingValues(Iso)}
-     */
-    @Deprecated
-    public static <K, V, V2> Lens.Simple<Map<K, V>, Map<K, V2>> mappingValues(Function<? super V, ? extends V2> fn) {
-        return simpleLens(m -> toMap(HashMap::new, map(t -> t.biMapR(fn), map(Tuple2::fromEntry, m.entrySet()))),
-                          (s, b) -> {
-                              Set<K> retainKeys = Filter.<Map.Entry<K, V>>filter(kv -> eq(fn.apply(kv.getValue()), b.get(kv.getKey())))
-                                      .andThen(map(Map.Entry::getKey))
-                                      .andThen(toCollection(HashSet::new))
-                                      .apply(s.entrySet());
-                              Map<K, V> copy = new HashMap<>(s);
-                              copy.keySet().retainAll(retainKeys);
-                              return copy;
-                          });
-    }
-
     /**
      * A lens that focuses on a map while mapping its values with the mapping {@link Iso}.
      * <p>
