From 504ca816530efdff06bc202e0432ebd354aec304 Mon Sep 17 00:00:00 2001
From: EVE <EVE@EVE-PC>
Date: Tue, 14 Mar 2017 12:07:14 -0400
Subject: Cleanup

---
 BJC-Utils2/src/main/java/bjc/utils/data/Option.java | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'BJC-Utils2/src/main/java/bjc/utils/data/Option.java')

diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/Option.java b/BJC-Utils2/src/main/java/bjc/utils/data/Option.java
index 210d2aa..052e78a 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Option.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Option.java
@@ -5,7 +5,7 @@ import java.util.function.UnaryOperator;
 
 /**
  * A holder that may or may not contain a value
- * 
+ *
  * @author ben
  *
  * @param <ContainedType>
@@ -16,7 +16,7 @@ public class Option<ContainedType> implements IHolder<ContainedType> {
 
 	/**
 	 * Create a new optional, using the given initial value
-	 * 
+	 *
 	 * @param seed
 	 *                The initial value for the optional
 	 */
@@ -26,9 +26,7 @@ public class Option<ContainedType> implements IHolder<ContainedType> {
 
 	@Override
 	public <BoundType> IHolder<BoundType> bind(Function<ContainedType, IHolder<BoundType>> binder) {
-		if (held == null) {
-			return new Option<>(null);
-		}
+		if(held == null) return new Option<>(null);
 
 		return binder.apply(held);
 	}
@@ -42,16 +40,14 @@ public class Option<ContainedType> implements IHolder<ContainedType> {
 
 	@Override
 	public <MappedType> IHolder<MappedType> map(Function<ContainedType, MappedType> mapper) {
-		if (held == null) {
-			return new Option<>(null);
-		}
+		if(held == null) return new Option<>(null);
 
 		return new Option<>(mapper.apply(held));
 	}
 
 	@Override
 	public IHolder<ContainedType> transform(UnaryOperator<ContainedType> transformer) {
-		if (held != null) {
+		if(held != null) {
 			held = transformer.apply(held);
 		}
 
@@ -60,9 +56,7 @@ public class Option<ContainedType> implements IHolder<ContainedType> {
 
 	@Override
 	public <UnwrappedType> UnwrappedType unwrap(Function<ContainedType, UnwrappedType> unwrapper) {
-		if (held == null) {
-			return null;
-		}
+		if(held == null) return null;
 
 		return unwrapper.apply(held);
 	}
-- 
cgit v1.2.3