Cleanup pass

Pass to do some cleanups

1 files changed, 72 insertions, 46 deletions

diff --git a/src/main/java/bjc/data/Either.java b/src/main/java/bjc/data/Either.java
index 0588496..55518d8 100644
--- a/src/main/java/bjc/data/Either.java
+++ b/src/main/java/bjc/data/Either.java
@@ -9,10 +9,10 @@ import java.util.function.Function;
  * @author ben
  *
  * @param <LeftType>
- *        The type that could be on the left.
+ *                    The type that could be on the left.
  *
  * @param <RightType>
- *        The type that could be on the right.
+ *                    The type that could be on the right.
  *
  */
 public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
@@ -20,17 +20,18 @@ 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.
+	 *                    The type of the left value.
 	 *
 	 * @param <RightType>
-	 *        The type of the empty right value.
-	 * 
+	 *                    The type of the empty right value.
+	 *
 	 * @param left
-	 *        The value to put on the left.
+	 *                    The value to put on the left.
 	 *
 	 * @return An either with the left side occupied.
 	 */
-	public static <LeftType, RightType> Either<LeftType, RightType> left(final LeftType left) {
+	public static <LeftType, RightType> Either<LeftType, RightType>
+			left(final LeftType left) {
 		return new Either<>(left, null);
 	}
 
@@ -38,17 +39,18 @@ 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.
+	 *                    The type of the empty left value.
 	 *
 	 * @param <RightType>
-	 *        The type of the right value.
+	 *                    The type of the right value.
 	 *
 	 * @param right
-	 *        The value to put on the right.
+	 *                    The value to put on the right.
 	 *
 	 * @return An either with the right side occupied.
 	 */
-	public static <LeftType, RightType> Either<LeftType, RightType> right(final RightType right) {
+	public static <LeftType, RightType> Either<LeftType, RightType>
+			right(final RightType right) {
 		return new Either<>(null, right);
 	}
 
@@ -61,7 +63,7 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 
 	/* Create a new either with specifed values. */
 	private Either(final LeftType left, final RightType right) {
-		if(left == null) {
+		if (left == null) {
 			rightVal = right;
 		} else {
 			leftVal = left;
@@ -73,17 +75,20 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 	@Override
 	public <BoundLeft, BoundRight> IPair<BoundLeft, BoundRight> bind(
 			final 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);
 	}
 
 	@Override
-	public <BoundLeft> IPair<BoundLeft, RightType> bindLeft(
-			final Function<LeftType, IPair<BoundLeft, RightType>> leftBinder) {
-		if(leftBinder == null) throw new NullPointerException("Left binder must not be null");
+	public <BoundLeft> IPair<BoundLeft, RightType>
+			bindLeft(final Function<LeftType, IPair<BoundLeft, RightType>> leftBinder) {
+		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);
 	}
@@ -91,27 +96,31 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 	@Override
 	public <BoundRight> IPair<LeftType, BoundRight> bindRight(
 			final 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);
 	}
 
 	@Override
-	public <OtherLeft, OtherRight, CombinedLeft, CombinedRight> IPair<CombinedLeft, CombinedRight> combine(
-			final IPair<OtherLeft, OtherRight> otherPair,
-			final BiFunction<LeftType, OtherLeft, CombinedLeft> leftCombiner,
-			final BiFunction<RightType, OtherRight, CombinedRight> rightCombiner) {
-		if(otherPair == null) {
+	public <OtherLeft, OtherRight, CombinedLeft, CombinedRight>
+			IPair<CombinedLeft, CombinedRight>
+			combine(final IPair<OtherLeft, OtherRight> otherPair,
+					final BiFunction<LeftType, OtherLeft, CombinedLeft> leftCombiner,
+					final BiFunction<RightType, OtherRight,
+							CombinedRight> rightCombiner) {
+		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) {
+		} else if (rightCombiner == null) {
 			throw new NullPointerException("Right combiner must not be null");
 		}
 
-		if(isLeft) {
+		if (isLeft) {
 			return otherPair.bind((otherLeft, otherRight) -> {
 				CombinedLeft cLeft = leftCombiner.apply(leftVal, otherLeft);
 
@@ -127,26 +136,34 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 	}
 
 	@Override
-	public <NewLeft> IPair<NewLeft, RightType> mapLeft(final Function<LeftType, NewLeft> mapper) {
-		if(mapper == null) throw new NullPointerException("Mapper must not be null");
+	public <NewLeft> IPair<NewLeft, RightType>
+			mapLeft(final Function<LeftType, NewLeft> mapper) {
+		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(final Function<RightType, NewRight> mapper) {
-		if(mapper == null) throw new NullPointerException("Mapper must not be null");
+	public <NewRight> IPair<LeftType, NewRight>
+			mapRight(final Function<RightType, NewRight> mapper) {
+		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(final BiFunction<LeftType, RightType, MergedType> merger) {
-		if(merger == null) throw new NullPointerException("Merger must not be null");
+	public <MergedType> MergedType
+			merge(final BiFunction<LeftType, RightType, MergedType> merger) {
+		if (merger == null)
+			throw new NullPointerException("Merger must not be null");
 
 		return merger.apply(leftVal, rightVal);
 	}
@@ -165,27 +182,36 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 
 	@Override
 	public boolean equals(final Object obj) {
-		if(this == obj) return true;
-		if(obj == null) return false;
-		if(!(obj instanceof Either<?, ?>)) return false;
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (!(obj instanceof Either<?, ?>))
+			return false;
 
 		final Either<?, ?> other = (Either<?, ?>) obj;
 
-		if(isLeft != other.isLeft) return false;
+		if (isLeft != other.isLeft)
+			return false;
 
-		if(leftVal == null) {
-			if(other.leftVal != null) return false;
-		} else if(!leftVal.equals(other.leftVal)) return false;
+		if (leftVal == null) {
+			if (other.leftVal != null)
+				return false;
+		} else if (!leftVal.equals(other.leftVal))
+			return false;
 
-		if(rightVal == null) {
-			if(other.rightVal != null) return false;
-		} else if(!rightVal.equals(other.rightVal)) return false;
+		if (rightVal == null) {
+			if (other.rightVal != null)
+				return false;
+		} else if (!rightVal.equals(other.rightVal))
+			return false;
 
 		return true;
 	}
 
 	@Override
 	public String toString() {
-		return String.format("Either [leftVal='%s', rightVal='%s', isLeft=%s]", leftVal, rightVal, isLeft);
+		return String.format("Either [leftVal='%s', rightVal='%s', isLeft=%s]", leftVal,
+				rightVal, isLeft);
 	}
 }