fix htmx GET routes with path params (#84)

Author: wakingrufus

spring-funk-htmx/src/main/kotlin/com/github/wakingrufus/funk/htmx/route/ParamRoute.kt

@@ -32,10 +32,10 @@ class ParamRoute<CONTROLLER : Any, REQ : Record, RESP : Any>(
                     beanFactory.getBean<ObjectMapper>()
                         .convertValue(request.params().toSingleValueMap(), requestClass)
                 } else {
-                    log.warn { "unsupported content type $contentType" }
-                    null
+                    beanFactory.getBean<ObjectMapper>()
+                        .convertValue(request.pathVariables(), requestClass)
                 }
-                val resp = beanFactory.getBean(controllerClass).binding(req!!)
+                val resp = beanFactory.getBean(controllerClass).binding(req)
 
                 val acceptedType = request.headers().accept()
                 if (MediaType.APPLICATION_JSON.isCompatibleWith(contentType) && acceptedType.any {

test-application/src/main/kotlin/com/github/wakingrufus/funk/example/ExampleApplication.kt

@@ -7,6 +7,7 @@ import com.github.wakingrufus.funk.htmx.HttpVerb
 import com.github.wakingrufus.funk.htmx.htmx
 import com.github.wakingrufus.funk.htmx.hxPost
 import com.github.wakingrufus.funk.htmx.swap.HxSwapType
+import com.github.wakingrufus.funk.htmx.template.htmxTemplate
 import com.github.wakingrufus.funk.logging.logging
 import com.github.wakingrufus.funk.webmvc.webmvc
 import io.github.oshai.kotlinlogging.KotlinLogging
@@ -21,6 +22,14 @@ import org.springframework.web.servlet.function.ServerResponse
 
 const val helloWorldUrl = "/load"
 
+val responseTemplate = htmxTemplate<HelloWorldResponse> {
+    div {
+        span {
+            +it.message
+        }
+    }
+}
+
 class ExampleApplication : SpringFunkApplication {
     private val log = KotlinLogging.logger {}
     override fun dsl(): SpringDslContainer.() -> Unit = {
@@ -33,15 +42,6 @@ class ExampleApplication : SpringFunkApplication {
         }
         htmx {
             page("/index") {
-
-                route(HttpVerb.POST, helloWorldUrl, ExampleService::sayHello) {
-                    div {
-                        span {
-                            +it.message
-                        }
-                    }
-                }
-
                 initialLoad {
                     form {
                         hxPost(helloWorldUrl) {
@@ -61,6 +61,8 @@ class ExampleApplication : SpringFunkApplication {
                         +"Click Me"
                     }
                 }
+                route(HttpVerb.POST, helloWorldUrl, ExampleService::sayHello, responseTemplate)
+                route(HttpVerb.GET,"thing/{id}", ExampleService::getThingById, responseTemplate)
             }
         }
         webmvc {

test-application/src/main/kotlin/com/github/wakingrufus/funk/example/ExampleService.kt

@@ -8,4 +8,8 @@ class ExampleService {
             HelloWorldResponse("Hello World")
         }
     }
+
+    fun getThingById(request: ThingByIdRequest): HelloWorldResponse {
+        return HelloWorldResponse("Hello ${request.id}")
+    }
 }

test-application/src/main/kotlin/com/github/wakingrufus/funk/example/HelloWorldRequest.kt

@@ -1,4 +1,9 @@
 package com.github.wakingrufus.funk.example
 
+import java.util.UUID
+
 @JvmRecord
 data class HelloWorldRequest(val name: String? = null)
+
+@JvmRecord
+data class ThingByIdRequest(val id: UUID)

test-application/src/test/kotlin/com/github/wakingrufus/funk/example/ExampleApplicationTest.kt

@@ -11,6 +11,7 @@ import org.springframework.http.MediaType
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.web.reactive.function.BodyInserters
 import java.nio.charset.StandardCharsets
+import java.util.UUID
 
 
 @SpringBootTest(
@@ -58,5 +59,13 @@ class ExampleApplicationTest {
             formResponseJson.returnResult(String::class.java).responseBodyContent?.toString(StandardCharsets.UTF_8)
         log.info { responseString }
         assertThat(responseString).isEqualTo("""{"message":"Hello bob"}""")
+
+        val pathParamResponse = client.get()
+            .uri("/thing/${UUID.randomUUID()}")
+            .accept(MediaType.TEXT_HTML)
+            .exchange()
+        log.info {
+            pathParamResponse.returnResult(String::class.java).responseBodyContent?.toString(StandardCharsets.UTF_8)
+        }
     }
 }