From 889fac2bdf993dc86f64a8893c0260fdcf848acb Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Mon, 10 Apr 2017 16:40:33 -0400 Subject: Cleanup --- .../src/main/java/bjc/utils/data/Either.java | 96 +++++++++------------- 1 file changed, 38 insertions(+), 58 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/data/Either.java') 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 d07fbbe..36b3324 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/data/Either.java +++ b/BJC-Utils2/src/main/java/bjc/utils/data/Either.java @@ -25,7 +25,7 @@ public class Either implements IPair { * The value to put on the left * @return An either with the left side occupied */ - public static Either left(LeftType left) { + public static Either left(final LeftType left) { return new Either<>(left, null); } @@ -40,7 +40,7 @@ public class Either implements IPair { * The value to put on the right * @return An either with the right side occupied */ - public static Either right(RightType right) { + public static Either right(final RightType right) { return new Either<>(null, right); } @@ -50,7 +50,7 @@ public class Either implements IPair { private boolean isLeft; - private Either(LeftType left, RightType right) { + private Either(final LeftType left, final RightType right) { if (left == null) { rightVal = right; } else { @@ -62,53 +62,46 @@ public class Either implements IPair { @Override public IPair bind( - BiFunction> binder) { - if (binder == null) - throw new NullPointerException("Binder must not be null"); + final BiFunction> binder) { + if (binder == null) throw new NullPointerException("Binder must not be null"); return binder.apply(leftVal, rightVal); } @Override public IPair bindLeft( - Function> leftBinder) { - if (leftBinder == null) - throw new NullPointerException("Left binder must not be null"); + final Function> 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); } @Override public IPair bindRight( - Function> rightBinder) { - if (rightBinder == null) - throw new NullPointerException("Right binder must not be null"); + final Function> rightBinder) { + 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 IPair combine( - IPair otherPair, - BiFunction leftCombiner, - BiFunction rightCombiner) { + final IPair otherPair, + final BiFunction leftCombiner, + final BiFunction rightCombiner) { if (otherPair == null) throw new NullPointerException("Other pair must not be 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)); @@ -116,31 +109,26 @@ public class Either implements IPair { } @Override - public IPair mapLeft(Function mapper) { - if (mapper == null) - throw new NullPointerException("Mapper must not be null"); + public IPair mapLeft(final Function 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 IPair mapRight(Function mapper) { - if (mapper == null) - throw new NullPointerException("Mapper must not be null"); + public IPair mapRight(final Function 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 merge(BiFunction merger) { - if (merger == null) - throw new NullPointerException("Merger must not be null"); + public MergedType merge(final BiFunction merger) { + if (merger == null) throw new NullPointerException("Merger must not be null"); return merger.apply(leftVal, rightVal); } @@ -151,37 +139,29 @@ public class Either implements IPair { int result = 1; result = prime * result + (isLeft ? 1231 : 1237); - result = prime * result + ((leftVal == null) ? 0 : leftVal.hashCode()); - result = prime * result + ((rightVal == null) ? 0 : rightVal.hashCode()); + 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 (!(obj instanceof Either)) - return false; + public boolean equals(final Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (!(obj instanceof Either)) return false; - Either other = (Either) obj; + 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 (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 (other.rightVal != null) return false; + } else if (!rightVal.equals(other.rightVal)) return false; return true; } -- cgit v1.2.3