Cleanup

1 files changed, 23 insertions, 43 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java
index d425d99..6ab8121 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/internals/BoundLazyPair.java
@@ -1,14 +1,14 @@
 package bjc.utils.data.internals;
 
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 import bjc.utils.data.IHolder;
 import bjc.utils.data.IPair;
 import bjc.utils.data.Identity;
 import bjc.utils.data.LazyPair;
 
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
 /**
  * Implements a lazy pair that has been bound
  */
@@ -47,15 +47,13 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 	@Override
 	public <BoundLeft, BoundRight> IPair<BoundLeft, BoundRight> bind(
 			BiFunction<NewLeft, NewRight, IPair<BoundLeft, BoundRight>> bindr) {
-		if (bindr == null) {
-			throw new NullPointerException("Binder must not be null");
-		}
+		if(bindr == null) throw new NullPointerException("Binder must not be null");
 
 		IHolder<IPair<NewLeft, NewRight>> newPair = new Identity<>(boundPair);
 		IHolder<Boolean> newPairMade = new Identity<>(pairBound);
 
 		Supplier<NewLeft> leftSupp = () -> {
-			if (!newPairMade.getValue()) {
+			if(!newPairMade.getValue()) {
 				newPair.replace(binder.apply(leftSupplier.get(), rightSupplier.get()));
 
 				newPairMade.replace(true);
@@ -65,7 +63,7 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 		};
 
 		Supplier<NewRight> rightSupp = () -> {
-			if (!newPairMade.getValue()) {
+			if(!newPairMade.getValue()) {
 				newPair.replace(binder.apply(leftSupplier.get(), rightSupplier.get()));
 
 				newPairMade.replace(true);
@@ -80,14 +78,12 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 	@Override
 	public <BoundLeft> IPair<BoundLeft, NewRight> bindLeft(
 			Function<NewLeft, IPair<BoundLeft, NewRight>> 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");
 
 		Supplier<NewLeft> leftSupp = () -> {
 			IPair<NewLeft, NewRight> newPair = boundPair;
 
-			if (!pairBound) {
+			if(!pairBound) {
 				newPair = binder.apply(leftSupplier.get(), rightSupplier.get());
 			}
 
@@ -100,14 +96,12 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 	@Override
 	public <BoundRight> IPair<NewLeft, BoundRight> bindRight(
 			Function<NewRight, IPair<NewLeft, 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");
 
 		Supplier<NewRight> rightSupp = () -> {
 			IPair<NewLeft, NewRight> newPair = boundPair;
 
-			if (!pairBound) {
+			if(!pairBound) {
 				newPair = binder.apply(leftSupplier.get(), rightSupplier.get());
 			}
 
@@ -122,13 +116,11 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 			IPair<OtherLeft, OtherRight> otherPair,
 			BiFunction<NewLeft, OtherLeft, CombinedLeft> leftCombiner,
 			BiFunction<NewRight, 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");
 
 		return otherPair.bind((otherLeft, otherRight) -> {
 			return bind((leftVal, rightVal) -> {
@@ -140,12 +132,10 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 
 	@Override
 	public <NewLeftType> IPair<NewLeftType, NewRight> mapLeft(Function<NewLeft, NewLeftType> mapper) {
-		if (mapper == null) {
-			throw new NullPointerException("Mapper must not be null");
-		}
+		if(mapper == null) throw new NullPointerException("Mapper must not be null");
 
 		Supplier<NewLeftType> leftSupp = () -> {
-			if (!pairBound) {
+			if(!pairBound) {
 				NewLeft leftVal = binder.apply(leftSupplier.get(), rightSupplier.get()).getLeft();
 
 				return mapper.apply(leftVal);
@@ -155,9 +145,7 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 		};
 
 		Supplier<NewRight> rightSupp = () -> {
-			if (!pairBound) {
-				return binder.apply(leftSupplier.get(), rightSupplier.get()).getRight();
-			}
+			if(!pairBound) return binder.apply(leftSupplier.get(), rightSupplier.get()).getRight();
 
 			return boundPair.getRight();
 		};
@@ -167,20 +155,16 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 
 	@Override
 	public <NewRightType> IPair<NewLeft, NewRightType> mapRight(Function<NewRight, NewRightType> mapper) {
-		if (mapper == null) {
-			throw new NullPointerException("Mapper must not be null");
-		}
+		if(mapper == null) throw new NullPointerException("Mapper must not be null");
 
 		Supplier<NewLeft> leftSupp = () -> {
-			if (!pairBound) {
-				return binder.apply(leftSupplier.get(), rightSupplier.get()).getLeft();
-			}
+			if(!pairBound) return binder.apply(leftSupplier.get(), rightSupplier.get()).getLeft();
 
 			return boundPair.getLeft();
 		};
 
 		Supplier<NewRightType> rightSupp = () -> {
-			if (!pairBound) {
+			if(!pairBound) {
 				NewRight rightVal = binder.apply(leftSupplier.get(), rightSupplier.get()).getRight();
 
 				return mapper.apply(rightVal);
@@ -194,11 +178,9 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 
 	@Override
 	public <MergedType> MergedType merge(BiFunction<NewLeft, NewRight, MergedType> merger) {
-		if (merger == null) {
-			throw new NullPointerException("Merger must not be null");
-		}
+		if(merger == null) throw new NullPointerException("Merger must not be null");
 
-		if (!pairBound) {
+		if(!pairBound) {
 			boundPair = binder.apply(leftSupplier.get(), rightSupplier.get());
 
 			pairBound = true;
@@ -209,9 +191,7 @@ public class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight> implements IPai
 
 	@Override
 	public String toString() {
-		if (pairBound) {
-			return boundPair.toString();
-		}
+		if(pairBound) return boundPair.toString();
 
 		return "(un-materialized)";
 	}