lens.ofOption to not crash on unexpected nulls

solita · Dec 10, 2024 · 37088f1 · 37088f1
1 parent 6d15a31
commit 37088f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.solita.utils</groupId>
     <artifactId>functional-utils</artifactId>
-    <version>0.12.55</version>
+    <version>0.12.57</version>
     <build>
         <resources>
                 <resource>

diff --git a/src/main/java/fi/solita/utils/functional/lens/Lens.java b/src/main/java/fi/solita/utils/functional/lens/Lens.java
@@ -82,9 +82,11 @@ public D apply(D d, final Apply<Option<S>, Option<S>> f) {
                     return lens.modify(d, new Apply<Option<E>,Option<E>>() {
                         public Option<E> apply(Option<E> c) {
                             return c == null ? null : !c.isDefined() ? c : Some(lens2.modify(c.get(), new Apply<S, S>() {
+                                @SuppressWarnings("unchecked")
                                 @Override
                                 public S apply(S t) {
-                                    return f.apply(Some(t)).get();
+                                    Object ret = f.apply(Some(t));
+                                    return ret instanceof Option ? ((Option<S>)ret).get() : (S)ret;
                                 }
                             }));
                         };