@HxPushUrl(true) now retreives the path from the request

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

@@ -5,6 +5,8 @@
 import java.lang.reflect.Method;
 import java.time.Duration;
 
+import java.util.Objects;
+
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.method.HandlerMethod;
@@ -60,7 +62,7 @@ public boolean preHandle(HttpServletRequest request,
         if (handler instanceof HandlerMethod) {
             Method method = ((HandlerMethod) handler).getMethod();
             setHxLocation(response, method);
-            setHxPushUrl(response, method);
+            setHxPushUrl(request, response, method);
             setHxRedirect(response, method);
             setHxReplaceUrl(response, method);
             setHxReswap(response, method);
@@ -94,10 +96,19 @@ private void setHxLocation(HttpServletResponse response, Method method) {
         }
     }
 
-    private void setHxPushUrl(HttpServletResponse response, Method method) {
+    private void setHxPushUrl(HttpServletRequest request, HttpServletResponse response, Method method) {
         HxPushUrl methodAnnotation = AnnotatedElementUtils.findMergedAnnotation(method, HxPushUrl.class);
         if (methodAnnotation != null) {
-            setHeader(response, HX_PUSH_URL, methodAnnotation.value());
+            if(!Objects.equals(methodAnnotation.value(), HtmxValue.TRUE)){
+                setHeader(response, HX_PUSH_URL, methodAnnotation.value());
+            }
+            String path = request.getRequestURI();
+            String queryString = request.getQueryString();
+
+            if (queryString != null && !queryString.isEmpty()) {
+                path += "?" + queryString;
+            }
+            setHeader(response, HX_PUSH_URL, path);
         }
     }
 

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

@@ -141,11 +141,17 @@ public void testHxLocationWithoutContextData() throws Exception {
     }
 
     @Test
-    public void testHxPushUrl() throws Exception {
-        mockMvc.perform(get("/hx-push-url"))
+    public void testHxPushUrlPath() throws Exception {
+        mockMvc.perform(get("/hx-push-url-path"))
                .andExpect(status().isOk())
                .andExpect(header().string("HX-Push-Url", "/path"));
     }
+    @Test
+    public void testHxPushUrl() throws Exception {
+        mockMvc.perform(get("/hx-push-url?test=hello"))
+               .andExpect(status().isOk())
+               .andExpect(header().string("HX-Push-Url", "/hx-push-url?test=hello"));
+    }
 
     @Test
     public void testHxRedirect() throws Exception {

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

@@ -121,9 +121,16 @@ public String hxLocationWithContextData() {
         return "";
     }
 
-    @GetMapping("/hx-push-url")
+    @GetMapping("/hx-push-url-path")
     @HxPushUrl("/path")
     @ResponseBody
+    public String hxPushUrlPath() {
+        return "";
+    }
+
+    @GetMapping("/hx-push-url")
+    @HxPushUrl
+    @ResponseBody
     public String hxPushUrl() {
         return "";
     }