Fixing route.when (#20)

JPro-one · Dec 15, 2023 · 2b8a136 · 2b8a136
1 parent be15156
commit 2b8a136
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+
+### 0.2.8
+#### Changes
+* Fixed parts of the `Route.when` api, which had unexpected argument types.
+
 ### 0.2.7 (December 8, 2023)
 
 #### Improvements

diff --git a/jpro-routing/core/src/main/scala/one/jpro/platform/routing/Route.scala b/jpro-routing/core/src/main/scala/one/jpro/platform/routing/Route.scala
@@ -64,10 +64,15 @@ trait Route {
     val r2: FXFuture[Response] = if(condResult) _then(r) else null
     r2
   })
-  def when(cond: java.util.function.Function[Request, FXFuture[java.lang.Boolean]], _then: Response): Route = and(r => {
-    cond.apply(r).map(condResult => if(condResult) _then else null)
-  })
   def when(cond: Predicate[Request], _then: Route, _else: Route): Route = and(r => {
     if(cond.test(r)) _then(r) else _else(r)
   })
+
+  def when(cond: java.util.function.Function[Request, FXFuture[java.lang.Boolean]], _then: Route): Route = and(r => {
+    cond.apply(r).flatMap(condResult => if (condResult) _then(r) else null)
+  })
+
+  def when(cond: java.util.function.Function[Request, FXFuture[java.lang.Boolean]], _then: Route, _else: Route): Route = and(r => {
+    cond.apply(r).flatMap(condResult => if (condResult) _then(r) else _else(r))
+  })
 }