Update mustache format in archetype files (helidon-io#6287)

Signed-off-by: tvallin <thibault.vallin@oracle.com>
barchetta · Feb 28, 2023 · 1b0cf7a · 1b0cf7a
1 parent b7512d1
commit 1b0cf7a
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 88 deletions.
diff --git a/archetypes/helidon/src/main/archetype/common/docker.xml b/archetypes/helidon/src/main/archetype/common/docker.xml
@@ -76,8 +76,7 @@ docker build -t {{artifactId}} .
 
 ## Running the Docker Image
 
-{{#docker-run-readme-section}}
-{{.}}
+{{#docker-run-readme-section}}{{.}}
 {{/docker-run-readme-section}}
 {{^docker-run-readme-section}}
 ```
@@ -92,8 +91,7 @@ Exercise the application as described above.
                             <![CDATA[
 ## Building a Native Image
 
-{{#native-sections}}
-{{.}}
+{{#native-sections}}{{.}}
 {{/native-sections}}
 ]]>
                         </value>

diff --git a/archetypes/helidon/src/main/archetype/common/files/README.md.mustache b/archetypes/helidon/src/main/archetype/common/files/README.md.mustache
@@ -4,12 +4,10 @@
 
 ## 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+
@@ -20,10 +18,8 @@ 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}}
diff --git a/archetypes/helidon/src/main/archetype/common/files/pom.xml.mustache b/archetypes/helidon/src/main/archetype/common/files/pom.xml.mustache
@@ -50,8 +50,7 @@
                     </execution>
                 </executions>
             </plugin>
-{{#maven-plugins}}
-{{.}}
+{{#maven-plugins}}{{.}}
 {{/maven-plugins}}
         </plugins>
     </build>

diff --git a/archetypes/helidon/src/main/archetype/common/observability.xml b/archetypes/helidon/src/main/archetype/common/observability.xml
@@ -431,8 +431,7 @@ 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>

diff --git a/archetypes/helidon/src/main/archetype/common/packaging.xml b/archetypes/helidon/src/main/archetype/common/packaging.xml
@@ -52,8 +52,7 @@ kubectl get pods                            # Verify connectivity to cluster
 {{#k8s-readme-sections}}
 {{#first}}
 
-{{/first}}
-{{.}}
+{{/first}}{{.}}
 {{/k8s-readme-sections}}
 
 ### Deploy the application to Kubernetes

diff --git a/...etype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache b/...etype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
@@ -5,8 +5,7 @@ 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}}

diff --git a/...s/helidon/src/main/archetype/mp/common/files/src/main/resources/application.yaml.mustache b/...s/helidon/src/main/archetype/mp/common/files/src/main/resources/application.yaml.mustache
@@ -4,13 +4,11 @@
 {{#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}}
diff --git a/...helidon/src/main/archetype/mp/common/files/src/main/resources/logging.properties.mustache b/...helidon/src/main/archetype/mp/common/files/src/main/resources/logging.properties.mustache
@@ -7,8 +7,7 @@ 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

diff --git a/...s/helidon/src/main/archetype/mp/common/files/src/test/java/__pkg__/MainTest.java.mustache b/...s/helidon/src/main/archetype/mp/common/files/src/test/java/__pkg__/MainTest.java.mustache
@@ -22,15 +22,13 @@ 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}}
 }
diff --git a/...in/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache b/...in/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache
@@ -26,8 +26,7 @@ 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;
 
@@ -50,8 +49,7 @@ public class SimpleGreetResource {
         return message;
     }
 
-{{#SimpleGreetService-methods}}
-{{.}}
+{{#SimpleGreetService-methods}}{{.}}
 {{/SimpleGreetService-methods}}
 
 }
diff --git a/...n/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache b/...n/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache
@@ -29,8 +29,7 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
  */
 @Path("/simple-greet")
 public class SimpleGreetResource {
-{{#SimpleGreetResource-static-fields}}
-{{.}}
+{{#SimpleGreetResource-static-fields}}{{.}}
 {{/SimpleGreetResource-static-fields}}
     private static final JsonBuilderFactory JSON = Json.createBuilderFactory(Collections.emptyMap());
 
@@ -55,8 +54,7 @@ public class SimpleGreetResource {
                 .build();
     }
 
-{{#SimpleGreetService-methods}}
-{{.}}
+{{#SimpleGreetService-methods}}{{.}}
 {{/SimpleGreetService-methods}}
 
 }
diff --git a/...rc/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache b/...rc/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache
@@ -26,8 +26,7 @@ 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;
@@ -48,8 +47,7 @@ public class SimpleGreetResource {
         return String.format("%s %s!", message, "World");
     }
 
-{{#SimpleGreetService-methods}}
-{{.}}
+{{#SimpleGreetService-methods}}{{.}}
 {{/SimpleGreetService-methods}}
 
 }
diff --git a/...types/helidon/src/main/archetype/se/common/files/src/main/java/__pkg__/Main.java.mustache b/...types/helidon/src/main/archetype/se/common/files/src/main/java/__pkg__/Main.java.mustache
@@ -49,8 +49,7 @@ public final class Main {
 
         WebServer server = WebServer.builder(createRouting(config))
                 .config(config.get("server"))
-{{#Main-serverBuilder}}
-{{.}}
+{{#Main-serverBuilder}}{{.}}
 {{/Main-serverBuilder}}
                 .build();
 
@@ -77,17 +76,14 @@ public final class Main {
      * @param config configuration of this server
      */
     private static Routing createRouting(Config config) {
-{{#Main-createRouting}}
-{{.}}
+{{#Main-createRouting}}{{.}}
 {{/Main-createRouting}}
 
         Routing.Builder builder = Routing.builder()
-{{#Main-routingBuilder}}
-{{.}}{{#last}}; {{/last}}
+{{#Main-routingBuilder}}{{.}}{{#last}}; {{/last}}
 {{/Main-routingBuilder}}
 
-{{#Main-security-routing-section}}
-{{.}}
+{{#Main-security-routing-section}}{{.}}
 {{/Main-security-routing-section}}
 
         return builder.build();

diff --git a/...s/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache b/...s/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache
@@ -2,20 +2,17 @@ server:
   port: 8080
   host: 0.0.0.0
 
-{{#application-yaml-entries}}
-{{.}}
+{{#application-yaml-entries}}{{.}}
 {{/application-yaml-entries}}
 
 {{#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}}
diff --git a/...s/helidon/src/main/archetype/se/common/files/src/test/java/__pkg__/MainTest.java.mustache b/...s/helidon/src/main/archetype/se/common/files/src/test/java/__pkg__/MainTest.java.mustache
@@ -19,8 +19,7 @@ import {{.}};
 
 class MainTest {
 
-{{#MainTest-static-fields}}
-{{.}}
+{{#MainTest-static-fields}}{{.}}
 {{/MainTest-static-fields}}
 
     private static WebServer webServer;
@@ -32,8 +31,7 @@ class MainTest {
 
         webClient = WebClient.builder()
                 .baseUri("http://localhost:" + webServer.port())
-{{#MainTest-clientBuilder}}
-{{.}}
+{{#MainTest-clientBuilder}}{{.}}
 {{/MainTest-clientBuilder}}
                 .build();
     }
@@ -47,7 +45,6 @@ class MainTest {
         }
     }
 
-{{#MainTest-methods}}
-{{.}}
+{{#MainTest-methods}}{{.}}
 {{/MainTest-methods}}
 }
diff --git a/...s/helidon/src/main/archetype/se/common/files/src/test/resources/application.yaml.mustache b/...s/helidon/src/main/archetype/se/common/files/src/test/resources/application.yaml.mustache
@@ -8,6 +8,5 @@ app:
 security:
   enabled: false
 
-{{#config-test}}
-{{.}}
+{{#config-test}}{{.}}
 {{/config-test}}
diff --git a/...ain/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.json.mustache b/...ain/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.json.mustache
@@ -22,8 +22,7 @@ import io.helidon.webserver.Service;
 public class SimpleGreetService implements Service {
 
     private static final Logger LOGGER = Logger.getLogger(SimpleGreetService.class.getName());
-{{#SimpleGreetResource-static-fields}}
-{{.}}
+{{#SimpleGreetResource-static-fields}}{{.}}
 {{/SimpleGreetResource-static-fields}}
 
     private final String greeting;
@@ -32,8 +31,7 @@ public class SimpleGreetService implements Service {
         greeting = config.get("app.greeting").asString().orElse("Ciao");
     }
 
-{{#SimpleGreetResource-constructor}}
-{{.}}
+{{#SimpleGreetResource-constructor}}{{.}}
 {{/SimpleGreetResource-constructor}}
 
     /**
@@ -44,8 +42,7 @@ public class SimpleGreetService implements Service {
     @Override
     public void update(Routing.Rules rules) {
         rules.get("/", this::getDefaultMessageHandler);
-{{#SimpleGreetResource-update}}
-{{.}}
+{{#SimpleGreetResource-update}}{{.}}
 {{/SimpleGreetResource-update}}
     }
 
@@ -65,7 +62,6 @@ public class SimpleGreetService implements Service {
         response.send(message);
     }
 
-{{#SimpleGreetService-methods}}
-{{.}}
+{{#SimpleGreetService-methods}}{{.}}
 {{/SimpleGreetService-methods}}
 }
diff --git a/...in/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.jsonp.mustache b/...in/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.jsonp.mustache
@@ -28,8 +28,7 @@ public class SimpleGreetService implements Service {
 
     private static final Logger LOGGER = Logger.getLogger(SimpleGreetService.class.getName());
     private static final JsonBuilderFactory JSON = Json.createBuilderFactory(Collections.emptyMap());
-{{#SimpleGreetResource-static-fields}}
-{{.}}
+{{#SimpleGreetResource-static-fields}}{{.}}
 {{/SimpleGreetResource-static-fields}}
 
     private final String greeting;
@@ -38,8 +37,7 @@ public class SimpleGreetService implements Service {
         greeting = config.get("app.greeting").asString().orElse("Ciao");
     }
 
-{{#SimpleGreetResource-constructor}}
-{{.}}
+{{#SimpleGreetResource-constructor}}{{.}}
 {{/SimpleGreetResource-constructor}}
 
     /**
@@ -50,8 +48,7 @@ public class SimpleGreetService implements Service {
     @Override
     public void update(Routing.Rules rules) {
         rules.get("/", this::getDefaultMessageHandler);
-{{#SimpleGreetResource-update}}
-{{.}}
+{{#SimpleGreetResource-update}}{{.}}
 {{/SimpleGreetResource-update}}
     }
 
@@ -70,7 +67,6 @@ public class SimpleGreetService implements Service {
         response.send(returnObject);
     }
 
-{{#SimpleGreetService-methods}}
-{{.}}
+{{#SimpleGreetService-methods}}{{.}}
 {{/SimpleGreetService-methods}}
 }