tursom/TursomServer
0
0
Fork 0
mirror of https://github.com/tursom/TursomServer.git synced 2025-01-06 10:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复AsyncRoutedHttpHandler对手动处理的错误处理

Browse Source
This commit is contained in:
tursom 2019-12-14 17:57:55 +08:00
parent e35ee79a0e
commit 90a7fc237e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/web-coroutine/src/main/kotlin/cn/tursom/web/router/AsyncRoutedHttpHandler.kt
View File

@ -85,6 +85,7 @@ open class AsyncRoutedHttpHandler(
method.annotations.forEach { annotation ->
log?.info("method route {} annotation {}", method, annotation)
val (routes, router) = getAsyncRoutes(annotation) ?: return@forEach
@Suppress("DuplicatedCode")
log?.info("method route {} mapped to {}", method, routes)
routes.forEach { route ->
if (mapping.isEmpty()) {
@ -114,10 +115,10 @@ open class AsyncRoutedHttpHandler(
(method as suspend Any.() -> Any?)(obj)?.let { result -> autoReturn(result, content) }
}
}
} else obj to when (method.returnType) {
Void::class.java -> method as suspend (HttpContent) -> Unit
Void.TYPE -> method as suspend (HttpContent) -> Unit
Unit::class.java -> method as suspend (HttpContent) -> Unit
} else obj to when (method.returnType.jvmErasure.java) {
Void::class.java -> { content -> (method as suspend Any.(HttpContent) -> Unit)(obj, content) }
Void.TYPE -> { content -> (method as suspend Any.(HttpContent) -> Unit)(obj, content) }
Unit::class.java -> { content -> (method as suspend Any.(HttpContent) -> Unit)(obj, content) }
else -> when {
method.findAnnotation<Html>() != null -> { content ->
(method as suspend Any.(HttpContent) -> Any?)(obj, content)?.let { result -> finishHtml(result, content) }