Ignore content-type for deletion requests (#12)

* Ignore content-type for deletion requests

Co-authored-by: Nihal Gonsalves <[email protected]>

* Format kotlin

Author: blockvote

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

@@ -14,12 +14,7 @@ class Router {
     var filter: Filter = Filter.NoOp
 
     fun <I, T> GET(pattern: String, handlerFunction: HandlerFunction<I, T>) =
-        RequestPredicate(
-            method = "GET",
-            pathPattern = pattern,
-            consumes = emptySet(),
-            produces = defaultProducing
-        ).also { routes += RouterFunction(it, handlerFunction) }
+        defaultRequestPredicate(pattern, "GET", handlerFunction, emptySet())
 
     fun <I, T> POST(pattern: String, handlerFunction: HandlerFunction<I, T>) =
         defaultRequestPredicate(pattern, "POST", handlerFunction)
@@ -28,16 +23,21 @@ class Router {
         defaultRequestPredicate(pattern, "PUT", handlerFunction)
 
     fun <I, T> DELETE(pattern: String, handlerFunction: HandlerFunction<I, T>) =
-        defaultRequestPredicate(pattern, "DELETE", handlerFunction)
+        defaultRequestPredicate(pattern, "DELETE", handlerFunction, emptySet())
 
     fun <I, T> PATCH(pattern: String, handlerFunction: HandlerFunction<I, T>) =
         defaultRequestPredicate(pattern, "PATCH", handlerFunction)
 
-    private fun <I, T> defaultRequestPredicate(pattern: String, method: String, handlerFunction: HandlerFunction<I, T>) =
+    private fun <I, T> defaultRequestPredicate(
+        pattern: String,
+        method: String,
+        handlerFunction: HandlerFunction<I, T>,
+        consuming: Set<String> = defaultConsuming
+    ) =
         RequestPredicate(
             method = method,
             pathPattern = pattern,
-            consumes = defaultConsuming,
+            consumes = consuming,
             produces = defaultProducing
         ).also { routes += RouterFunction(it, handlerFunction) }
 

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

@@ -324,6 +324,18 @@ class RequestHandlerTest {
         assert(response.headers["location"]).isEqualTo("http://localhost/test")
     }
 
+    @Test
+    fun `Deletion should ignore the body and content-type`() {
+        val response = testRequestHandler.handleRequest(
+            DELETE("/delete-me")
+                .withHeader("Accept", "application/json")
+                .withHeader("Content-Type", "text/csv")
+                .withBody("this may be faulty"),
+            mockk()
+        )
+        assert(response.statusCode).isEqualTo(204)
+    }
+
     class TestRequestHandlerAuthorization : RequestHandler() {
         override val router = router {
             GET("/some") { _: Request<Unit> ->
@@ -424,6 +436,9 @@ class RequestHandlerTest {
             POST("/create-with-location") { r: Request<TestRequest> ->
                 ResponseEntity.created(null, r.apiRequest.location("test"), emptyMap())
             }
+            DELETE("/delete-me") { _: Request<Unit> ->
+                ResponseEntity.noContent()
+            }
         }
     }
 }

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

@@ -92,4 +92,16 @@ class RouterTest {
             assertTrue(UriTemplate.from(pathPattern).matches("/some/sub/sub/sub/path"))
         }
     }
+
+    @Test
+    fun `should not consume for a deletion route`() {
+        val router = router {
+            DELETE("/delete-me") { r: Request<Unit> ->
+                ResponseEntity.ok(null)
+            }
+        }
+        with(router.routes.first().requestPredicate) {
+            assert(consumes).isEqualTo(setOf<String>())
+        }
+    }
 }