Fix ErrorTest --app-version tests failed on Windows

Author: alexeysemenyukoracle

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java

@@ -64,6 +64,7 @@ WinMsiPackage create() throws ConfigException {
         }
 
         return WinMsiPackage.create(pkg, new WinMsiPackageMixin.Stub(
+                MsiVersion.of(pkg.version()),
                 withInstallDirChooser,
                 withShortcutPrompt,
                 Optional.ofNullable(helpURL),

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplication.java

@@ -26,13 +26,9 @@
 
 import jdk.jpackage.internal.util.CompositeProxy;
 
-public interface WinApplication extends Application {
-
-    default DottedVersion winVersion() {
-        return DottedVersion.lazy(version());
-    }
+public interface WinApplication extends Application, WinApplicationMixin {
 
     public static WinApplication create(Application app) {
-        return CompositeProxy.create(WinApplication.class, app);
+        return CompositeProxy.create(WinApplication.class, app, new WinApplicationMixin.Stub(app));
     }
 }

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.model;
+
+public interface WinApplicationMixin {
+
+    DottedVersion winVersion();
+
+    record Stub(DottedVersion winVersion) implements WinApplicationMixin {
+        public Stub(Application app) {
+            this(DottedVersion.greedy(app.version()));
+        }
+    }
+}

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackage.java

@@ -28,10 +28,6 @@
 
 public interface WinMsiPackage extends Package, WinMsiPackageMixin {
 
-    default DottedVersion msiVersion() {
-        return MsiVersion.of(version());
-    }
-
     public static WinMsiPackage create(Package pkg, WinMsiPackageMixin mixin) {
         return CompositeProxy.create(WinMsiPackage.class, pkg, mixin);
     }

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackageMixin.java

@@ -30,6 +30,8 @@
 
 public interface WinMsiPackageMixin {
 
+    DottedVersion msiVersion();
+
     boolean withInstallDirChooser();
 
     boolean withShortcutPrompt();
@@ -48,7 +50,7 @@ public interface WinMsiPackageMixin {
 
     Optional<Path> serviceInstaller();
 
-    record Stub(boolean withInstallDirChooser, boolean withShortcutPrompt,
+    record Stub(DottedVersion msiVersion, boolean withInstallDirChooser, boolean withShortcutPrompt,
             Optional<String> helpURL, Optional<String> updateURL, String startMenuGroupName,
             boolean isSystemWideInstall, UUID upgradeCode, UUID productCode,
             Optional<Path> serviceInstaller) implements WinMsiPackageMixin {}