make default consumes and produces configurable

Author: mduesterhoeft

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

@@ -4,15 +4,13 @@ import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestHandler
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent
-import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.github.mduesterhoeft.router.ProtoBufUtils.toJsonWithoutWrappers
 import com.google.common.net.MediaType
 import com.google.protobuf.GeneratedMessageV3
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.util.Base64
-import java.util.logging.LogManager
 import kotlin.reflect.KClass
 import kotlin.reflect.jvm.reflect
 

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

@@ -6,8 +6,8 @@ import com.google.common.net.MediaType
 data class RequestPredicate(
     val method: String,
     val pathPattern: String,
-    var produces: Set<String> = setOf("application/json", "application/x-protobuf"),
-    var consumes: Set<String> = setOf("application/json", "application/x-protobuf")
+    var produces: Set<String>,
+    var consumes: Set<String>
 ) {
 
     fun consuming(vararg mediaTypes: String): RequestPredicate {

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

@@ -6,28 +6,63 @@ class Router {
 
     val routes = mutableListOf<RouterFunction<*, *>>()
 
+    var defaultConsuming = setOf("application/json", "application/x-protobuf")
+    var defaultProducing = setOf("application/json", "application/x-protobuf")
+
     fun <I, T> GET(pattern: String, handlerFunction: HandlerFunction<I, T>) =
         RequestPredicate(
             method = "GET",
             pathPattern = pattern,
-            consumes = emptySet()
+            consumes = emptySet(),
+            produces = defaultProducing
         ).also { routes += RouterFunction(it, handlerFunction) }
 
     fun <I, T> POST(pattern: String, handlerFunction: HandlerFunction<I, T>) =
-        RequestPredicate("POST", pattern).also {
+        RequestPredicate(
+            method = "POST",
+            pathPattern = pattern,
+            consumes = defaultConsuming,
+            produces = defaultProducing
+        ).also {
             routes += RouterFunction(it, handlerFunction)
         }
 
     fun <I, T> PUT(pattern: String, handlerFunction: HandlerFunction<I, T>) =
-        RequestPredicate("PUT", pattern).also {
+        RequestPredicate(
+            method = "PUT",
+            pathPattern = pattern,
+            consumes = defaultConsuming,
+            produces = defaultProducing
+        ).also {
             routes += RouterFunction(it, handlerFunction)
         }
 
     fun <I, T> DELETE(pattern: String, handlerFunction: HandlerFunction<I, T>) =
-        RequestPredicate("DELETE", pattern).also {
+        RequestPredicate(
+            method = "DELETE",
+            pathPattern = pattern,
+            consumes = defaultConsuming,
+            produces = defaultProducing
+        ).also {
             routes += RouterFunction(it, handlerFunction)
         }
 
+    fun <I, T> PATCH(pattern: String, handlerFunction: HandlerFunction<I, T>) =
+        RequestPredicate(
+            method = "PATCH",
+            pathPattern = pattern,
+            consumes = defaultConsuming,
+            produces = defaultProducing
+        ).also {
+            routes += RouterFunction(it, handlerFunction)
+        }
+
+    // the default content types the HandlerFunctions of this router can produce
+    fun defaultProducing(contentTypes: Set<String>): Router = this.also { defaultProducing = contentTypes }
+
+    // the default content types the HandlerFunctions of this router can handle
+    fun defaultConsuming(contentTypes: Set<String>): Router = this.also { defaultConsuming = contentTypes }
+
     companion object {
         fun router(routes: Router.() -> Unit) = Router().apply(routes)
     }

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

@@ -7,7 +7,6 @@ import com.github.mduesterhoeft.router.Router.Companion.router
 import com.github.mduesterhoeft.router.sample.proto.SampleOuterClass.Sample
 import io.mockk.mockk
 import org.junit.jupiter.api.Test
-import java.util.Base64
 
 class RequestHandlerTest {
 
@@ -20,8 +19,7 @@ class RequestHandlerTest {
             APIGatewayProxyRequestEvent()
                 .withPath("/some")
                 .withHttpMethod("GET")
-                .withHeaders(mapOf("Accept" to "application/json"))
-            , mockk()
+                .withHeaders(mapOf("Accept" to "application/json")), mockk()
         )!!
 
         assert(response.statusCode).isEqualTo(200)
@@ -35,8 +33,7 @@ class RequestHandlerTest {
             APIGatewayProxyRequestEvent()
                 .withPath("/some-proto")
                 .withHttpMethod("GET")
-                .withHeaders(mapOf("Accept" to "application/json"))
-            , mockk()
+                .withHeaders(mapOf("Accept" to "application/json")), mockk()
         )!!
 
         assert(response.statusCode).isEqualTo(200)
@@ -50,8 +47,7 @@ class RequestHandlerTest {
             APIGatewayProxyRequestEvent()
                 .withPath("/some-proto")
                 .withHttpMethod("GET")
-                .withHeaders(mapOf("Accept" to "application/x-protobuf"))
-            , mockk()
+                .withHeaders(mapOf("Accept" to "application/x-protobuf")), mockk()
         )!!
 
         assert(response.statusCode).isEqualTo(200)
@@ -65,8 +61,7 @@ class RequestHandlerTest {
             APIGatewayProxyRequestEvent()
                 .withPath("/some")
                 .withHttpMethod("GET")
-                .withHeaders(mapOf("Accept" to "img/jpg"))
-            , mockk()
+                .withHeaders(mapOf("Accept" to "img/jpg")), mockk()
         )!!
 
         assert(response.statusCode).isEqualTo(406)
@@ -82,8 +77,7 @@ class RequestHandlerTest {
                 .withHeaders(mapOf(
                     "Accept" to "application/json",
                     "Content-Type" to "image/jpg"
-                ))
-            , mockk()
+                )), mockk()
         )!!
 
         assert(response.statusCode).isEqualTo(415)
@@ -100,8 +94,7 @@ class RequestHandlerTest {
                     "Accept" to "application/json",
                     "Content-Type" to "application/json"
                 ))
-                .withBody("""{ "greeting": "some" }""")
-            , mockk()
+                .withBody("""{ "greeting": "some" }"""), mockk()
         )!!
 
         assert(response.statusCode).isEqualTo(200)
@@ -118,8 +111,7 @@ class RequestHandlerTest {
                 .withHeaders(mapOf(
                     "Accept" to "application/json",
                     "Content-Type" to "image/jpg"
-                ))
-            , mockk()
+                )), mockk()
         )!!
 
         assert(response.statusCode).isEqualTo(405)
@@ -132,8 +124,7 @@ class RequestHandlerTest {
             APIGatewayProxyRequestEvent()
                 .withPath("/some-other")
                 .withHttpMethod("GET")
-                .withHeaders(mapOf("Accept" to "application/json"))
-            , mockk()
+                .withHeaders(mapOf("Accept" to "application/json")), mockk()
         )!!
 
         assert(response.statusCode).isEqualTo(404)
@@ -145,10 +136,10 @@ class RequestHandlerTest {
         data class TestRequest(val greeting: String)
 
         override val router = router {
-            GET("/some") { request: Request<Unit> ->
+            GET("/some") { _: Request<Unit> ->
                 ResponseEntity.ok(TestResponse("Hello"))
             }
-            GET("/some-proto") { request: Request<Unit> ->
+            GET("/some-proto") { _: Request<Unit> ->
                 ResponseEntity.ok(Sample.newBuilder().setHello("Hello").build())
             }
             POST("/some") { r: Request<TestRequest> ->