diff --git a/archetypes/helidon/src/main/archetype/common/docker.xml b/archetypes/helidon/src/main/archetype/common/docker.xml index 45f5c672753..69571696ce8 100644 --- a/archetypes/helidon/src/main/archetype/common/docker.xml +++ b/archetypes/helidon/src/main/archetype/common/docker.xml @@ -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. diff --git a/archetypes/helidon/src/main/archetype/common/files/README.md.mustache b/archetypes/helidon/src/main/archetype/common/files/README.md.mustache index 3ac7351286c..c59cda80256 100644 --- a/archetypes/helidon/src/main/archetype/common/files/README.md.mustache +++ b/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 JDK19+ @@ -18,8 +20,10 @@ java --enable-preview -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 index 74df28bd921..e368d94749c 100644 --- a/archetypes/helidon/src/main/archetype/common/files/pom.xml.mustache +++ b/archetypes/helidon/src/main/archetype/common/files/pom.xml.mustache @@ -50,7 +50,8 @@ -{{#maven-plugins}}{{.}} +{{#maven-plugins}} +{{.}} {{/maven-plugins}} diff --git a/archetypes/helidon/src/main/archetype/common/observability.xml b/archetypes/helidon/src/main/archetype/common/observability.xml index 72cb3c55880..89f6de86bbf 100644 --- a/archetypes/helidon/src/main/archetype/common/observability.xml +++ b/archetypes/helidon/src/main/archetype/common/observability.xml @@ -441,7 +441,8 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics diff --git a/archetypes/helidon/src/main/archetype/common/packaging.xml b/archetypes/helidon/src/main/archetype/common/packaging.xml index ff1b0162fdb..4152ca47750 100644 --- a/archetypes/helidon/src/main/archetype/common/packaging.xml +++ b/archetypes/helidon/src/main/archetype/common/packaging.xml @@ -52,7 +52,8 @@ kubectl get pods # Verify connectivity to cluster {{#k8s-readme-sections}} {{#first}} -{{/first}}{{.}} +{{/first}} +{{.}} {{/k8s-readme-sections}} ### Deploy the application to Kubernetes diff --git a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache index 97654327192..0fd8455a02a 100644 --- a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache +++ b/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}} diff --git a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/application.yaml.mustache b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/application.yaml.mustache index 792e6d5220a..8a7b6d9e1b2 100644 --- a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/application.yaml.mustache +++ b/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}} diff --git a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/logging.properties.mustache b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/logging.properties.mustache index c1bb367d51e..eb3a0004847 100644 --- a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/logging.properties.mustache +++ b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/logging.properties.mustache @@ -7,7 +7,8 @@ handlers=io.helidon.logging.jul.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/archetypes/helidon/src/main/archetype/mp/common/files/src/test/java/__pkg__/MainTest.java.mustache b/archetypes/helidon/src/main/archetype/mp/common/files/src/test/java/__pkg__/MainTest.java.mustache index 93c55b8e5bd..6d4c8dcc178 100644 --- a/archetypes/helidon/src/main/archetype/mp/common/files/src/test/java/__pkg__/MainTest.java.mustache +++ b/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}} } diff --git a/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache b/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache index 216d898955e..52ba16ef2bd 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache +++ b/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}} } diff --git a/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache b/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache index e43623d7fef..58d6665b2b3 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache +++ b/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache @@ -29,7 +29,8 @@ 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()); @@ -54,7 +55,8 @@ public class SimpleGreetResource { .build(); } -{{#SimpleGreetService-methods}}{{.}} +{{#SimpleGreetService-methods}} +{{.}} {{/SimpleGreetService-methods}} } diff --git a/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache b/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache index 32c1f3b13d6..35d36dcde99 100644 --- a/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache +++ b/archetypes/helidon/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.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; @@ -47,7 +48,8 @@ public class SimpleGreetResource { return String.format("%s %s!", message, "World"); } -{{#SimpleGreetService-methods}}{{.}} +{{#SimpleGreetService-methods}} +{{.}} {{/SimpleGreetService-methods}} } diff --git a/archetypes/helidon/src/main/archetype/nima/common/files/src/main/java/__pkg__/Main.java.mustache b/archetypes/helidon/src/main/archetype/nima/common/files/src/main/java/__pkg__/Main.java.mustache index 20f323a5fb1..99bb40a86a8 100644 --- a/archetypes/helidon/src/main/archetype/nima/common/files/src/main/java/__pkg__/Main.java.mustache +++ b/archetypes/helidon/src/main/archetype/nima/common/files/src/main/java/__pkg__/Main.java.mustache @@ -46,10 +46,12 @@ public final class Main { * Updates HTTP Routing. */ static void routing(HttpRouting.Builder routing) { - {{#Main-routing}}{{.}} + {{#Main-routing}} + {{.}} {{/Main-routing}} - routing{{#Main-routing-builder}}{{.}}{{#last}}; {{/last}} + routing{{#Main-routing-builder}} + {{.}}{{#last}}; {{/last}} {{/Main-routing-builder}} } } diff --git a/archetypes/helidon/src/main/archetype/nima/common/files/src/main/resources/application.yaml.mustache b/archetypes/helidon/src/main/archetype/nima/common/files/src/main/resources/application.yaml.mustache index 65cf9a33b3c..832ccb26a4e 100644 --- a/archetypes/helidon/src/main/archetype/nima/common/files/src/main/resources/application.yaml.mustache +++ b/archetypes/helidon/src/main/archetype/nima/common/files/src/main/resources/application.yaml.mustache @@ -2,5 +2,6 @@ server: port: 8080 host: 0.0.0.0 -{{#application-yaml-entries}}{{.}} +{{#application-yaml-entries}} +{{.}} {{/application-yaml-entries}} \ No newline at end of file diff --git a/archetypes/helidon/src/main/archetype/nima/common/files/src/test/java/__pkg__/AbstractMainTest.java.mustache b/archetypes/helidon/src/main/archetype/nima/common/files/src/test/java/__pkg__/AbstractMainTest.java.mustache index 0906190e7b8..94e65585070 100644 --- a/archetypes/helidon/src/main/archetype/nima/common/files/src/test/java/__pkg__/AbstractMainTest.java.mustache +++ b/archetypes/helidon/src/main/archetype/nima/common/files/src/test/java/__pkg__/AbstractMainTest.java.mustache @@ -28,7 +28,8 @@ abstract class AbstractMainTest { Main.routing(builder); } - {{#Abstract-tests}}{{.}} + {{#Abstract-tests}} + {{.}} {{/Abstract-tests}} } diff --git a/archetypes/helidon/src/main/archetype/nima/common/files/src/test/resources/application.yaml.mustache b/archetypes/helidon/src/main/archetype/nima/common/files/src/test/resources/application.yaml.mustache index bb498fe5c62..5c583c0e652 100644 --- a/archetypes/helidon/src/main/archetype/nima/common/files/src/test/resources/application.yaml.mustache +++ b/archetypes/helidon/src/main/archetype/nima/common/files/src/test/resources/application.yaml.mustache @@ -2,5 +2,6 @@ server: port: 8080 host: 0.0.0.0 -{{#config-test}}{{.}} +{{#config-test}} +{{.}} {{/config-test}} \ No newline at end of file diff --git a/archetypes/helidon/src/main/archetype/se/common/files/src/main/java/__pkg__/Main.java.mustache b/archetypes/helidon/src/main/archetype/se/common/files/src/main/java/__pkg__/Main.java.mustache index bb4ad391611..9895f1aa50d 100644 --- a/archetypes/helidon/src/main/archetype/se/common/files/src/main/java/__pkg__/Main.java.mustache +++ b/archetypes/helidon/src/main/archetype/se/common/files/src/main/java/__pkg__/Main.java.mustache @@ -49,7 +49,8 @@ public final class Main { WebServer server = WebServer.builder(createRouting(config)) .config(config.get("server")) -{{#Main-serverBuilder}}{{.}} +{{#Main-serverBuilder}} +{{.}} {{/Main-serverBuilder}} .build(); @@ -76,14 +77,17 @@ 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/archetypes/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache b/archetypes/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache index cd07105c28b..a405eec903d 100644 --- a/archetypes/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache +++ b/archetypes/helidon/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache @@ -2,17 +2,20 @@ 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}} \ No newline at end of file diff --git a/archetypes/helidon/src/main/archetype/se/common/files/src/test/java/__pkg__/MainTest.java.mustache b/archetypes/helidon/src/main/archetype/se/common/files/src/test/java/__pkg__/MainTest.java.mustache index d7b70288edd..a6ccb02ca9e 100644 --- a/archetypes/helidon/src/main/archetype/se/common/files/src/test/java/__pkg__/MainTest.java.mustache +++ b/archetypes/helidon/src/main/archetype/se/common/files/src/test/java/__pkg__/MainTest.java.mustache @@ -19,7 +19,8 @@ import {{.}}; class MainTest { -{{#MainTest-static-fields}}{{.}} +{{#MainTest-static-fields}} +{{.}} {{/MainTest-static-fields}} private static WebServer webServer; @@ -31,7 +32,8 @@ class MainTest { webClient = WebClient.builder() .baseUri("http://localhost:" + webServer.port()) -{{#MainTest-clientBuilder}}{{.}} +{{#MainTest-clientBuilder}} +{{.}} {{/MainTest-clientBuilder}} .build(); } @@ -45,6 +47,7 @@ class MainTest { } } -{{#MainTest-methods}}{{.}} +{{#MainTest-methods}} +{{.}} {{/MainTest-methods}} } diff --git a/archetypes/helidon/src/main/archetype/se/common/files/src/test/resources/application.yaml.mustache b/archetypes/helidon/src/main/archetype/se/common/files/src/test/resources/application.yaml.mustache index 5c3807202d5..fd3fc34716f 100644 --- a/archetypes/helidon/src/main/archetype/se/common/files/src/test/resources/application.yaml.mustache +++ b/archetypes/helidon/src/main/archetype/se/common/files/src/test/resources/application.yaml.mustache @@ -8,5 +8,6 @@ app: security: enabled: false -{{#config-test}}{{.}} +{{#config-test}} +{{.}} {{/config-test}} \ No newline at end of file diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.json.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.json.mustache index edabf9fba0a..ecf61c96f7b 100644 --- a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.json.mustache +++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.json.mustache @@ -22,7 +22,8 @@ import io.helidon.reactive.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; @@ -31,7 +32,8 @@ public class SimpleGreetService implements Service { greeting = config.get("app.greeting").asString().orElse("Ciao"); } -{{#SimpleGreetResource-constructor}}{{.}} +{{#SimpleGreetResource-constructor}} +{{.}} {{/SimpleGreetResource-constructor}} /** @@ -42,7 +44,8 @@ public class SimpleGreetService implements Service { @Override public void update(Routing.Rules rules) { rules.get("/", this::getDefaultMessageHandler); -{{#SimpleGreetResource-update}}{{.}} +{{#SimpleGreetResource-update}} +{{.}} {{/SimpleGreetResource-update}} } @@ -62,6 +65,7 @@ public class SimpleGreetService implements Service { response.send(message); } -{{#SimpleGreetService-methods}}{{.}} +{{#SimpleGreetService-methods}} +{{.}} {{/SimpleGreetService-methods}} } diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.jsonp.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.jsonp.mustache index 72618847177..7160b0591d0 100644 --- a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.jsonp.mustache +++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.jsonp.mustache @@ -28,7 +28,8 @@ 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; @@ -37,7 +38,8 @@ public class SimpleGreetService implements Service { greeting = config.get("app.greeting").asString().orElse("Ciao"); } -{{#SimpleGreetResource-constructor}}{{.}} +{{#SimpleGreetResource-constructor}} +{{.}} {{/SimpleGreetResource-constructor}} /** @@ -48,7 +50,8 @@ public class SimpleGreetService implements Service { @Override public void update(Routing.Rules rules) { rules.get("/", this::getDefaultMessageHandler); -{{#SimpleGreetResource-update}}{{.}} +{{#SimpleGreetResource-update}} +{{.}} {{/SimpleGreetResource-update}} } @@ -67,6 +70,7 @@ public class SimpleGreetService implements Service { response.send(returnObject); } -{{#SimpleGreetService-methods}}{{.}} +{{#SimpleGreetService-methods}} +{{.}} {{/SimpleGreetService-methods}} } diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.mustache index 007e88d71c0..50e953dd99f 100644 --- a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.mustache +++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/SimpleGreetService.java.mustache @@ -23,7 +23,8 @@ import java.util.logging.Logger; 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,7 +33,8 @@ public class SimpleGreetService implements Service { greeting = config.get("app.greeting").asString().orElse("Ciao"); } -{{#SimpleGreetResource-constructor}}{{.}} +{{#SimpleGreetResource-constructor}} +{{.}} {{/SimpleGreetResource-constructor}} /** @@ -43,7 +45,8 @@ public class SimpleGreetService implements Service { @Override public void update(Routing.Rules rules) { rules.get("/", this::getDefaultMessageHandler); -{{#SimpleGreetResource-update}}{{.}} +{{#SimpleGreetResource-update}} +{{.}} {{/SimpleGreetResource-update}} } @@ -59,7 +62,8 @@ public class SimpleGreetService implements Service { response.send(msg); } -{{#SimpleGreetService-methods}}{{.}} +{{#SimpleGreetService-methods}} +{{.}} {{/SimpleGreetService-methods}} }