Removed IOW

mperry · mperry · commit 2ee2950ab391 · 2021-04-02T01:37:55.000+10:00
diff --git a/core/src/main/java/fj/data/IO.java b/core/src/main/java/fj/data/IO.java
@@ -4,6 +4,9 @@
  * Created by MarkPerry on 19/06/2014.
  */
 
+import fj.F;
+import fj.Unit;
+
 import java.io.IOException;
 
 /**
@@ -13,8 +16,33 @@
  *
  * @param <A> the type of the result produced by the IO
  */
+@FunctionalInterface
 public interface IO<A> {
 
 	A run() throws IOException;
 
+	default SafeIO<Validation<IOException, A>> safe() {
+		return IOFunctions.toSafeValidation(this);
+	}
+
+	default <B> IO<B> map(F<A, B> f) {
+		return IOFunctions.map(this, f);
+	}
+
+	default <B> IO<B> bind(F<A, IO<B>> f) {
+		return IOFunctions.bind(this, f);
+	}
+
+	default <B> IO<B> append(IO<B> iob) {
+		return IOFunctions.append(this, iob);
+	}
+
+	public static IO<LazyString> getContents() {
+		return () -> IOFunctions.getContents().run();
+	}
+
+	public static IO<Unit> interact(F<LazyString, LazyString> f) {
+		return () -> IOFunctions.interact(f).run();
+	}
+
 }
diff --git a/core/src/main/java/fj/data/IOW.java b/core/src/main/java/fj/data/IOW.java
diff --git a/core/src/main/java/fj/data/SafeIO.java b/core/src/main/java/fj/data/SafeIO.java
@@ -3,6 +3,7 @@
 /**
  * Created by MarkPerry on 3/07/2014.
  */
+@FunctionalInterface
 public interface SafeIO<A> extends IO<A> {
 
 	@Override
diff --git a/demo/src/main/java/fj/demo/IOWalkthrough.java b/demo/src/main/java/fj/demo/IOWalkthrough.java
@@ -4,7 +4,6 @@
 import fj.Unit;
 import fj.data.IO;
 import fj.data.IOFunctions;
-import fj.data.IOW;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -72,7 +71,7 @@ public static void main(String[] args) {
         // for composing IO values instead, the entire program can be written like so:
 
         F<String, String> f = String::toUpperCase;
-        IOW.lift(stdoutPrintln("What's your name again?"))
+        stdoutPrintln("What's your name again?")
                 .append(stdoutPrint("Name: "))
                 .append(stdinReadLine())
                 .bind(f.andThen(IOFunctions::stdoutPrintln))
