From e3ecd4c4d31a79cd2ea86a5d558cfe231f380a26 Mon Sep 17 00:00:00 2001
From: Bryan Atsatt <bryan.atsatt@oracle.com>
Date: Tue, 18 Feb 2020 11:54:15 -0800
Subject: [PATCH 1/2] Add "jlink-image" support.

---
 applications/mp/pom.xml                       | 22 ++++-
 applications/se/pom.xml                       | 22 ++++-
 .../helidon-quickstart-mp/Dockerfile.jlink    | 40 ++++++++
 .../helidon-quickstart-mp/README.md           | 49 ++++++++++
 .../helidon-quickstart-se/Dockerfile.jlink    | 40 ++++++++
 .../helidon-quickstart-se/README.md           | 53 +++++++++-
 .../Dockerfile.jlink                          | 40 ++++++++
 .../Dockerfile.jlink                          | 40 ++++++++
 .../tests/apps/bookstore/se/MainTest.java     | 98 +++++++++++++------
 9 files changed, 370 insertions(+), 34 deletions(-)
 create mode 100644 examples/quickstarts/helidon-quickstart-mp/Dockerfile.jlink
 create mode 100644 examples/quickstarts/helidon-quickstart-se/Dockerfile.jlink
 create mode 100644 examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.jlink
 create mode 100644 examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.jlink

diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
index 7fce88d3d1f..367a1fe7187 100644
--- a/applications/mp/pom.xml
+++ b/applications/mp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2020 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.
@@ -84,6 +84,7 @@
                         <artifactId>helidon-maven-plugin</artifactId>
                         <executions>
                             <execution>
+                                <id>native-image</id>
                                 <goals>
                                     <goal>native-image</goal>
                                 </goals>
@@ -99,5 +100,24 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>jlink-image</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.helidon.build-tools</groupId>
+                        <artifactId>helidon-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jlink-image</id>
+                                <goals>
+                                    <goal>jlink-image</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/applications/se/pom.xml b/applications/se/pom.xml
index 28cb0bb986b..755cf13b6b3 100644
--- a/applications/se/pom.xml
+++ b/applications/se/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2020 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.
@@ -40,6 +40,7 @@
                         <artifactId>helidon-maven-plugin</artifactId>
                         <executions>
                             <execution>
+                                <id>native-image</id>
                                 <goals>
                                     <goal>native-image</goal>
                                 </goals>
@@ -55,5 +56,24 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>jlink-image</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.helidon.build-tools</groupId>
+                        <artifactId>helidon-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>jlink-image</id>
+                                <goals>
+                                    <goal>jlink-image</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/examples/quickstarts/helidon-quickstart-mp/Dockerfile.jlink b/examples/quickstarts/helidon-quickstart-mp/Dockerfile.jlink
new file mode 100644
index 00000000000..7b9fc22a793
--- /dev/null
+++ b/examples/quickstarts/helidon-quickstart-mp/Dockerfile.jlink
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# 1st stage, build the app
+FROM maven:3.6.3-jdk-11-slim as build
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+ADD pom.xml .
+RUN mvn package -DskipTests
+
+# Do the Maven build to create the custom Java Runtime Image
+# Incremental docker builds will resume here when you change sources
+ADD src src
+RUN mvn -Ddocker.build=true package -Pjlink-image -DskipTests
+RUN echo "done!"
+
+# 2nd stage, build the final image with the JRI built in the 1st stage
+
+FROM debian:stretch-slim
+WORKDIR /helidon
+COPY --from=build /helidon/target/helidon-quickstart-mp ./
+ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
+EXPOSE 8080
diff --git a/examples/quickstarts/helidon-quickstart-mp/README.md b/examples/quickstarts/helidon-quickstart-mp/README.md
index e8af26c2a2a..adf1cd62b46 100644
--- a/examples/quickstarts/helidon-quickstart-mp/README.md
+++ b/examples/quickstarts/helidon-quickstart-mp/README.md
@@ -66,3 +66,52 @@ kubectl get pods                             # Verify connectivity to cluster
 kubectl create -f app.yaml               # Deploy application
 kubectl get service helidon-quickstart-mp  # Verify deployed service
 ```
+
+## Build a Java Runtime Image using jlink
+
+You can build a custom Java Runtime Image (JRI) containing the application jars and the JDK modules 
+on which they depend. This image also:
+
+* Enables Class Data Sharing by default to reduce startup time. 
+* Contains a customized `start` script to simplify CDS usage and support debug and test modes. 
+ 
+You can build a custom JRI in two different ways:
+* Local
+* Using Docker
+
+
+### Local build
+
+```
+# build the JRI
+mvn package -Pjlink-image
+```
+
+See https://github.com/oracle/helidon-build-tools/tree/master/helidon-maven-plugin#goal-jlink-image
+ for more information.
+
+Start the application:
+
+```
+./target/helidon-quickstart-se/bin/start
+```
+
+### Multi-stage Docker build
+
+Build the "jlink" Docker Image
+
+```
+docker build -t helidon-quickstart-se-jlink -f Dockerfile.jlink .
+```
+
+Start the application:
+
+```
+docker run --rm -p 8080:8080 helidon-quickstart-se-jlink:latest
+```
+
+See the start script help:
+
+```
+docker run --rm helidon-quickstart-se-jlink:latest --help
+```
diff --git a/examples/quickstarts/helidon-quickstart-se/Dockerfile.jlink b/examples/quickstarts/helidon-quickstart-se/Dockerfile.jlink
new file mode 100644
index 00000000000..e33011c8cc0
--- /dev/null
+++ b/examples/quickstarts/helidon-quickstart-se/Dockerfile.jlink
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# 1st stage, build the app
+FROM maven:3.6.3-jdk-11-slim as build
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+ADD pom.xml .
+RUN mvn package -DskipTests
+
+# Do the Maven build to create the custom Java Runtime Image
+# Incremental docker builds will resume here when you change sources
+ADD src src
+RUN mvn -Ddocker.build=true package -Pjlink-image -DskipTests
+RUN echo "done!"
+
+# 2nd stage, build the final image with the JRI built in the 1st stage
+
+FROM debian:stretch-slim
+WORKDIR /helidon
+COPY --from=build /helidon/target/helidon-quickstart-se ./
+ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
+EXPOSE 8080
diff --git a/examples/quickstarts/helidon-quickstart-se/README.md b/examples/quickstarts/helidon-quickstart-se/README.md
index 94297a46689..7b76d6d8791 100644
--- a/examples/quickstarts/helidon-quickstart-se/README.md
+++ b/examples/quickstarts/helidon-quickstart-se/README.md
@@ -67,7 +67,7 @@ kubectl create -f app.yaml   # Deply application
 kubectl get service helidon-quickstart-se  # Get service info
 ```
 
-## Native image with GraalVM
+## Build a native image with GraalVM
 
 GraalVM allows you to compile your programs ahead-of-time into a native
  executable. See https://www.graalvm.org/docs/reference-manual/aot-compilation/
@@ -92,7 +92,7 @@ mvn package -Pnative-image
 You can also put the Graal VM `bin` directory in your PATH, or pass
  `-DgraalVMHome=/path` to the Maven command.
 
-See https://github.com/oracle/helidon-build-tools/tree/master/helidon-maven-plugin
+See https://github.com/oracle/helidon-build-tools/tree/master/helidon-maven-plugin#goal-native-image
  for more information.
 
 Start the application:
@@ -114,3 +114,52 @@ Start the application:
 ```
 docker run --rm -p 8080:8080 helidon-quickstart-se-native:latest
 ```
+
+## Build a Java Runtime Image using jlink
+
+You can build a custom Java Runtime Image (JRI) containing the application jars and the JDK modules 
+on which they depend. This image also:
+
+* Enables Class Data Sharing by default to reduce startup time. 
+* Contains a customized `start` script to simplify CDS usage and support debug and test modes. 
+ 
+You can build a custom JRI in two different ways:
+* Local
+* Using Docker
+
+
+### Local build
+
+```
+# build the JRI
+mvn package -Pjlink-image
+```
+
+See https://github.com/oracle/helidon-build-tools/tree/master/helidon-maven-plugin#goal-jlink-image
+ for more information.
+
+Start the application:
+
+```
+./target/helidon-quickstart-se/bin/start
+```
+
+### Multi-stage Docker build
+
+Build the "jlink" Docker Image
+
+```
+docker build -t helidon-quickstart-se-jlink -f Dockerfile.jlink .
+```
+
+Start the application:
+
+```
+docker run --rm -p 8080:8080 helidon-quickstart-se-jlink:latest
+```
+
+See the start script help:
+
+```
+docker run --rm helidon-quickstart-se-jlink:latest --help
+```
diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.jlink b/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.jlink
new file mode 100644
index 00000000000..7b9fc22a793
--- /dev/null
+++ b/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.jlink
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# 1st stage, build the app
+FROM maven:3.6.3-jdk-11-slim as build
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+ADD pom.xml .
+RUN mvn package -DskipTests
+
+# Do the Maven build to create the custom Java Runtime Image
+# Incremental docker builds will resume here when you change sources
+ADD src src
+RUN mvn -Ddocker.build=true package -Pjlink-image -DskipTests
+RUN echo "done!"
+
+# 2nd stage, build the final image with the JRI built in the 1st stage
+
+FROM debian:stretch-slim
+WORKDIR /helidon
+COPY --from=build /helidon/target/helidon-quickstart-mp ./
+ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
+EXPOSE 8080
diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.jlink b/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.jlink
new file mode 100644
index 00000000000..e33011c8cc0
--- /dev/null
+++ b/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.jlink
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# 1st stage, build the app
+FROM maven:3.6.3-jdk-11-slim as build
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+ADD pom.xml .
+RUN mvn package -DskipTests
+
+# Do the Maven build to create the custom Java Runtime Image
+# Incremental docker builds will resume here when you change sources
+ADD src src
+RUN mvn -Ddocker.build=true package -Pjlink-image -DskipTests
+RUN echo "done!"
+
+# 2nd stage, build the final image with the JRI built in the 1st stage
+
+FROM debian:stretch-slim
+WORKDIR /helidon
+COPY --from=build /helidon/target/helidon-quickstart-se ./
+ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
+EXPOSE 8080
diff --git a/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java b/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java
index 89cb7a1ec01..5b6035a1852 100644
--- a/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java
+++ b/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019 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.
@@ -28,6 +28,7 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
 import java.util.stream.Collectors;
 
 import javax.json.Json;
@@ -38,7 +39,9 @@
 
 import com.oracle.bedrock.runtime.Application;
 import com.oracle.bedrock.runtime.LocalPlatform;
+import com.oracle.bedrock.runtime.console.CapturingApplicationConsole;
 import com.oracle.bedrock.runtime.options.Arguments;
+import com.oracle.bedrock.runtime.options.Console;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -57,7 +60,7 @@ class MainTest {
     private static Application application;
     private static LocalPlatform localPlatform = LocalPlatform.get();
     private static int port = localPlatform.getAvailablePorts().next();
-    private static URL  healthUrl;
+    private static URL healthUrl;
 
     @BeforeAll
     static void setup() throws Exception {
@@ -72,22 +75,45 @@ void stopTheApplication() throws Exception {
         if (application != null) {
             application.close();
         }
-        application=null;
+        application = null;
         waitForApplicationDown();
     }
 
     void startTheApplication(String appJarPath, List<String> javaArgs) throws Exception {
-        if (application != null) {
-            Assertions.fail("Can't start the application, it is already running");
-        }
+        Arguments args = toArguments(appJarPath, javaArgs);
+        application = localPlatform.launch("java", args);
+        waitForApplicationUp();
+    }
 
-        List<String> startArgs = new ArrayList<>(javaArgs);
-        startArgs.add("-Dserver.port=" + port);
-        startArgs.add("-jar");
-        startArgs.add(appJarPath);
+    @Test
+    void exitOnStartedSe() throws Exception {
+        runExitOnStartedTest("se");
+    }
 
-        application = localPlatform.launch("java", Arguments.of(startArgs));
-        waitForApplicationUp();
+    @Test
+    void exitOnStartedMp() throws Exception {
+        runExitOnStartedTest("mp");
+    }
+
+    private void runExitOnStartedTest(String edition) throws Exception {
+        Arguments args = toArguments(editionToJarPath(edition), List.of("-Dexit.on.started=!"));
+        CapturingApplicationConsole console = new CapturingApplicationConsole();
+        application = localPlatform.launch("java", args, Console.of(console));
+        Queue<String> stdOut = console.getCapturedOutputLines();
+        long maxTime = System.currentTimeMillis() + (10 * 1000);
+        do {
+            if (stdOut.stream().anyMatch(line -> line.contains("exit.on.started"))) {
+                return;
+            }
+            Thread.sleep(500);
+        } while (System.currentTimeMillis() < maxTime);
+
+        String eol = System.getProperty("line.separator");
+        Assertions.fail("quickstart " + edition + " did not exit as expected." + eol
+                        + eol
+                        + "stdOut: " + stdOut + eol
+                        + eol
+                        + " stdErr: " + console.getCapturedErrorLines());
     }
 
     @Test
@@ -153,7 +179,7 @@ private void runJsonFunctionalTest(String edition, String jsonLibrary) throws Ex
 
         startTheApplication(editionToJarPath(edition), systemPropertyArgs);
 
-        conn = getURLConnection("GET","/books");
+        conn = getURLConnection("GET", "/books");
         assertThat("HTTP response GET books", conn.getResponseCode(), is(200));
 
         JsonParser parser = Json.createParser(conn.getInputStream());
@@ -161,23 +187,23 @@ private void runJsonFunctionalTest(String edition, String jsonLibrary) throws Ex
         JsonArray bookArray = parser.getArray();
         assertThat("Number of books", bookArray.size(), is(numberOfBooks));
 
-        conn = getURLConnection("POST","/books");
+        conn = getURLConnection("POST", "/books");
         writeJsonContent(conn, json);
         assertThat("HTTP response POST", conn.getResponseCode(), is(200));
 
-        conn = getURLConnection("GET","/books/123456");
+        conn = getURLConnection("GET", "/books/123456");
         assertThat("HTTP response GET good ISBN", conn.getResponseCode(), is(200));
         JsonReader jsonReader = Json.createReader(conn.getInputStream());
         JsonObject jsonObject = jsonReader.readObject();
         assertThat("Checking if correct ISBN", jsonObject.getString("isbn"), is("123456"));
 
-        conn = getURLConnection("GET","/books/0000");
+        conn = getURLConnection("GET", "/books/0000");
         assertThat("HTTP response GET bad ISBN", conn.getResponseCode(), is(404));
 
-        conn = getURLConnection("GET","/books");
+        conn = getURLConnection("GET", "/books");
         assertThat("HTTP response list books", conn.getResponseCode(), is(200));
 
-        conn = getURLConnection("DELETE","/books/123456");
+        conn = getURLConnection("DELETE", "/books/123456");
         assertThat("HTTP response delete book", conn.getResponseCode(), is(200));
     }
 
@@ -203,7 +229,7 @@ private void runMetricsAndHealthTest(String edition, String jsonLibrary) throws
         HttpURLConnection conn;
 
         // Get Prometheus style metrics
-        conn = getURLConnection("GET","/metrics");
+        conn = getURLConnection("GET", "/metrics");
         conn.setRequestProperty("Accept", "*/*");
         assertThat("Checking Prometheus Metrics response\"", conn.getResponseCode(), is(200));
         String s = readAllAsString(conn.getInputStream());
@@ -212,17 +238,17 @@ private void runMetricsAndHealthTest(String edition, String jsonLibrary) throws
         assertThat("Making sure we got Prometheus format", s.startsWith("# TYPE"));
 
         // Get JSON encoded metrics
-        conn = getURLConnection("GET","/metrics");
+        conn = getURLConnection("GET", "/metrics");
         assertThat("Checking JSON Metrics response\"", conn.getResponseCode(), is(200));
 
         // Makes sure we got JSON metrics
         JsonReader jsonReader = Json.createReader(conn.getInputStream());
         JsonObject jsonObject = jsonReader.readObject();
         assertThat("Checking request count",
-                jsonObject.getJsonObject("vendor").getInt("requests.count") > 0);
+                   jsonObject.getJsonObject("vendor").getInt("requests.count") > 0);
 
         // Get JSON encoded metrics/base
-        conn = getURLConnection("GET","/metrics/base");
+        conn = getURLConnection("GET", "/metrics/base");
         assertThat("Checking JSON Base Metrics response", conn.getResponseCode(), is(200));
 
         // Makes sure we got JSON metrics
@@ -231,7 +257,7 @@ private void runMetricsAndHealthTest(String edition, String jsonLibrary) throws
         assertThat("Checking thread count", jsonObject.getInt("thread.count") > 0);
 
         // Get JSON encoded health check
-        conn = getURLConnection("GET","/health");
+        conn = getURLConnection("GET", "/health");
         assertThat("Checking health response", conn.getResponseCode(), is(200));
 
         jsonReader = Json.createReader(conn.getInputStream());
@@ -243,18 +269,18 @@ private void runMetricsAndHealthTest(String edition, String jsonLibrary) throws
         // 'microprofile-config.properties' setting in bookstore application
         if (edition.equals("mp")) {
             assertThat("Checking built-in health checks disabled",
-                    jsonObject.getJsonArray("checks").size(), is(0));
+                       jsonObject.getJsonArray("checks").size(), is(0));
         }
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"se", "mp" })
+    @ValueSource(strings = {"se", "mp"})
     void routing(String edition) throws Exception {
 
         startTheApplication(editionToJarPath(edition), Collections.emptyList());
         HttpURLConnection conn;
 
-        conn = getURLConnection("GET","/boo%6bs");
+        conn = getURLConnection("GET", "/boo%6bs");
 
         if ("se".equals(edition)) {
             assertThat("Checking encode URL response SE", conn.getResponseCode(), is(200));
@@ -263,7 +289,7 @@ void routing(String edition) throws Exception {
             assertThat("Checking encode URL response MP", conn.getResponseCode(), is(404));
         }
 
-        conn = getURLConnection("GET","/badurl");
+        conn = getURLConnection("GET", "/badurl");
         assertThat("Checking encode URL response", conn.getResponseCode(), is(404));
     }
 
@@ -304,7 +330,7 @@ private void writeJsonContent(HttpURLConnection conn, String json) throws IOExce
     }
 
     private void waitForApplicationUp() throws Exception {
-        waitForApplication(healthUrl , true);
+        waitForApplication(healthUrl, true);
     }
 
     private void waitForApplicationDown() throws Exception {
@@ -332,13 +358,25 @@ private void waitForApplication(URL url, boolean toBeUp) throws Exception {
             }
             Thread.sleep(500);
             try {
-                conn = (HttpURLConnection)url.openConnection();
+                conn = (HttpURLConnection) url.openConnection();
                 conn.setConnectTimeout(100);
                 responseCode = conn.getResponseCode();
             } catch (Exception ex) {
                 responseCode = -1;
             }
-        } while ((toBeUp && responseCode != 200) || (!toBeUp && responseCode != -1 ));
+        } while ((toBeUp && responseCode != 200) || (!toBeUp && responseCode != -1));
+    }
+
+    private static Arguments toArguments(String appJarPath, List<String> javaArgs) {
+        if (application != null) {
+            Assertions.fail("Can't start the application, it is already running");
+        }
+
+        List<String> startArgs = new ArrayList<>(javaArgs);
+        startArgs.add("-Dserver.port=" + port);
+        startArgs.add("-jar");
+        startArgs.add(appJarPath);
+        return Arguments.of(startArgs);
     }
 
     private static String editionToJarPath(String edition) {

From 92b1f721092f2ab345851b58e6e78f401833cae8 Mon Sep 17 00:00:00 2001
From: Bryan Atsatt <bryan.atsatt@oracle.com>
Date: Tue, 18 Feb 2020 12:23:11 -0800
Subject: [PATCH 2/2] Fix copyright.

---
 .../test/java/io/helidon/tests/apps/bookstore/se/MainTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java b/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java
index 5b6035a1852..bdec322a643 100644
--- a/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java
+++ b/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2020 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.