From b0af41d667f2fb5da37b4dd263486b34a15df0f3 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Sat, 18 Oct 2025 01:11:19 +0000
Subject: [PATCH] 8370134: Fix minor jpackage issues

Reviewed-by: almatvee
---
 .../share/classes/jdk/jpackage/internal/Arguments.java   | 2 +-
 .../share/classes/jdk/jpackage/internal/FromParams.java  | 2 +-
 .../classes/jdk/jpackage/internal/WinExeBundler.java     | 2 +-
 .../classes/jdk/jpackage/internal/WinMsiBundler.java     | 9 +++++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
index f9a5429a8bf..f0323bbd841 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
@@ -125,7 +125,7 @@ public class Arguments {
         for (String arg : args) {
             argList.add(arg);
         }
-        Log.verbose ("\njpackage argument list: \n" + argList + "\n");
+
         pos = 0;
 
         deployParams = new DeployParams();
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
index 56f2b46ea8f..8cfab61c9c0 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
@@ -120,7 +120,7 @@ final class FromParams {
 
                 final var runtimeBuilderBuilder = new RuntimeBuilderBuilder();
 
-                MODULE_PATH.copyInto(params, runtimeBuilderBuilder::modulePath);
+                runtimeBuilderBuilder.modulePath(MODULE_PATH.fetchFrom(params));
 
                 predefinedRuntimeDirectory.ifPresentOrElse(runtimeBuilderBuilder::forRuntime, () -> {
                     final var startupInfos = launchers.asList().stream()
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
index 9ce758eb3c7..f61a26f0774 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
@@ -65,7 +65,7 @@ public class WinExeBundler extends AbstractBundler {
     @Override
     public boolean validate(Map<String, ? super Object> params)
             throws ConfigException {
-        return msiBundler.validate(params);
+        return msiBundler.validate(params, WinFromParams.EXE_PACKAGE);
     }
 
     @Override
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
index 3ca26f38f82..24aa3e0573a 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
@@ -30,6 +30,7 @@ import static jdk.jpackage.internal.model.ConfigException.rethrowConfigException
 import java.nio.file.Path;
 import java.util.Map;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.PackagerException;
 import jdk.jpackage.internal.model.WinMsiPackage;
 import jdk.jpackage.internal.util.Result;
@@ -80,11 +81,15 @@ public class WinMsiBundler  extends AbstractBundler {
     }
 
     @Override
-    public boolean validate(Map<String, ? super Object> params)
+    public boolean validate(Map<String, ? super Object> params) throws ConfigException {
+        return validate(params, WinFromParams.MSI_PACKAGE);
+    }
+
+    boolean validate(Map<String, ? super Object> params, BundlerParamInfo<? extends Package> pkgParam)
             throws ConfigException {
         try {
             // Order is important!
-            WinFromParams.APPLICATION.fetchFrom(params);
+            pkgParam.fetchFrom(params);
             BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
 
             final var wixToolset = sysEnv.orElseThrow().wixToolset();