Cleanup

1 files changed, 50 insertions, 46 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 3ccc859..d07fbbe 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Either.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Either.java
@@ -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,7 +63,8 @@ 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);
 	}
@@ -71,9 +72,11 @@ 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);
 	}
@@ -81,9 +84,11 @@ 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);
 	}
@@ -93,15 +98,17 @@ 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));
@@ -110,25 +117,30 @@ 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);
 	}
@@ -141,49 +153,41 @@ public class Either<LeftType, RightType> implements IPair<LeftType, RightType> {
 		result = prime * result + (isLeft ? 1231 : 1237);
 		result = prime * result + ((leftVal == null) ? 0 : leftVal.hashCode());
 		result = prime * result + ((rightVal == null) ? 0 : rightVal.hashCode());
-		
+
 		return result;
 	}
 
 	@Override
 	public boolean equals(Object obj) {
-		if(this == obj) return true;
-		if(obj == null) return false;
-		if(getClass() != obj.getClass()) return false;
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (!(obj instanceof Either<?, ?>))
+			return false;
 
 		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() {
-		StringBuilder builder = new StringBuilder();
-
-		builder.append("Either [");
-
-		if(leftVal != null) {
-			builder.append("leftVal=");
-			builder.append(leftVal);
-			builder.append(", ");
-		}
-
-		if(rightVal != null) {
-			builder.append("rightVal=");
-			builder.append(rightVal);
-			builder.append(", ");
-		}
-
-		return builder.toString();
+		return String.format("Either [leftVal='%s', rightVal='%s', isLeft=%s]", leftVal, rightVal, isLeft);
 	}
-}
+}
\ No newline at end of file