archetypes generating poorly formatted code (helidon-io#6623)

Signed-off-by: tvallin <thibault.vallin@oracle.com>

Author: tvallin

archetypes/helidon/src/main/archetype/common/docker.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -76,7 +76,8 @@ docker build -t {{artifactId}} .
 
 ## Running the Docker Image
 
-{{#docker-run-readme-section}}{{.}}
+{{#docker-run-readme-section}}
+{{.}}
 {{/docker-run-readme-section}}
 {{^docker-run-readme-section}}
 ```
@@ -91,7 +92,8 @@ Exercise the application as described above.
                             <![CDATA[
 ## Building a Native Image
 
-{{#native-sections}}{{.}}
+{{#native-sections}}
+{{.}}
 {{/native-sections}}
 ]]>
                         </value>

archetypes/helidon/src/main/archetype/common/files/README.md.mustache

@@ -4,10 +4,12 @@
 
 ## Build and run
 
-{{#readme-run-notes}}{{.}}
+{{#readme-run-notes}}
+{{.}}
 {{/readme-run-notes}}
 
-{{#readme-run-commands}}{{.}}
+{{#readme-run-commands}}
+{{.}}
 {{/readme-run-commands}}
 {{^readme-run-commands}}
 With JDK17+
@@ -18,8 +20,10 @@ java -jar target/{{artifactId}}.jar
 {{/readme-run-commands}}
 
 ## Exercise the application
-{{#readme-exercise-the-application}}{{.}}
+{{#readme-exercise-the-application}}
+{{.}}
 {{/readme-exercise-the-application}}
 
-{{#readme-sections}}{{.}}
+{{#readme-sections}}
+{{.}}
 {{/readme-sections}}

archetypes/helidon/src/main/archetype/common/files/pom.xml.mustache

@@ -50,7 +50,8 @@
                     </execution>
                 </executions>
             </plugin>
-{{#maven-plugins}}{{.}}
+{{#maven-plugins}}
+{{.}}
 {{/maven-plugins}}
         </plugins>
     </build>

archetypes/helidon/src/main/archetype/common/observability.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -431,7 +431,8 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
                                     <value template="mustache" order="0"><![CDATA[
         HealthSupport health = HealthSupport.builder()
                 .addLiveness(HealthChecks.healthChecks()) // Adds a convenient set of checks
-{{#Main-healthBuilder}}{{.}}
+{{#Main-healthBuilder}}
+{{.}}
 {{/Main-healthBuilder}}
                 .build();]]>
                                     </value>

archetypes/helidon/src/main/archetype/common/packaging.xml

@@ -53,7 +53,8 @@ kubectl get pods                            # Verify connectivity to cluster
 {{#k8s-readme-sections}}
 {{#first}}
 
-{{/first}}{{.}}
+{{/first}}
+{{.}}
 {{/k8s-readme-sections}}
 
 ### Deploy the application to Kubernetes

archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache

@@ -5,7 +5,8 @@ server.host=0.0.0.0
 # Change the following to true to enable the optional MicroProfile Metrics REST.request metrics
 metrics.rest-request.enabled=false
 
-{{#microprofile-config-entries}}{{.}}
+{{#microprofile-config-entries}}
+{{.}}
 {{/microprofile-config-entries}}
 
 {{#database-hikari}}

archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/application.yaml.mustache

@@ -4,11 +4,13 @@
 {{#security}}
 security:
   providers:
-{{#providers-config-entries}}{{.}}
+{{#providers-config-entries}}
+{{.}}
 {{/providers-config-entries}}
   web-server:
     # protected paths on the web server - do not include paths served by Jersey, as those are protected directly
     paths:
-{{#paths-config-entries}}{{.}}
+{{#paths-config-entries}}
+{{.}}
 {{/paths-config-entries}}
 {{/security}}

archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/logging.properties.mustache

@@ -7,7 +7,8 @@ handlers=io.helidon.common.HelidonConsoleHandler
 {{#oci-logging-entries}}
 {{#first}}
 
-{{/first}}{{.}}
+{{/first}}
+{{.}}
 {{/oci-logging-entries}}
 
 # HelidonConsoleHandler uses a SimpleFormatter subclass that replaces "!thread!" with the current thread

archetypes/helidon/src/main/archetype/mp/common/files/src/test/java/__pkg__/MainTest.java.mustache

@@ -22,13 +22,15 @@ import {{.}};
 {{/helidon-test}}
 class MainTest {
 {{#helidon-test}}
-{{#MainTest-static-fields}}{{.}}
+{{#MainTest-static-fields}}
+{{.}}
 {{/MainTest-static-fields}}
 
     @Inject
     private WebTarget target;
 
-{{#MainTest-methods}}{{.}}
+{{#MainTest-methods}}
+{{.}}
 {{/MainTest-methods}}
 {{/helidon-test}}
 }

archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache

@@ -26,7 +26,8 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
  */
 @Path("/simple-greet")
 public class SimpleGreetResource {
-{{#SimpleGreetResource-static-fields}}{{.}}
+{{#SimpleGreetResource-static-fields}}
+{{.}}
 {{/SimpleGreetResource-static-fields}}
     private final String message;
 
@@ -49,7 +50,8 @@ public class SimpleGreetResource {
         return message;
     }
 
-{{#SimpleGreetService-methods}}{{.}}
+{{#SimpleGreetService-methods}}
+{{.}}
 {{/SimpleGreetService-methods}}
 
 }