#82 move fallback to Server class from Router because Server initiali…

…zes NotFoundRoute

CHANGELOG.md

@@ -6,6 +6,7 @@
 * json: TSGenerator will now use more type-safe string template types for java.time classes, e.g. `${number}-${number}-${number}` instead of `string`
 * server: `Server(InetSocketAddress(0))` can now be used to bind to any available port.
 * server: make idle restarts quick #96
+* server: initialize `HttpExchange.pathParams` even no route is matched (404), for decorators #82
 * jackson: serialize enums using their toString() method by default, this fixes `openapi` module usage with `jackson` #88
 * liquibase: do not close jdbc connection if it was passed by user #81
 

server/src/klite/Router.kt

@@ -40,11 +40,11 @@ class Router(
   private val log = logger()
   val routes = mutableListOf<Route>() // TODO: use ExplicitBackingFields feature when it is more stable for immutable getter
 
-  internal fun route(exchange: HttpExchange): Pair<Route?, PathParams> {
+  internal fun route(exchange: HttpExchange): Pair<Route, PathParams>? {
     val suffix = exchange.path.removePrefix(prefix)
     return match(exchange.method, suffix)?.let {
       it.first to PathParams(it.second.groups)
-    } ?: (null to PathParams.EMPTY)
+    }
   }
 
   private fun match(method: RequestMethod, path: String): Pair<Route, MatchResult>? {

server/src/klite/Server.kt

@@ -78,7 +78,7 @@ class Server(
       val notFoundRoute = NotFoundRoute(prefix, notFoundHandler)
       addContext(prefix, router) {
         val r = router.route(this)
-        runHandler(this, r.first ?: notFoundRoute, r.second)
+        runHandler(this, r?.first ?: notFoundRoute, r?.second ?: PathParams.EMPTY)
       }
       router.block()
       notFoundRoute.decoratedHandler = router.decorators.wrap(notFoundHandler)