Ignore content-type header when route expects none.

Author: mduesterhoeft

router/src/main/kotlin/io/moia/router/RequestPredicate.kt

@@ -55,9 +55,11 @@ data class RequestPredicate(
         matchedAcceptType(acceptedMediaTypes) != null
 
     private fun contentTypeMatches(contentType: String?) =
-        if (consumes.isEmpty() && contentType == null) true
-        else if (contentType == null) false
-        else consumes.any { MediaType.parse(contentType).`is`(MediaType.parse(it)) }
+        when {
+            consumes.isEmpty() -> true
+            contentType == null -> false
+            else -> consumes.any { MediaType.parse(contentType).`is`(MediaType.parse(it)) }
+        }
 }
 
 internal data class RequestMatchResult(

router/src/test/kotlin/io/moia/router/RequestHandlerTest.kt

@@ -147,6 +147,23 @@ class RequestHandlerTest {
         assert(handler.filterInvocations).isEqualTo(2)
     }
 
+    @Test
+    fun `should ignore content-type header when handler expects none`() {
+
+        val handler = TestRequestHandlerWithFilter()
+        val response = handler.handleRequest(
+            APIGatewayProxyRequestEvent()
+                .withPath("/some")
+                .withHttpMethod("GET")
+                .withHeaders(mapOf(
+                    "Accept" to "application/json",
+                    "content-type" to "application/json"
+                )), mockk()
+        )
+
+        assert(response.statusCode).isEqualTo(200)
+    }
+
     @Test
     fun `should handle deserialization error`() {
 

router/src/test/kotlin/io/moia/router/RouterTest.kt

@@ -31,10 +31,10 @@ class RouterTest {
     @Test
     fun `should register routes`() {
         val router = router {
-            PUT("/some") { r: Request<Unit> -> ResponseEntity.ok("") }
-            PATCH("/some") { r: Request<Unit> -> ResponseEntity.ok("") }
-            DELETE("/some") { r: Request<Unit> -> ResponseEntity.ok("") }
-            POST("/some") { r: Request<Unit> -> ResponseEntity.ok("") }
+            PUT("/some") { _: Request<Unit> -> ResponseEntity.ok("") }
+            PATCH("/some") { _: Request<Unit> -> ResponseEntity.ok("") }
+            DELETE("/some") { _: Request<Unit> -> ResponseEntity.ok("") }
+            POST("/some") { _: Request<Unit> -> ResponseEntity.ok("") }
         }
 
         then(router.routes.map { it.requestPredicate.method }).containsOnly("PUT", "PATCH", "DELETE", "POST")