[jex generation] fix newline in generated code (#523)

rbygrave · web-flow · commit da4431eda8f8 · 2024-12-02T23:00:11.000+13:00
diff --git a/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java b/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java
@@ -256,7 +256,6 @@ private void write(boolean requestScoped) {
       } else {
         writer.append(indent);
         writeContextReturn(responseMode, "result");
-        writer.eol();
       }
       if (includeNoContent) {
         writer.append("    }").eol();
@@ -268,7 +267,7 @@ private void writeContextReturn(ResponseMode responseMode, String resultVariable
     final UType type = UType.parse(method.returnType());
     if ("java.util.concurrent.CompletableFuture".equals(type.mainType())) {
       logError(method.element(), "CompletableFuture is not a supported return type.");
-      writer.append("; //ERROR");
+      writer.append("; //ERROR").eol();
       return;
     }
 
@@ -280,6 +279,7 @@ private void writeContextReturn(ResponseMode responseMode, String resultVariable
       case Templating -> writer.append("ctx.html(%s);", resultVariable);
       default -> writer.append("ctx.contentType(\"%s\").write(%s);", produces, resultVariable);
     }
+    writer.eol();
   }
 
   private void writeJsonReturn(String produces) {
diff --git a/tests/test-jex/src/main/java/org/example/web/ContentController.java b/tests/test-jex/src/main/java/org/example/web/ContentController.java
@@ -6,21 +6,22 @@
 import io.avaje.http.api.Get;
 import io.avaje.http.api.Path;
 import org.example.web.template.ViewHome;
+import org.example.web.template.ViewPartial;
 
 @Controller
 @Html
 @Path("ui")
 public class ContentController {
 
+  @HxRequest
   @Get
-  Object index() {
-    return  new ViewHome("Hi");
+  ViewPartial indexHxPartial() {
+    return new ViewPartial("Rob");
   }
 
-  @HxRequest
   @Get
-  Object indexHxReqest() {
-    return  new ViewHome("Hi");
+  ViewHome index() {
+    return new ViewHome("Hi");
   }
 
 }
diff --git a/tests/test-jex/src/main/java/org/example/web/template/ViewPartial.java b/tests/test-jex/src/main/java/org/example/web/template/ViewPartial.java
@@ -0,0 +1,12 @@
+package org.example.web.template;
+
+import io.jstach.jstache.JStache;
+
+@JStache(path = "partial")
+public class ViewPartial {
+  public final String name;
+
+  public ViewPartial(String name) {
+    this.name = name;
+  }
+}
diff --git a/tests/test-jex/src/main/resources/public/openapi.json b/tests/test-jex/src/main/resources/public/openapi.json
@@ -1280,7 +1280,7 @@
 						"content" : {
 							"text/html;charset=UTF8" : {
 								"schema" : {
-									"$ref" : "#/components/schemas/Object"
+									"$ref" : "#/components/schemas/ViewHome"
 								}
 							}
 						}
@@ -1405,8 +1405,21 @@
 					}
 				}
 			},
-			"Object" : {
-				"type" : "object"
+			"ViewHome" : {
+				"type" : "object",
+				"properties" : {
+					"name" : {
+						"type" : "string"
+					}
+				}
+			},
+			"ViewPartial" : {
+				"type" : "object",
+				"properties" : {
+					"name" : {
+						"type" : "string"
+					}
+				}
 			},
 			"WebHelloDto" : {
 				"type" : "object",
diff --git a/tests/test-jex/src/main/resources/ui/fragments/layout.mustache b/tests/test-jex/src/main/resources/ui/fragments/layout.mustache
@@ -5,7 +5,6 @@
   <script src="https://unpkg.com/htmx.org@1.9.12"></script>
 </head>
 <body>
-<h1>Heading</h1>
 {{$body}}Empty body{{/body}}
 </body>
 </html>
diff --git a/tests/test-jex/src/main/resources/ui/home.mustache b/tests/test-jex/src/main/resources/ui/home.mustache
@@ -1,8 +1,6 @@
 {{<fragments/layout}}
-  {{$body}}
-    <div id="name">
-      Hi there {{ name }}
-    </div>
-    <button hx-get="name" hx-target="#name">One</button>
+{{$body}}
+  <button hx-get="/ui" hx-target="#replaceMe">Update name</button>
+  <div id="replaceMe">placeholder</div>
 {{/body}}
 {{/fragments/layout}}
diff --git a/tests/test-jex/src/main/resources/ui/name.mustache b/tests/test-jex/src/main/resources/ui/name.mustache
diff --git a/tests/test-jex/src/main/resources/ui/partial.mustache b/tests/test-jex/src/main/resources/ui/partial.mustache
@@ -0,0 +1 @@
+<p>Hi {{ name }}!!</p>

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,6 @@ private void write(boolean requestScoped) {`
`256`	`256`	`} else {`
`257`	`257`	`writer.append(indent);`
`258`	`258`	`writeContextReturn(responseMode, "result");`
`259`		`- writer.eol();`
`260`	`259`	`}`
`261`	`260`	`if (includeNoContent) {`
`262`	`261`	`writer.append(" }").eol();`
`@@ -268,7 +267,7 @@ private void writeContextReturn(ResponseMode responseMode, String resultVariable`
`268`	`267`	`final UType type = UType.parse(method.returnType());`
`269`	`268`	`if ("java.util.concurrent.CompletableFuture".equals(type.mainType())) {`
`270`	`269`	`logError(method.element(), "CompletableFuture is not a supported return type.");`
`271`		`- writer.append("; //ERROR");`
	`270`	`+ writer.append("; //ERROR").eol();`
`272`	`271`	`return;`
`273`	`272`	`}`
`274`	`273`
`@@ -280,6 +279,7 @@ private void writeContextReturn(ResponseMode responseMode, String resultVariable`
`280`	`279`	`case Templating -> writer.append("ctx.html(%s);", resultVariable);`
`281`	`280`	`default -> writer.append("ctx.contentType(\"%s\").write(%s);", produces, resultVariable);`
`282`	`281`	`}`
	`282`	`+ writer.eol();`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`private void writeJsonReturn(String produces) {`