Avoid unnecessary null check in Optional_Option

jbgi · jbgi · commit 93a003e9cdcb · 2016-05-24T07:41:22.000+02:00
diff --git a/java8/src/main/java/fj/data/Java8.java b/java8/src/main/java/fj/data/Java8.java
@@ -108,7 +108,7 @@ public static <A> Option<A> Optional_Option(final Optional<A> o) {
     }
 
     public static <A> F<Optional<A>, Option<A>> Optional_Option() {
-        return o -> o.isPresent() ? Option.fromNull(o.get()) : Option.none();
+        return o -> o.isPresent() ? Option.some(o.get()) : Option.none();
     }
 
     public static <A> Optional<A> Option_Optional(final Option<A> o) {

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public static <A> Option<A> Optional_Option(final Optional<A> o) {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`public static <A> F<Optional<A>, Option<A>> Optional_Option() {`
`111`		`- return o -> o.isPresent() ? Option.fromNull(o.get()) : Option.none();`
	`111`	`+ return o -> o.isPresent() ? Option.some(o.get()) : Option.none();`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`public static <A> Optional<A> Option_Optional(final Option<A> o) {`