Cleanup

1 files changed, 20 insertions, 44 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/Either.java b/BJC-Utils2/src/main/java/bjc/utils/data/Either.java
index 7ec1720..d34f752 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Either.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Either.java
@@ -5,7 +5,7 @@ import java.util.function.Function;
 
 /**
  * Represents a pair where only one side has a value
- * 
+ *
  * @author ben
  * @param <LeftType>
  *                The type that could be on the left
@@ -16,7 +16,7 @@ import java.util.function.Function;
 public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 	/**
 	 * Create a new either with the left value occupied
-	 * 
+	 *
 	 * @param <LeftType>
 	 *                The type of the left value
 	 * @param <RightType>
@@ -31,7 +31,7 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 
 	/**
 	 * Create a new either with the right value occupied
-	 * 
+	 *
 	 * @param <LeftType>
 	 *                The type of the empty left value
 	 * @param <RightType>
@@ -51,7 +51,7 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 	private boolean isLeft;
 
 	private Either(LeftType left, RightType right) {
-		if (left == null) {
+		if(left == null) {
 			rightVal = right;
 		} else {
 			leftVal = left;
@@ -63,9 +63,7 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 	@Override
 	public <BoundLeft, BoundRight> IPair<BoundLeft, BoundRight> bind(
 			BiFunction<LeftType, RightType, IPair<BoundLeft, BoundRight>> binder) {
-		if (binder == null) {
-			throw new NullPointerException("Binder must not be null");
-		}
+		if(binder == null) throw new NullPointerException("Binder must not be null");
 
 		return binder.apply(leftVal, rightVal);
 	}
@@ -73,13 +71,9 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 	@Override
 	public <BoundLeft> IPair<BoundLeft, RightType> bindLeft(
 			Function<LeftType, IPair<BoundLeft, RightType>> leftBinder) {
-		if (leftBinder == null) {
-			throw new NullPointerException("Left binder must not be null");
-		}
+		if(leftBinder == null) throw new NullPointerException("Left binder must not be null");
 
-		if (isLeft) {
-			return leftBinder.apply(leftVal);
-		}
+		if(isLeft) return leftBinder.apply(leftVal);
 
 		return new Either<>(null, rightVal);
 	}
@@ -87,13 +81,9 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 	@Override
 	public <BoundRight> IPair<LeftType, BoundRight> bindRight(
 			Function<RightType, IPair<LeftType, BoundRight>> rightBinder) {
-		if (rightBinder == null) {
-			throw new NullPointerException("Right binder must not be null");
-		}
+		if(rightBinder == null) throw new NullPointerException("Right binder must not be null");
 
-		if (isLeft) {
-			return new Either<>(leftVal, null);
-		}
+		if(isLeft) return new Either<>(leftVal, null);
 
 		return rightBinder.apply(rightVal);
 	}
@@ -103,19 +93,15 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 			IPair<OtherLeft, OtherRight> otherPair,
 			BiFunction<LeftType, OtherLeft, CombinedLeft> leftCombiner,
 			BiFunction<RightType, OtherRight, CombinedRight> rightCombiner) {
-		if (otherPair == null) {
+		if(otherPair == null)
 			throw new NullPointerException("Other pair must not be null");
-		} else if (leftCombiner == null) {
+		else if(leftCombiner == null)
 			throw new NullPointerException("Left combiner must not be null");
-		} else if (rightCombiner == null) {
-			throw new NullPointerException("Right combiner must not be null");
-		}
+		else if(rightCombiner == null) throw new NullPointerException("Right combiner must not be null");
 
-		if (isLeft) {
-			return otherPair.bind((otherLeft, otherRight) -> {
-				return new Either<>(leftCombiner.apply(leftVal, otherLeft), null);
-			});
-		}
+		if(isLeft) return otherPair.bind((otherLeft, otherRight) -> {
+			return new Either<>(leftCombiner.apply(leftVal, otherLeft), null);
+		});
 
 		return otherPair.bind((otherLeft, otherRight) -> {
 			return new Either<>(null, rightCombiner.apply(rightVal, otherRight));
@@ -124,35 +110,25 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 
 	@Override
 	public <NewLeft> IPair<NewLeft, RightType> mapLeft(Function<LeftType, NewLeft> mapper) {
-		if (mapper == null) {
-			throw new NullPointerException("Mapper must not be null");
-		}
+		if(mapper == null) throw new NullPointerException("Mapper must not be null");
 
-		if (isLeft) {
-			return new Either<>(mapper.apply(leftVal), null);
-		}
+		if(isLeft) return new Either<>(mapper.apply(leftVal), null);
 
 		return new Either<>(null, rightVal);
 	}
 
 	@Override
 	public <NewRight> IPair<LeftType, NewRight> mapRight(Function<RightType, NewRight> mapper) {
-		if (mapper == null) {
-			throw new NullPointerException("Mapper must not be null");
-		}
+		if(mapper == null) throw new NullPointerException("Mapper must not be null");
 
-		if (isLeft) {
-			return new Either<>(leftVal, null);
-		}
+		if(isLeft) return new Either<>(leftVal, null);
 
 		return new Either<>(null, mapper.apply(rightVal));
 	}
 
 	@Override
 	public <MergedType> MergedType merge(BiFunction<LeftType, RightType, MergedType> merger) {
-		if (merger == null) {
-			throw new NullPointerException("Merger must not be null");
-		}
+		if(merger == null) throw new NullPointerException("Merger must not be null");
 
 		return merger.apply(leftVal, rightVal);
 	}