GH-51 Improve default mappings of interceptors (Fix #51)

* fix: improve default mappings of interceptors * Update routing-annotations/routing-annotated/src/test/java/io/javalin/community/routing/annotations/AnnotatedRoutingTest.kt Co-authored-by: Itzdlg <[email protected]> --------- Co-authored-by: Itzdlg <[email protected]>
javalin · Jan 16, 2025 · e6f40cb · e6f40cb
1 parent eaf6490
commit e6f40cb
Show file tree

Hide file tree

Showing 3 changed files with 447 additions and 325 deletions.
diff --git a/...ated/src/main/kotlin/io/javalin/community/routing/annotations/ReflectiveEndpointLoader.kt b/...ated/src/main/kotlin/io/javalin/community/routing/annotations/ReflectiveEndpointLoader.kt
@@ -74,23 +74,32 @@ internal class ReflectiveEndpointLoader(
             val status = method.getAnnotation<Status>()
             val resultHandler = findResultHandler(method)
 
-            val route = AnnotatedRoute(
-                method = httpMethod,
-                path = ("/$endpointPath/$path").replace(repeatedPathSeparatorRegex, "/"),
-                version = method.getAnnotation<Version>()?.value,
-                handler = {
-                    val arguments = argumentSuppliers
-                        .map { it(this, Unit) }
-                        .toTypedArray()
+            val declaredPath = "/$endpointPath/$path".replace(repeatedPathSeparatorRegex, "/").dropLastWhile { it == '/' }
+            val processedPaths = mutableSetOf(declaredPath)
 
-                    when (async) {
-                        true -> async { invokeAndUnwrapIfErrored(method, endpoint, arguments, ctx = this, status = status, resultHandler = resultHandler) }
-                        else -> invokeAndUnwrapIfErrored(method, endpoint, arguments, ctx = this, status = status, resultHandler = resultHandler)
-                    }
-                }
-            )
+            if (!httpMethod.isHttpMethod && declaredPath.endsWith("*")) {
+                processedPaths.add(declaredPath.dropLast(1).dropLastWhile { it == '/' })
+            }
 
-            endpointRoutes.add(route)
+            processedPaths.forEach { pathToAdd ->
+                endpointRoutes.add(
+                    AnnotatedRoute(
+                        method = httpMethod,
+                        path = pathToAdd,
+                        version = method.getAnnotation<Version>()?.value,
+                        handler = {
+                            val arguments = argumentSuppliers
+                                .map { it(this, Unit) }
+                                .toTypedArray()
+
+                            when (async) {
+                                true -> async { invokeAndUnwrapIfErrored(method, endpoint, arguments, ctx = this, status = status, resultHandler = resultHandler) }
+                                else -> invokeAndUnwrapIfErrored(method, endpoint, arguments, ctx = this, status = status, resultHandler = resultHandler)
+                            }
+                        }
+                    )
+                )
+            }
         }
 
         return endpointRoutes