Fixed Option.when in case of a nullable supplier

vavr-io · Apr 14, 2016 · 7e1e7f9 · 7e1e7f9 · danieldietrich · Sep 1, 2016
1 parent 71d4c3f
commit 7e1e7f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/javaslang/src/main/java/javaslang/control/Option.java b/javaslang/src/main/java/javaslang/control/Option.java
@@ -134,7 +134,7 @@ static <T> Option<T> narrow(Option<? extends T> option) {
      */
     static <T> Option<T> when(boolean condition, Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return condition ? of(supplier.get()) : none();
+        return condition ? some(supplier.get()) : none();
     }
 
     /**

diff --git a/javaslang/src/test/java/javaslang/control/OptionTest.java b/javaslang/src/test/java/javaslang/control/OptionTest.java
@@ -71,7 +71,7 @@ public void shouldCreateNothing() {
 
     @Test
     public void shouldWrapIfTrue() {
-        assertThat(Option.of(null)).isEqualTo(Option.when(true, () -> null));
+        assertThat(Option.some(null)).isEqualTo(Option.when(true, () -> null));
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ public void shouldCreateNothing() { @@
         @Test
         public void shouldWrapIfTrue() {
-            assertThat(Option.of(null)).isEqualTo(Option.when(true, () -> null));
+            assertThat(Option.some(null)).isEqualTo(Option.when(true, () -> null));
         }
         @Test
@@ Expand Down @@