Merge pull request #52 from dsyer/main

Use caching response wrapper in case views render pre-emptively
wimdeblauwe · Jul 28, 2023 · f4998bd · f4998bd
2 parents 678c9fb + ed935f2
commit f4998bd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HtmxViewHandlerInterceptor.java b/src/main/java/io/github/wimdeblauwe/hsbt/mvc/HtmxViewHandlerInterceptor.java
@@ -24,6 +24,7 @@
 import org.springframework.util.Assert;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.*;
+import org.springframework.web.util.ContentCachingResponseWrapper;
 
 import java.util.Locale;
 import java.util.Map;
@@ -130,11 +131,13 @@ private View toView(HtmxResponse partials) {
 
         return (model, request, response) -> {
             Locale locale = locales.getObject().resolveLocale(request);
+            ContentCachingResponseWrapper wrapper = new ContentCachingResponseWrapper(response);
             for (String template : partials.getTemplates()) {
                 View view = views.resolveViewName(template, locale);
                 Assert.notNull(view, "Template '" + template + "' could not be resolved");
-                view.render(model, request, response);
+                view.render(model, request, wrapper);
             }
+            wrapper.copyBodyToResponse();
         };
     }
 }