remove LeftOptional

Author: h908714124

src/main/java/io/jbock/util/Either.java

@@ -33,7 +33,7 @@ public abstract class Either<L, R> {
      * @throws NullPointerException if value is {@code null}
      */
     public static <L, R> Either<L, R> left(L value) {
-        return Left.create(value);
+        return new Left<>(value);
     }
 
     /**
@@ -46,7 +46,7 @@ public static <L, R> Either<L, R> left(L value) {
      * @throws NullPointerException if value is {@code null}
      */
     public static <L, R> Either<L, R> right(R value) {
-        return Right.create(value);
+        return new Right<>(value);
     }
 
     /**
@@ -115,7 +115,7 @@ public abstract <R2> Either<L, R2> flatMap(
      * @return filter result
      */
     public abstract Either<L, R> filter(
-            Function<? super R, LeftOptional<? extends L>> predicate);
+            Function<? super R, Optional<? extends L>> predicate);
 
     /**
      * If this is a Left, returns a Left containing the result of applying the mapper function to the LHS value.
@@ -196,12 +196,12 @@ public final boolean isRight() {
     }
 
     /**
-     * If this is a Left, returns a {@code LeftOptional} containing the LHS value.
-     * Otherwise returns an empty {@code LeftOptional}.
+     * If this is a Left, returns an {@code Optional} containing the LHS value.
+     * Otherwise returns an empty {@code Optional}.
      *
      * @return the LHS value, or {@link java.util.Optional#empty()} if this is a Right
      */
-    public abstract LeftOptional<L> getLeft();
+    public abstract Optional<L> getLeft();
 
     /**
      * If this is a Right, returns an {@code Optional} containing the RHS value.

src/main/java/io/jbock/util/Left.java

@@ -5,21 +5,23 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+/**
+ * Internal implementation of a Left-Either.
+ *
+ * @param <L> the type of the LHS value
+ * @param <R> the type of the RHS value
+ */
 final class Left<L, R> extends Either<L, R> {
 
     private final L value;
 
-    private Left(L value) {
+    Left(L value) {
         this.value = Objects.requireNonNull(value);
     }
 
-    static <L, R> Left<L, R> create(L value) {
-        return new Left<>(value);
-    }
-
     @Override
-    public LeftOptional<L> getLeft() {
-        return LeftOptional.of(value);
+    public Optional<L> getLeft() {
+        return Optional.of(value);
     }
 
     @Override
@@ -43,13 +45,13 @@ public <R2> Either<L, R2> flatMap(Function<? super R, ? extends Either<? extends
     }
 
     @Override
-    public Either<L, R> filter(Function<? super R, LeftOptional<? extends L>> predicate) {
+    public Either<L, R> filter(Function<? super R, Optional<? extends L>> predicate) {
         return same();
     }
 
     @Override
     public <L2> Either<L2, R> mapLeft(Function<? super L, ? extends L2> mapper) {
-        return create(mapper.apply(value));
+        return new Left<>(mapper.apply(value));
     }
 
     @Override
@@ -63,7 +65,7 @@ public Either<L, R> filterLeft(Function<? super L, Optional<? extends R>> predic
         if (test.isEmpty()) {
             return same();
         }
-        return Right.create(test.orElseThrow());
+        return new Right<>(test.orElseThrow());
     }
 
     @Override