From c1535e880a335591d18a47ee72419d62fd1daa1b Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Mon, 25 Mar 2024 16:19:09 -0500 Subject: [PATCH] Fixes #3673 - Add coreprofile run command to CLI (#3687) --- .../cloud/piranha/cli/CoreProfileCommand.java | 1 + .../cli/CoreProfileDownloadCommand.java | 4 +- .../piranha/cli/CoreProfileRunCommand.java | 126 ++++++++++++++++++ 3 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 cli/cli/src/main/java/cloud/piranha/cli/CoreProfileRunCommand.java diff --git a/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileCommand.java b/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileCommand.java index e19ee7611..bb44b8027 100644 --- a/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileCommand.java +++ b/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileCommand.java @@ -59,6 +59,7 @@ public void run() { usage(); } else { switch (arguments[0]) { + case "run" -> new CoreProfileRunCommand(stripFirstElement(arguments)).run(); case "download" -> new CoreProfileDownloadCommand(stripFirstElement(arguments)).run(); case "help" -> usage(); } diff --git a/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileDownloadCommand.java b/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileDownloadCommand.java index 59a13577f..de47163f4 100644 --- a/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileDownloadCommand.java +++ b/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileDownloadCommand.java @@ -80,7 +80,7 @@ public class CoreProfileDownloadCommand implements Runnable { /** * Stores the version we are downloading. */ - private String version = "24.2.0"; + private String version = "24.3.0"; /** * Constructor. @@ -97,6 +97,7 @@ public CoreProfileDownloadCommand(String[] arguments) { private void downloadRelease() { String urlString = MAVEN_CENTRAL_PREFIX + "piranha-dist-coreprofile/" + version + "/piranha-dist-coreprofile-" + version + ".jar"; + filename = "piranha-dist-coreprofile-" + version + ".jar"; try { url = new URL(urlString); @@ -114,6 +115,7 @@ private void downloadRelease() { private void downloadSnapshot() { String urlString = SONATYPE_SNAPSHOTS_PREFIX + "piranha-dist-coreprofile/" + version + "/piranha-dist-coreprofile-" + version + ".jar"; + filename = "piranha-dist-coreprofile-" + version + ".jar"; try { url = new URL(urlString); diff --git a/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileRunCommand.java b/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileRunCommand.java new file mode 100644 index 000000000..6588512a3 --- /dev/null +++ b/cli/cli/src/main/java/cloud/piranha/cli/CoreProfileRunCommand.java @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package cloud.piranha.cli; + +import static cloud.piranha.cli.Util.version; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; + +/** + * The coreprofile run command. + * + * @author Manfred Riem (mriem@manorrock.com) + */ +public class CoreProfileRunCommand implements Runnable { + + /** + * Stores the arguments. + */ + private final String[] arguments; + + /** + * Stores the distribution filename we are going use. + */ + private String distributionFilename = "piranha-dist-coreprofile-" + version() + ".jar"; + + /** + * Stores the distribution directory. + */ + private File distributionDirectory = new File(System.getProperty("user.home"), + ".piranha/coreprofile/download"); + + /** + * Stores the run arguments (--arguments). + */ + private String runArguments; + + /** + * Stores the version we are using. + */ + private String version = "24.3.0"; + + /** + * Constructor. + * + * @param arguments the arguments. + */ + public CoreProfileRunCommand(String[] arguments) { + this.arguments = arguments; + } + + @Override + public void run() { + parseArguments(); + distributionFilename = "piranha-dist-coreprofile-" + version + ".jar"; + File distributionJarFile = new File(distributionDirectory, distributionFilename); + if (distributionJarFile.exists()) { + runPiranhaCoreProfile(); + } else { + System.out.println(distributionJarFile.toString() + " not found"); + } + } + + /** + * Parse the command-line arguments. + */ + private void parseArguments() { + System.out.println("Parse arguments"); + for (int i = 0; i < arguments.length; i++) { + if (arguments[i].equals("--arguments")) { + runArguments = arguments[i + 1]; + } + if (arguments[i].equals("--version")) { + version = arguments[i + 1]; + } + } + } + + /** + * Run Piranha Core Profile. + */ + private void runPiranhaCoreProfile() { + try { + distributionFilename = "piranha-dist-coreprofile-" + version + ".jar"; + File distributionJarFile = new File(distributionDirectory, distributionFilename); + System.out.println("Run Piranha Core Profile"); + ProcessBuilder builder = new ProcessBuilder(); + ArrayList processCommands = new ArrayList<>(); + processCommands.add("java"); + processCommands.add("-jar"); + processCommands.add(distributionJarFile.getAbsolutePath()); + if (runArguments != null) { + processCommands.add(runArguments); + } + Process process = builder.command(processCommands).inheritIO().start(); + System.exit(process.waitFor()); + } catch (IOException | InterruptedException ex) { + ex.printStackTrace(System.err); + } + } +}