From 0f093a6616def007ed1f8933425e36b60d3d4924 Mon Sep 17 00:00:00 2001 From: Petr Knap <8299754+petrknap@users.noreply.github.com> Date: Fri, 30 Oct 2026 18:12:17 +0100 Subject: [PATCH] feat: implemented `JavaSe11\Optional` --- .github/workflows/java-test.yaml | 2 ++ README.md | 1 + src/JavaSe11/Optional.php | 24 ++++++++++++++++++++++++ src/Optional.php | 15 +++++++++++++-- tests/JavaSe11/OptionalTest.java | 16 ++++++++++++++++ tests/JavaSe11/OptionalTestCase.php | 19 +++++++++++++++++++ tests/JavaSe16/OptionalTestCase.php | 5 ++--- 7 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 src/JavaSe11/Optional.php create mode 100644 tests/JavaSe11/OptionalTest.java create mode 100644 tests/JavaSe11/OptionalTestCase.php diff --git a/.github/workflows/java-test.yaml b/.github/workflows/java-test.yaml index e29c0f9..8354260 100644 --- a/.github/workflows/java-test.yaml +++ b/.github/workflows/java-test.yaml @@ -17,6 +17,8 @@ jobs: lts: 11 - se: 10 lts: 11 + - se: 11 + lts: 11 - se: 16 lts: 17 name: Java SE ${{ matrix.se }} diff --git a/README.md b/README.md index d33cade..c3a3ef2 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ The **entire feature set is explicitly described and checked** by: - [`JavaSe8/OptionalTest.java`](./tests/JavaSe8/OptionalTest.java) - [`JavaSe9/OptionalTest.java`](./tests/JavaSe9/OptionalTest.java) - [`JavaSe10/OptionalTest.java`](./tests/JavaSe10/OptionalTest.java) +- [`JavaSe11/OptionalTest.java`](./tests/JavaSe11/OptionalTest.java) - [`JavaSe16/OptionalTest.java`](./tests/JavaSe16/OptionalTest.java) This ensures absolute reliability and alignment with the Java specification. diff --git a/src/JavaSe11/Optional.php b/src/JavaSe11/Optional.php new file mode 100644 index 0000000..288210c --- /dev/null +++ b/src/JavaSe11/Optional.php @@ -0,0 +1,24 @@ + + */ +interface Optional extends JavaSe10\Optional +{ + /** + * If a value is not present, returns `true`, otherwise `false`. + */ + public function isEmpty(): bool; +} diff --git a/src/Optional.php b/src/Optional.php index 1335c70..5382ed1 100644 --- a/src/Optional.php +++ b/src/Optional.php @@ -10,9 +10,9 @@ /** * @template-covariant T of mixed type of non-null value * - * @implements JavaSe10\Optional + * @implements JavaSe11\Optional */ -abstract class Optional implements JavaSe10\Optional +abstract class Optional implements JavaSe11\Optional { /** * @param T|null $value @@ -194,6 +194,17 @@ public function ifPresentOrElse(callable $action, callable $emptyAction): void $this->ifPresent($action, else: $emptyAction); } + /** + * @note do not use it internally, compare {@see self::$value} to `null` directly + */ + public function isEmpty(): bool + { + return $this->value === null; + } + + /** + * @note do not use it internally, compare {@see self::$value} to `null` directly + */ public function isPresent(): bool { return $this->value !== null; diff --git a/tests/JavaSe11/OptionalTest.java b/tests/JavaSe11/OptionalTest.java new file mode 100644 index 0000000..4b51c1b --- /dev/null +++ b/tests/JavaSe11/OptionalTest.java @@ -0,0 +1,16 @@ +import java.util.Optional; + +/** + * @note `assert`s are written as `assert (...)` to simplify translate to PHP + * @note variable names are prefixed by `$` to simplify translate to PHP + */ +public class OptionalTest { + public static void main(String[] args) { + testIsEmpty(); + } + + private static void testIsEmpty() { + assert (Optional.of(1).isEmpty() == false); + assert (Optional.empty().isEmpty() == true); + } +} diff --git a/tests/JavaSe11/OptionalTestCase.php b/tests/JavaSe11/OptionalTestCase.php new file mode 100644 index 0000000..3f46db4 --- /dev/null +++ b/tests/JavaSe11/OptionalTestCase.php @@ -0,0 +1,19 @@ +