[fix] showTarget and settle parameters of @HxReswap are mapped to wrong HtmxReswap fields during conversion

Author: xhaggi

htmx-spring-boot/src/main/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxHandlerMethodHandler.java

@@ -165,7 +165,7 @@ private String convertToReswap(HxReswap annotation) {
             reswap.swap(Duration.ofMillis(annotation.swap()));
         }
         if (annotation.settle() != -1) {
-            reswap.swap(Duration.ofMillis(annotation.settle()));
+            reswap.settle(Duration.ofMillis(annotation.settle()));
         }
         if (annotation.transition()) {
             reswap.transition();
@@ -176,7 +176,7 @@ private String convertToReswap(HxReswap annotation) {
         if (annotation.show() != HxReswap.Position.UNDEFINED) {
             reswap.show(convertToPosition(annotation.show()));
             if (!annotation.showTarget().isEmpty()) {
-                reswap.scrollTarget(annotation.showTarget());
+                reswap.showTarget(annotation.showTarget());
             }
         }
         if (annotation.scroll() != HxReswap.Position.UNDEFINED) {

htmx-spring-boot/src/test/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxHandlerInterceptorTest.java

@@ -171,7 +171,7 @@ public void testHxReplaceUrlShouldPrependContextPath() throws Exception {
     public void testHxReswap() throws Exception {
         mockMvc.perform(get("/hx-reswap"))
                .andExpect(status().isOk())
-               .andExpect(header().string("HX-Reswap", "innerHTML swap:300ms"));
+               .andExpect(header().string("HX-Reswap", "innerHTML transition:true focus-scroll:true swap:0ms settle:500ms scroll:#scrollTarget:top show:#showTarget:bottom"));
     }
 
     @Test
@@ -206,7 +206,7 @@ public String methodWithHxTrigger() {
         }
 
         @GetMapping("/with-trigger-multiple-events")
-        @HxTrigger({ "event1", "event2" })
+        @HxTrigger({"event1", "event2"})
         @ResponseBody
         public String methodWithHxTriggerAndMultipleEvents() {
             return "";
@@ -220,7 +220,7 @@ public String methodWithHxTriggerAfterSettle() {
         }
 
         @GetMapping("/with-trigger-after-settle-multiple-events")
-        @HxTriggerAfterSettle({ "event1", "event2" })
+        @HxTriggerAfterSettle({"event1", "event2"})
         @ResponseBody
         public String methodWithHxTriggerAfterSettleAndMultipleEvents() {
             return "";
@@ -234,16 +234,16 @@ public String methodWithHxTriggerAfterSwap() {
         }
 
         @GetMapping("/with-trigger-after-swap-multiple-events")
-        @HxTriggerAfterSwap({ "event1", "event2" })
+        @HxTriggerAfterSwap({"event1", "event2"})
         @ResponseBody
         public String methodWithHxTriggerAfterSwapAndMultipleEvents() {
             return "";
         }
 
         @GetMapping("/with-triggers")
-        @HxTrigger({ "event1", "event2" })
-        @HxTriggerAfterSettle({ "event1", "event2" })
-        @HxTriggerAfterSwap({ "event1", "event2" })
+        @HxTrigger({"event1", "event2"})
+        @HxTriggerAfterSettle({"event1", "event2"})
+        @HxTriggerAfterSwap({"event1", "event2"})
         @ResponseBody
         public String methodWithHxTriggers() {
             return "";
@@ -312,7 +312,15 @@ public String hxReplaceUrlFalse() {
         }
 
         @GetMapping("/hx-reswap")
-        @HxReswap(value = HxSwapType.INNER_HTML, swap = 300)
+        @HxReswap(value = HxSwapType.INNER_HTML,
+                swap = 0,
+                settle = 500,
+                scroll = HxReswap.Position.TOP,
+                scrollTarget = "#scrollTarget",
+                show = HxReswap.Position.BOTTOM,
+                showTarget = "#showTarget",
+                transition = true,
+                focusScroll = HxReswap.FocusScroll.TRUE)
         @ResponseBody
         public String hxReswap() {
             return "";