From a1d9f17faf18282159c46615b916238e1770944b Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 26 Aug 2017 22:58:29 +0100
Subject: [PATCH] Value: add where() with Supplier<T> parameters

* Add `<T> Value.where(boolean, Supplier<T>, Supplier<T>)`
* Add `Optional<T> Value.where(boolean, Supplier<T>)`
---
 CHANGELOG                                     |  2 +
 README.adoc                                   | 10 +++++
 .../java/net/kemitix/conditional/Value.java   | 17 +++++++++
 .../net/kemitix/conditional/ValueTest.java    | 38 ++++++++++++++++++-
 4 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9eb5da8..accb642 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@ CHANGELOG
 0.3.0
 -----
 
+* Add `<T> Value.where(boolean, Supplier<T>, Supplier<T>)`
+* Add `Optional<T> Value.where(boolean, Supplier<T>)`
 * Add `.travis-support`
 * Avoid danger of JVM-level deadlock during `Value` initialisation
 * Avoid danger of JVM-level deadlock during `Condition` initialisation
diff --git a/README.adoc b/README.adoc
index 6dd1db4..d4bebd6 100644
--- a/README.adoc
+++ b/README.adoc
@@ -201,6 +201,16 @@ if (isTrue()) {
 String result = isTrue() ? TRUE : FALSE;
 ----
 
+[[source,java]]
+----
+final String result = Value.where(isTrue(), () -> TRUE, () -> FALSE);
+----
+
+[[source,java]]
+----
+final Optional<String> result = Value.where(isTrue(), () -> TRUE);
+----
+
 [[source,java]]
 ----
 final String result = Value.<String>where(isTrue()).then(() -> TRUE)
diff --git a/src/main/java/net/kemitix/conditional/Value.java b/src/main/java/net/kemitix/conditional/Value.java
index 24908c2..f438e25 100644
--- a/src/main/java/net/kemitix/conditional/Value.java
+++ b/src/main/java/net/kemitix/conditional/Value.java
@@ -21,6 +21,7 @@
 
 package net.kemitix.conditional;
 
+import java.util.Optional;
 import java.util.function.Supplier;
 
 /**
@@ -55,6 +56,22 @@ public interface Value {
         return where(!clause);
     }
 
+    static <T> T where(
+            boolean clause,
+            Supplier<T> trueSupplier,
+            Supplier<T> falseSupplier
+                      ) {
+        return Value.<T>where(clause).then(trueSupplier)
+                                     .otherwise(falseSupplier);
+    }
+
+    static <T> Optional<T> where(
+            boolean clause,
+            Supplier<T> trueSupplier
+                                ) {
+        return Optional.ofNullable(Value.where(clause, trueSupplier, () -> null));
+    }
+
     /**
      * An intermediate state in determining the final {@link Value}.
      *
diff --git a/src/test/java/net/kemitix/conditional/ValueTest.java b/src/test/java/net/kemitix/conditional/ValueTest.java
index 2b7b790..d76011b 100644
--- a/src/test/java/net/kemitix/conditional/ValueTest.java
+++ b/src/test/java/net/kemitix/conditional/ValueTest.java
@@ -3,6 +3,8 @@ package net.kemitix.conditional;
 import lombok.val;
 import org.junit.Test;
 
+import java.util.Optional;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -15,7 +17,39 @@ public class ValueTest {
     private static final String FALSE = "false";
 
     @Test
-    public void valueWhereTrueIsTrue() {
+    public void valueWhereClauseIsTrueTypeSafe() {
+        //when
+        final String result = Value.where(true, () -> TRUE, () -> FALSE);
+        //then
+        assertThat(result).isEqualTo(TRUE);
+    }
+
+    @Test
+    public void valueWhereClauseIsFalseTypeSafe() {
+        //when
+        final String result = Value.where(false, () -> TRUE, () -> FALSE);
+        //then
+        assertThat(result).isEqualTo(FALSE);
+    }
+
+    @Test
+    public void valueWhereClauseIsTrueIsOptional() {
+        //when
+        final Optional<String> result = Value.where(true, () -> TRUE);
+        //then
+        assertThat(result).contains(TRUE);
+    }
+
+    @Test
+    public void valueWhereClauseIsFalseIsEmptyOptional() {
+        //when
+        final Optional<String> result = Value.where(false, () -> TRUE);
+        //then
+        assertThat(result).isEmpty();
+    }
+
+    @Test
+    public void valueWhereClauseIsTrue() {
         //when
         val result = Value.<String>where(true).then(() -> TRUE)
                                               .otherwise(() -> FALSE);
@@ -24,7 +58,7 @@ public class ValueTest {
     }
 
     @Test
-    public void valueWhereFalseIsFalse() {
+    public void valueWhereClauseIsFalse() {
         //when
         val result = Value.<String>where(false).then(() -> TRUE)
                                                .otherwise(() -> FALSE);