Make PackageType.getName() public and rename it into PackageType.getType(); Add PackageType.isEnabled(). Make PackageType.isEnabled() and PackageType.isSupported() public.

Author: alexeysemenyukoracle

test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java

@@ -376,7 +376,7 @@ public Executor.Result execute(int expectedExitCode) {
                 };
             }).setExpectedExitCode(expectedJPackageExitCode)
                     .setExpectedInstallExitCode(handlersSpec.installExitCode)
-                    .isPackageTypeSupported(type -> true)
+                    .isPackageTypeEnabled(type -> true)
                     .forTypes().packageHandlers(handlers);
         }
 

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java

@@ -1238,7 +1238,7 @@ public void run() {
             () -> {
                 Map<String, PackageType> reply = new HashMap<>();
                 for (PackageType type : PackageType.values()) {
-                    reply.put(type.getName(), type);
+                    reply.put(type.getType(), type);
                 }
                 return reply;
             }).get();

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java

@@ -71,7 +71,7 @@
 public final class PackageTest extends RunnablePackageTest {
 
     public PackageTest() {
-        isPackageTypeSupported = PackageType::isSupported;
+        isPackageTypeEnabled = PackageType::isEnabled;
         jpackageFactory = JPackageCommand::new;
         packageHandlers = new HashMap<>();
         disabledInstallers = new HashSet<>();
@@ -102,7 +102,7 @@ public PackageTest forTypes(PackageType... types) {
             newTypes = Stream.of(types).collect(Collectors.toSet());
         }
         currentTypes = newTypes.stream()
-                .filter(isPackageTypeSupported)
+                .filter(isPackageTypeEnabled)
                 .filter(Predicate.not(excludeTypes::contains))
                 .collect(Collectors.toUnmodifiableSet());
         return this;
@@ -394,9 +394,9 @@ PackageTest packageHandlers(PackageHandlers v) {
         return this;
     }
 
-    PackageTest isPackageTypeSupported(Predicate<PackageType> v) {
+    PackageTest isPackageTypeEnabled(Predicate<PackageType> v) {
         Objects.requireNonNull(v);
-        isPackageTypeSupported = v;
+        isPackageTypeEnabled = v;
         return this;
     }
 
@@ -505,7 +505,7 @@ public void accept(Action action) {
                 case UNPACK -> {
                     cmd.setUnpackedPackageLocation(null);
                     final var unpackRootDir = TKit.createTempDirectory(
-                            String.format("unpacked-%s", type.getName()));
+                            String.format("unpacked-%s", type.getType()));
                     final Path unpackDir = packageHandlers.unpack(cmd, unpackRootDir);
                     if (!unpackDir.startsWith(TKit.workDir())) {
                         state.deleteUnpackDirs.add(unpackDir);
@@ -918,7 +918,7 @@ private static boolean isOfType(JPackageCommand cmd, Set<PackageType> packageTyp
     private final Map<PackageType, PackageHandlers> packageHandlers;
     private final Set<PackageType> disabledInstallers;
     private final Set<PackageType> disabledUninstallers;
-    private Predicate<PackageType> isPackageTypeSupported;
+    private Predicate<PackageType> isPackageTypeEnabled;
     private Supplier<JPackageCommand> jpackageFactory;
     private boolean ignoreBundleOutputDir;
     private boolean createMsiLog;

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java

@@ -26,6 +26,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -48,19 +49,23 @@ public enum PackageType {
             TKit.isLinux() ? "jdk.jpackage.internal.LinuxRpmBundler" : null),
     MAC_DMG(".dmg", TKit.isOSX() ? "jdk.jpackage.internal.MacDmgBundler" : null),
     MAC_PKG(".pkg", TKit.isOSX() ? "jdk.jpackage.internal.MacPkgBundler" : null),
-    IMAGE("app-image", null, null);
+    IMAGE;
+
+    PackageType() {
+        type  = "app-image";
+        suffix = null;
+        supported = true;
+        enabled = true;
+    }
 
     PackageType(String packageName, String bundleSuffix, String bundlerClass) {
-        name  = packageName;
-        suffix = bundleSuffix;
-        if (bundlerClass != null && !Inner.DISABLED_PACKAGERS.contains(getName())) {
-            supported = isBundlerSupported(bundlerClass);
-        } else {
-            supported = false;
-        }
+        type  = Objects.requireNonNull(packageName);
+        suffix = Objects.requireNonNull(bundleSuffix);
+        supported = Optional.ofNullable(bundlerClass).map(PackageType::isBundlerSupported).orElse(false);
+        enabled = supported && !Inner.DISABLED_PACKAGERS.contains(getType());
 
-        if (suffix != null && supported) {
-            TKit.trace(String.format("Bundler %s supported", getName()));
+        if (suffix != null && enabled) {
+            TKit.trace(String.format("Bundler %s enabled", getType()));
         }
     }
 
@@ -69,30 +74,23 @@ public enum PackageType {
     }
 
     void applyTo(JPackageCommand cmd) {
-        cmd.setArgumentValue("--type", getName());
+        cmd.setArgumentValue("--type", getType());
     }
 
     String getSuffix() {
-        return suffix;
+        return Optional.ofNullable(suffix).orElseThrow(UnsupportedOperationException::new);
     }
 
-    boolean isSupported() {
+    public boolean isSupported() {
         return supported;
     }
 
-    String getName() {
-        return name;
+    public boolean isEnabled() {
+        return supported;
     }
 
-    static PackageType fromSuffix(String packageFilename) {
-        if (packageFilename != null) {
-            for (PackageType v : values()) {
-                if (packageFilename.endsWith(v.getSuffix())) {
-                    return v;
-                }
-            }
-        }
-        return null;
+    public String getType() {
+        return type;
     }
 
     private static boolean isBundlerSupportedImpl(String bundlerClass) {
@@ -133,8 +131,9 @@ private static boolean isBundlerSupported(String bundlerClass) {
         return reply.get();
     }
 
-    private final String name;
+    private final String type;
     private final String suffix;
+    private final boolean enabled;
     private final boolean supported;
 
     public static final Set<PackageType> LINUX = Set.of(LINUX_DEB, LINUX_RPM);

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java

@@ -107,7 +107,7 @@ private static Optional<Path> configureMsiLogFile(JPackageCommand cmd, boolean c
         final Optional<Path> msiLogFile;
         if (createMsiLog) {
             msiLogFile = Optional.of(TKit.createTempFile(String.format("logs\\%s-msi.log",
-                    cmd.packageType().getName())));
+                    cmd.packageType().getType())));
         } else {
             msiLogFile = Optional.empty();
         }