Updated inheritance of interfaces to Java 8 interfaces

mperry · mperry · commit ef79720aa0af · 2021-04-07T21:39:52.000+10:00
diff --git a/core/src/main/java/fj/F0.java b/core/src/main/java/fj/F0.java
@@ -1,11 +1,17 @@
 package fj;
 
+import java.util.function.Supplier;
+
 /**
  * Created by MarkPerry on 21/01/2015.
  */
 @FunctionalInterface
-public interface F0<A> {
+public interface F0<A> extends Supplier<A> {
 
     A f();
 
+    default A get() {
+        return f();
+    }
+
 }
diff --git a/core/src/main/java/fj/data/IO.java b/core/src/main/java/fj/data/IO.java
@@ -6,6 +6,7 @@
 
 import fj.F;
 import fj.Unit;
+import fj.function.Try0;
 
 import java.io.IOException;
 
@@ -17,10 +18,14 @@
  * @param <A> the type of the result produced by the IO
  */
 @FunctionalInterface
-public interface IO<A> {
+public interface IO<A> extends Try0<A, IOException> {
 
 	A run() throws IOException;
 
+	default A f() throws IOException {
+		return run();
+	}
+
 	default SafeIO<Validation<IOException, A>> safe() {
 		return IOFunctions.toSafeValidation(this);
 	}
diff --git a/core/src/main/java/fj/function/Effect0.java b/core/src/main/java/fj/function/Effect0.java
@@ -1,5 +1,7 @@
 package fj.function;
 
+import fj.F0;
+
 /**
  * Created by mperry on 28/08/2014.
  */
diff --git a/core/src/main/java/fj/function/Effect1.java b/core/src/main/java/fj/function/Effect1.java
@@ -1,10 +1,28 @@
 package fj.function;
 
+import fj.F;
+import fj.Unit;
+
+import java.util.function.Consumer;
+
+import static fj.Unit.unit;
+
 /**
  * Created by mperry on 28/08/2014.
  */
-public interface Effect1<A> {
+public interface Effect1<A> extends Consumer<A> {
 
 	void f(A a);
 
+	default void accept(A a) {
+		f(a);
+	}
+
+	default F<A, Unit> toF() {
+		return a -> {
+			f(a);
+			return unit();
+		};
+	}
+
 }
diff --git a/core/src/main/java/fj/function/Effect2.java b/core/src/main/java/fj/function/Effect2.java
@@ -1,10 +1,16 @@
 package fj.function;
 
+import java.util.function.BiConsumer;
+
 /**
  * Created by mperry on 28/08/2014.
  */
-public interface Effect2<A, B> {
+public interface Effect2<A, B> extends BiConsumer<A, B> {
 
 	void f(A a, B b);
 
+	default void accept(A a, B b) {
+		f(a, b);
+	}
+
 }
