Add kala.collection.MapLike::getOrThrow(K)

Glavo · Jan 13, 2025 · 2838abe · 2838abe
1 parent 99cf01d
commit 2838abe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,10 @@
 
 ### New features
 
+* Add `kala.control.OptionContainer::getOrThrow()`
 * Add `kala.collection.base.OrderedTraversable::mapIndexed(CollectionFactory<U, ?, R>, IndexedFunction<T, U>)`
 * Add `kala.collection.base.OrderedTraversable::mapIndexedTo(G, IndexedFunction<T, U>)`
+* Add `kala.collection.MapLike::getOrThrow(K)`
 * Add `kala.collection.Set::added(E)`
 * Add `kala.collection.Set::addedAll(E...)`
 * Add `kala.collection.Set::addedAll(Iterable<E>)`

diff --git a/kala-base/src/main/java/kala/control/OptionContainer.java b/kala-base/src/main/java/kala/control/OptionContainer.java
@@ -144,6 +144,13 @@ default <Ex extends Throwable> T getOrThrow(@NotNull Supplier<? extends Ex> supp
         return get();
     }
 
+    default T getOrThrow() {
+        if (isEmpty()) {
+            throw new NoSuchElementException();
+        }
+        return get();
+    }
+
     default <U> U get(@NotNull Function<? super T, ? extends U> mapper) {
         return mapper.apply(get());
     }

diff --git a/kala-collection/src/main/java/kala/collection/MapLike.java b/kala-collection/src/main/java/kala/collection/MapLike.java
@@ -127,6 +127,10 @@ default <Ex extends Throwable> V getOrThrow(K key, @NotNull Supplier<? extends E
         return getOption(key).getOrThrow(supplier);
     }
 
+    default V getOrThrow(K key) {
+        return getOption(key).getOrThrow();
+    }
+
     //region Element Conditions
 
     default boolean contains(Tuple2<? extends K, ?> value) {