optimize Optional

jbgi · jbgi · commit ba6ad5f2a7f7 · 2015-06-02T21:00:45.000+02:00
diff --git a/core/src/main/java/fj/data/optic/Optional.java b/core/src/main/java/fj/data/optic/Optional.java
@@ -206,10 +206,7 @@ public <L> F<S, Either<L, S>> modifyEitherF(final F<A, Either<L, A>> f) {
 
       @Override
       public F<S, IO<S>> modifyIOF(final F<A, IO<A>> f) {
-        return s -> getOrModify(s).either(
-            IOFunctions::unit,
-            t -> IOFunctions.<A, S> map(f.f(t), b -> set.f(b).f(s))
-            );
+        return s -> getOption.f(s).option(IOFunctions.unit(s), a -> IOFunctions.<A, S> map(f.f(a), b -> set.f(b).f(s)));
       }
 
       @Override
@@ -278,7 +275,7 @@ public F<S, V2<S>> modifyV2F(final F<A, V2<A>> f) {
 
       @Override
       public F<S, S> modify(final F<A, A> f) {
-        return s -> getOrModify(s).either(Function.identity(), a -> set.f(f.f(a)).f(s));
+        return s -> getOption.f(s).option(s, a -> set.f(f.f(a)).f(s));
       }
 
     });
