Polish

Author: mduesterhoeft

router-protobuf/src/main/kotlin/com/github/mduesterhoeft/router/proto/ProtoDeserializationHandler.kt

@@ -6,7 +6,9 @@ import com.github.mduesterhoeft.router.contentType
 import com.google.common.net.MediaType
 import com.google.protobuf.Parser
 import java.util.Base64
+import kotlin.reflect.KClass
 import kotlin.reflect.KType
+import kotlin.reflect.full.staticFunctions
 
 class ProtoDeserializationHandler : DeserializationHandler {
     private val proto = MediaType.parse("application/x-protobuf")
@@ -16,7 +18,7 @@ class ProtoDeserializationHandler : DeserializationHandler {
 
     override fun deserialize(input: APIGatewayProxyRequestEvent, target: KType?): Any {
         val bytes = Base64.getDecoder().decode(input.body)
-        val parser = target.staticFunctions.first { it.name == "parser" }.call() as Parser<*>
+        val parser = (target?.classifier as KClass<*>).staticFunctions.first { it.name == "parser" }.call() as Parser<*>
         return parser.parseFrom(bytes)
     }
 }

router/src/main/kotlin/com/github/mduesterhoeft/router/RequestHandler.kt

@@ -22,7 +22,7 @@ abstract class RequestHandler : RequestHandler<APIGatewayProxyRequestEvent, APIG
     private val deserializationHandlerChain by lazy { DeserializationHandlerChain(deserializationHandlers()) }
 
     @Suppress("UNCHECKED_CAST")
-    override fun handleRequest(input: APIGatewayProxyRequestEvent, context: Context): APIGatewayProxyResponseEvent? {
+    override fun handleRequest(input: APIGatewayProxyRequestEvent, context: Context): APIGatewayProxyResponseEvent {
         log.debug("handling request with method '${input.httpMethod}' and path '${input.path}' - Accept:${input.acceptHeader()} Content-Type:${input.contentType()} $input")
         val routes = router.routes as List<RouterFunction<Any, Any>>
         val matchResults: List<RequestMatchResult> = routes.map { routerFunction: RouterFunction<Any, Any> ->

router/src/test/kotlin/com/github/mduesterhoeft/router/RequestHandlerTest.kt

@@ -19,7 +19,7 @@ class RequestHandlerTest {
                 .withPath("/some")
                 .withHttpMethod("GET")
                 .withHeaders(mapOf("Accept" to "application/json")), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(200)
         assert(response.body).isEqualTo("""{"greeting":"Hello"}""")
@@ -33,7 +33,7 @@ class RequestHandlerTest {
                 .withPath("/some/me")
                 .withHttpMethod("GET")
                 .withHeaders(mapOf("Accept" to "application/json")), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(200)
         assert(response.body).isEqualTo("""{"greeting":"Hello me"}""")
@@ -47,7 +47,7 @@ class RequestHandlerTest {
                 .withPath("/some")
                 .withHttpMethod("GET")
                 .withHeaders(mapOf("Accept" to "img/jpg")), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(406)
     }
@@ -63,7 +63,7 @@ class RequestHandlerTest {
                     "Accept" to "application/json",
                     "Content-Type" to "image/jpg"
                 )), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(415)
     }
@@ -78,7 +78,7 @@ class RequestHandlerTest {
                     "Content-Type" to "application/json"
                 ))
                 .withBody("""{ "greeting": "some" }"""), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(200)
         assert(response.body).isEqualTo("""{"greeting":"some"}""")
@@ -94,7 +94,7 @@ class RequestHandlerTest {
                                 "Content-Type" to "application/json"
                         ))
                         .withBody("""[{ "greeting": "some" },{ "greeting": "some1" }]""".trimMargin()), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(200)
         assert(response.body).isEqualTo("""[{"greeting":"some"},{"greeting":"some1"}]""")
@@ -111,7 +111,7 @@ class RequestHandlerTest {
                     "Accept" to "application/json",
                     "Content-Type" to "image/jpg"
                 )), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(405)
     }
@@ -124,7 +124,7 @@ class RequestHandlerTest {
                 .withPath("/some-other")
                 .withHttpMethod("GET")
                 .withHeaders(mapOf("Accept" to "application/json")), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(404)
     }
@@ -138,7 +138,7 @@ class RequestHandlerTest {
                 .withPath("/some")
                 .withHttpMethod("GET")
                 .withHeaders(mapOf("Accept" to "application/json")), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(200)
         assert(handler.filterInvocations).isEqualTo(2)
@@ -156,7 +156,7 @@ class RequestHandlerTest {
                     )
                 )
                 .withBody("{}"), mockk()
-        )!!
+        )
         assert(response.statusCode).isEqualTo(422)
     }
 
@@ -168,7 +168,7 @@ class RequestHandlerTest {
                 .withPath("/some-api-exception")
                 .withHttpMethod("GET")
                 .withHeaders(mapOf("Accept" to "application/json")), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(400)
     }
@@ -181,7 +181,7 @@ class RequestHandlerTest {
                 .withPath("/some-internal-server-error")
                 .withHttpMethod("GET")
                 .withHeaders(mapOf("Accept" to "application/json")), mockk()
-        )!!
+        )
 
         assert(response.statusCode).isEqualTo(500)
     }