Loosening Pre's requirements on the Profunctor constraint

jnape · jnape · commit 2885fb99f410 · 2019-06-04T18:20:11.000-05:00
diff --git a/src/main/java/com/jnape/palatable/lambda/optics/functions/Pre.java b/src/main/java/com/jnape/palatable/lambda/optics/functions/Pre.java
@@ -3,6 +3,7 @@
 import com.jnape.palatable.lambda.adt.Maybe;
 import com.jnape.palatable.lambda.functions.Fn1;
 import com.jnape.palatable.lambda.functions.specialized.Pure;
+import com.jnape.palatable.lambda.functor.Profunctor;
 import com.jnape.palatable.lambda.functor.builtin.Const;
 import com.jnape.palatable.lambda.optics.Optic;
 import com.jnape.palatable.lambda.optics.ProtoOptic;
@@ -19,42 +20,41 @@
  * @param <A> the result to {@link Maybe maybe} read out
  * @param <B> used for unification of the {@link Optic optic's} unused morphism
  */
-public final class Pre<S, T, A, B> implements Fn1<Optic<? super Fn1<?, ?>, ? super Const<Maybe<A>, ?>, S, T, A, B>,
-        Optic<Fn1<?, ?>, Const<Maybe<A>, ?>, S, T, Maybe<A>, B>> {
+public final class Pre<P extends Profunctor<?, ?, ? extends P>, S, T, A, B> implements
+        Fn1<Optic<P, ? super Const<Maybe<A>, ?>, S, T, A, B>,
+                Optic<P, Const<Maybe<A>, ?>, S, T, Maybe<A>, B>> {
 
-    private static final Pre<?, ?, ?, ?> INSTANCE = new Pre<>();
+    private static final Pre<?, ?, ?, ?, ?> INSTANCE = new Pre<>();
 
     private Pre() {
     }
 
     @Override
-    public Optic<Fn1<?, ?>, Const<Maybe<A>, ?>, S, T, Maybe<A>, B> checkedApply(
-            Optic<? super Fn1<?, ?>, ? super Const<Maybe<A>, ?>, S, T, A, B> optic) {
-        Optic<? super Fn1<?, ?>, ? super Const<Maybe<A>, ?>, S, T, Maybe<A>, B> mappedOptic = optic.mapA(Maybe::just);
+    public Optic<P, Const<Maybe<A>, ?>, S, T, Maybe<A>, B> checkedApply(
+            Optic<P, ? super Const<Maybe<A>, ?>, S, T, A, B> optic) {
+        Optic<P, ? super Const<Maybe<A>, ?>, S, T, Maybe<A>, B> mappedOptic = optic.mapA(Maybe::just);
         return reframe(mappedOptic);
     }
 
     @SuppressWarnings("unchecked")
-    public static <S, T, A, B> Pre<S, T, A, B> pre() {
-        return (Pre<S, T, A, B>) INSTANCE;
+    public static <P extends Profunctor<?, ?, ? extends P>, S, T, A, B> Pre<P, S, T, A, B> pre() {
+        return (Pre<P, S, T, A, B>) INSTANCE;
     }
 
     @SuppressWarnings("overloads")
-    public static <S, T, A, B> Optic<Fn1<?, ?>, Const<Maybe<A>, ?>, S, T, Maybe<A>, B> pre(
-            Optic<? super Fn1<?, ?>, ? super Const<Maybe<A>, ?>, S, T, A, B> optic) {
-        return Pre.<S, T, A, B>pre().apply(optic);
+    public static <P extends Profunctor<?, ?, ? extends P>, S, T, A, B>
+    Optic<P, Const<Maybe<A>, ?>, S, T, Maybe<A>, B> pre(Optic<P, ? super Const<Maybe<A>, ?>, S, T, A, B> optic) {
+        return Pre.<P, S, T, A, B>pre().apply(optic);
     }
 
     @SuppressWarnings("overloads")
-    public static <S, T, A, B> Optic<Fn1<?, ?>, Const<Maybe<A>, ?>, S, T, Maybe<A>, B> pre(
-            ProtoOptic<? super Fn1<?, ?>, S, T, A, B> protoOptic) {
-        Optic<? super Fn1<?, ?>, Const<Maybe<A>, ?>, S, T, A, B> optic = protoOptic
-                .toOptic(new Pure<Const<Maybe<A>, ?>>() {
-                    @Override
-                    public <X> Const<Maybe<A>, X> checkedApply(X x) {
-                        return new Const<>(nothing());
-                    }
-                });
-        return pre(optic);
+    public static <P extends Profunctor<?, ?, ? extends P>, S, T, A, B>
+    Optic<P, Const<Maybe<A>, ?>, S, T, Maybe<A>, B> pre(ProtoOptic<P, S, T, A, B> protoOptic) {
+        return pre(protoOptic.toOptic(new Pure<Const<Maybe<A>, ?>>() {
+            @Override
+            public <X> Const<Maybe<A>, X> checkedApply(X x) {
+                return new Const<>(nothing());
+            }
+        }));
     }
 }
