Add Optional isEmpty(). Update test matchers

aNNiMON · Jul 25, 2018 · aef50c1 · aef50c1
1 parent 2a8fd76
commit aef50c1
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 9 deletions.
diff --git a/stream/src/main/java/com/annimon/stream/Optional.java b/stream/src/main/java/com/annimon/stream/Optional.java
@@ -88,6 +88,16 @@ public boolean isPresent() {
         return value != null;
     }
 
+    /**
+     * Checks the value is not present.
+     *
+     * @return {@code true} if a value is not present, {@code false} otherwise
+     * @since 1.2.1
+     */
+    public boolean isEmpty() {
+        return value == null;
+    }
+
     /**
      * Invokes consumer function with value if present.
      *

diff --git a/stream/src/main/java/com/annimon/stream/OptionalBoolean.java b/stream/src/main/java/com/annimon/stream/OptionalBoolean.java
@@ -87,6 +87,16 @@ public boolean isPresent() {
         return isPresent;
     }
 
+    /**
+     * Checks the value is not present.
+     *
+     * @return {@code true} if a value is not present, {@code false} otherwise
+     * @since 1.2.1
+     */
+    public boolean isEmpty() {
+        return !isPresent;
+    }
+
     /**
      * Invokes consumer function with value if present, otherwise does nothing.
      *

diff --git a/stream/src/main/java/com/annimon/stream/OptionalDouble.java b/stream/src/main/java/com/annimon/stream/OptionalDouble.java
@@ -88,6 +88,16 @@ public boolean isPresent() {
         return isPresent;
     }
 
+    /**
+     * Checks the value is not present.
+     *
+     * @return {@code true} if a value is not present, {@code false} otherwise
+     * @since 1.2.1
+     */
+    public boolean isEmpty() {
+        return !isPresent;
+    }
+
     /**
      * Invokes consumer function with value if present, otherwise does nothing.
      *

diff --git a/stream/src/main/java/com/annimon/stream/OptionalInt.java b/stream/src/main/java/com/annimon/stream/OptionalInt.java
@@ -102,6 +102,16 @@ public boolean isPresent() {
         return isPresent;
     }
 
+    /**
+     * Checks the value is not present.
+     *
+     * @return {@code true} if a value is not present, {@code false} otherwise
+     * @since 1.2.1
+     */
+    public boolean isEmpty() {
+        return !isPresent;
+    }
+
     /**
      * Invokes consumer function with value if present, otherwise does nothing.
      *

diff --git a/stream/src/main/java/com/annimon/stream/OptionalLong.java b/stream/src/main/java/com/annimon/stream/OptionalLong.java
@@ -87,6 +87,16 @@ public boolean isPresent() {
         return isPresent;
     }
 
+    /**
+     * Checks the value is not present.
+     *
+     * @return {@code true} if a value is not present, {@code false} otherwise
+     * @since 1.2.1
+     */
+    public boolean isEmpty() {
+        return !isPresent;
+    }
+
     /**
      * Invokes consumer function with value if present, otherwise does nothing.
      *

diff --git a/streamTest/src/main/java/com/annimon/stream/test/hamcrest/OptionalDoubleMatcher.java b/streamTest/src/main/java/com/annimon/stream/test/hamcrest/OptionalDoubleMatcher.java
@@ -45,7 +45,7 @@ public static class IsEmptyMatcher extends TypeSafeDiagnosingMatcher<OptionalDou
         @Override
         protected boolean matchesSafely(OptionalDouble optional, Description mismatchDescription) {
             mismatchDescription.appendText("OptionalDouble was present");
-            return !optional.isPresent();
+            return optional.isEmpty();
         }
 
         @Override
@@ -64,7 +64,7 @@ public HasValueMatcher(Matcher<? super Double> matcher) {
 
         @Override
         protected boolean matchesSafely(OptionalDouble optional, Description mismatchDescription) {
-            if (!optional.isPresent()) {
+            if (optional.isEmpty()) {
                 mismatchDescription.appendText("OptionalDouble was empty");
                 return false;
             }

diff --git a/streamTest/src/main/java/com/annimon/stream/test/hamcrest/OptionalIntMatcher.java b/streamTest/src/main/java/com/annimon/stream/test/hamcrest/OptionalIntMatcher.java
@@ -45,7 +45,7 @@ public static class IsEmptyMatcher extends TypeSafeDiagnosingMatcher<OptionalInt
         @Override
         protected boolean matchesSafely(OptionalInt optional, Description mismatchDescription) {
             mismatchDescription.appendText("OptionalInt was present");
-            return !optional.isPresent();
+            return optional.isEmpty();
         }
 
         @Override
@@ -64,7 +64,7 @@ public HasValueMatcher(Matcher<? super Integer> matcher) {
 
         @Override
         protected boolean matchesSafely(OptionalInt optional, Description mismatchDescription) {
-            if (!optional.isPresent()) {
+            if (optional.isEmpty()) {
                 mismatchDescription.appendText("OptionalInt was empty");
                 return false;
             }

diff --git a/streamTest/src/main/java/com/annimon/stream/test/hamcrest/OptionalLongMatcher.java b/streamTest/src/main/java/com/annimon/stream/test/hamcrest/OptionalLongMatcher.java
@@ -45,7 +45,7 @@ public static class IsEmptyMatcher extends TypeSafeDiagnosingMatcher<OptionalLon
         @Override
         protected boolean matchesSafely(OptionalLong optional, Description mismatchDescription) {
             mismatchDescription.appendText("OptionalLong was present");
-            return !optional.isPresent();
+            return optional.isEmpty();
         }
 
         @Override
@@ -64,7 +64,7 @@ public HasValueMatcher(Matcher<? super Long> matcher) {
 
         @Override
         protected boolean matchesSafely(OptionalLong optional, Description mismatchDescription) {
-            if (!optional.isPresent()) {
+            if (optional.isEmpty()) {
                 mismatchDescription.appendText("OptionalLong was empty");
                 return false;
             }

diff --git a/streamTest/src/main/java/com/annimon/stream/test/hamcrest/OptionalMatcher.java b/streamTest/src/main/java/com/annimon/stream/test/hamcrest/OptionalMatcher.java
@@ -45,7 +45,7 @@ public static class IsEmptyMatcher extends TypeSafeDiagnosingMatcher<Optional<?>
         @Override
         protected boolean matchesSafely(Optional<?> optional, Description mismatchDescription) {
             mismatchDescription.appendText("Optional was present");
-            return !optional.isPresent();
+            return optional.isEmpty();
         }
 
         @Override
@@ -64,7 +64,7 @@ public HasValueMatcher(Matcher<? super T> matcher) {
 
         @Override
         protected boolean matchesSafely(Optional<T> optional, Description mismatchDescription) {
-            if (!optional.isPresent()) {
+            if (optional.isEmpty()) {
                 mismatchDescription.appendText("Optional was empty");
                 return false;
             }

diff --git a/streamTest/src/main/java/com/annimon/stream/test/mockito/OptionalMatcher.java b/streamTest/src/main/java/com/annimon/stream/test/mockito/OptionalMatcher.java
@@ -41,7 +41,7 @@ public static class EmptyOptionalMatcher<T> implements ArgumentMatcher<Optional<
 
         @Override
         public boolean matches(Optional<T> argument) {
-            return argument != null && !argument.isPresent();
+            return argument != null && argument.isEmpty();
         }
 
         @Override