First attempt at functions that throw exceptions

mperry · mperry · commit 9c1b4468bce6 · 2014-06-03T07:09:21.000+10:00
diff --git a/core/src/main/java/fj/F1Functions.java b/core/src/main/java/fj/F1Functions.java
@@ -824,4 +824,14 @@ static public <A, B> ArrayList<B> mapJ(final F<A, B> f, final ArrayList<A> as) {
         return new ArrayList<B>(iterableStream(as).map(f).toCollection());
     }
 
+    static public <A, B> F<A, Try<B>> toF1(final Try1<A, B> t) {
+        return a -> {
+            try {
+                return Try.trySuccess(t.f(a));
+            } catch (Exception e) {
+                return Try.<B>tryFail(e);
+            }
+        };
+    }
+
 }
diff --git a/core/src/main/java/fj/F2Functions.java b/core/src/main/java/fj/F2Functions.java
@@ -346,4 +346,15 @@ public P3<Stream<Tree<C>>, C, Stream<Tree<C>>> f(final P3<Stream<Tree<A>>, A, St
         };
     }
 
+
+    static public <A, B, C> F2<A, B, Try<C>> toF2(final Try2<A, B, C> t) {
+        return (a, b) -> {
+            try {
+                return Try.trySuccess(t.f(a, b));
+            } catch (Exception e) {
+                return Try.<C>tryFail(e);
+            }
+        };
+    }
+
 }
diff --git a/core/src/main/java/fj/F3Functions.java b/core/src/main/java/fj/F3Functions.java
@@ -4,4 +4,17 @@
  * Created by MarkPerry on 6/04/2014.
  */
 public class F3Functions {
+
+
+
+    static public <A, B, C, D> F3<A, B, C, Try<D>> toF3(final Try3<A, B, C, D> t) {
+        return (a, b, c) -> {
+            try {
+                return Try.trySuccess(t.f(a, b, c));
+            } catch (Exception e) {
+                return Try.<D>tryFail(e);
+            }
+        };
+    }
+
 }
diff --git a/core/src/main/java/fj/F4Functions.java b/core/src/main/java/fj/F4Functions.java
@@ -4,4 +4,16 @@
  * Created by MarkPerry on 6/04/2014.
  */
 public class F4Functions {
+
+
+    static public <A, B, C, D, E> F4<A, B, C, D, Try<E>> toF4(final Try4<A, B, C, D, E> t) {
+        return (a, b, c, d) -> {
+            try {
+                return Try.trySuccess(t.f(a, b, c, d));
+            } catch (Exception e) {
+                return Try.<E>tryFail(e);
+            }
+        };
+    }
+
 }
diff --git a/core/src/main/java/fj/Try.java b/core/src/main/java/fj/Try.java
@@ -0,0 +1,32 @@
+package fj;
+
+import fj.data.Either;
+import fj.data.Validation;
+
+/**
+ * Created by MarkPerry on 2/06/2014.
+ */
+public class Try<A> extends Validation<Exception, A> {
+
+    public static <B, C> Try<C> toTry(Validation<B, C> v) {
+        return toTry(v.toEither());
+    }
+
+    public static <B, C> Try<C> toTry(Either<B, C> e) {
+        return new Try(e);
+    }
+
+    public Try(Either<Exception, A> e) {
+        super(e);
+    }
+
+    public static <B> Try<B> trySuccess(B b) {
+        return toTry(Validation.success(b));
+    }
+
+    public static <B> Try<B> tryFail(Exception e) {
+        return toTry(Validation.fail(e));
+   }
+
+
+}
diff --git a/core/src/main/java/fj/Try1.java b/core/src/main/java/fj/Try1.java
@@ -0,0 +1,10 @@
+package fj;
+
+/**
+ * Created by MarkPerry on 2/06/2014.
+ */
+public interface Try1<A, B> {
+
+    B f(A a) throws Exception;
+
+}
diff --git a/core/src/main/java/fj/Try2.java b/core/src/main/java/fj/Try2.java
@@ -0,0 +1,10 @@
+package fj;
+
+/**
+ * Created by MarkPerry on 2/06/2014.
+ */
+public interface Try2<A, B, C> {
+
+    C f(A a, B b) throws Exception;
+
+}
diff --git a/core/src/main/java/fj/Try3.java b/core/src/main/java/fj/Try3.java
@@ -0,0 +1,10 @@
+package fj;
+
+/**
+ * Created by MarkPerry on 2/06/2014.
+ */
+public interface Try3<A, B, C, D> {
+
+    D f(A a, B b, C c) throws Exception;
+
+}
diff --git a/core/src/main/java/fj/Try4.java b/core/src/main/java/fj/Try4.java
@@ -0,0 +1,10 @@
+package fj;
+
+/**
+ * Created by MarkPerry on 2/06/2014.
+ */
+public interface Try4<A, B, C, D, E> {
+
+    E f(A a, B b, C c, D d) throws Exception;
+
+}
diff --git a/core/src/main/java/fj/data/Validation.java b/core/src/main/java/fj/data/Validation.java
@@ -30,10 +30,10 @@
  *
  * @version %build.number%
  */
-public final class Validation<E, T> implements Iterable<T> {
+public class Validation<E, T> implements Iterable<T> {
   private final Either<E, T> e;
 
-  private Validation(final Either<E, T> e) {
+  protected Validation(final Either<E, T> e) {
     this.e = e;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -824,4 +824,14 @@ static public <A, B> ArrayList<B> mapJ(final F<A, B> f, final ArrayList<A> as) {`
`824`	`824`	`return new ArrayList<B>(iterableStream(as).map(f).toCollection());`
`825`	`825`	`}`
`826`	`826`
	`827`	`+ static public <A, B> F<A, Try<B>> toF1(final Try1<A, B> t) {`
	`828`	`+ return a -> {`
	`829`	`+ try {`
	`830`	`+ return Try.trySuccess(t.f(a));`
	`831`	`+ } catch (Exception e) {`
	`832`	`+ return Try.<B>tryFail(e);`
	`833`	`+ }`
	`834`	`+ };`
	`835`	`+ }`
	`836`	`+`
`827`	`837`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@`
`30`	`30`	`*`
`31`	`31`	`* @version %build.number%`
`32`	`32`	`*/`
`33`		`-public final class Validation<E, T> implements Iterable<T> {`
	`33`	`+public class Validation<E, T> implements Iterable<T> {`
`34`	`34`	`private final Either<E, T> e;`
`35`	`35`
`36`		`- private Validation(final Either<E, T> e) {`
	`36`	`+ protected Validation(final Either<E, T> e) {`
`37`	`37`	`this.e = e;`
`38`	`38`	`}`
`39`	`39`