8344415: Restruct jpackage utility classes

Reviewed-by: almatvee

Author: Alexey Semenyuk

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -54,6 +54,8 @@
 import static jdk.jpackage.internal.StandardBundlerParam.ICON;
 import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
 import static jdk.jpackage.internal.StandardBundlerParam.SHORTCUT_HINT;
+import jdk.jpackage.internal.util.PathUtils;
+import jdk.jpackage.internal.util.XmlUtils;
 
 /**
  * Helper to create files for desktop integration.
@@ -119,7 +121,7 @@ private DesktopIntegration(PlatformPackage thePackage,
         if (withDesktopFile) {
             desktopFile = new DesktopFile(desktopFileName);
             iconFile = new DesktopFile(escapedAppFileName
-                    + IOUtils.getSuffix(Path.of(DEFAULT_ICON)));
+                    + PathUtils.getSuffix(Path.of(DEFAULT_ICON)));
 
             if (curIconResource == null) {
                 // Create default icon.
@@ -420,7 +422,7 @@ private void appendFileAssociation(XMLStreamWriter xml,
     }
 
     private void createFileAssociationsMimeInfoFile() throws IOException {
-        IOUtils.createXml(mimeInfoFile.srcPath(), xml -> {
+        XmlUtils.createXml(mimeInfoFile.srcPath(), xml -> {
             xml.writeStartElement("mime-info");
             xml.writeDefaultNamespace(
                     "http://www.freedesktop.org/standards/shared-mime-info");
@@ -451,7 +453,7 @@ private void addFileAssociationIconFiles(ShellCommands shellCommands)
 
                 // Create icon name for mime type from mime type.
                 DesktopFile faIconFile = new DesktopFile(mimeType.replace(
-                        File.separatorChar, '-') + IOUtils.getSuffix(
+                        File.separatorChar, '-') + PathUtils.getSuffix(
                                 assoc.data.iconPath));
 
                 IOUtils.copyFile(assoc.data.iconPath,

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -35,6 +35,7 @@
 import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
 import static jdk.jpackage.internal.StandardBundlerParam.ICON;
 import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
+import jdk.jpackage.internal.util.PathUtils;
 
 public class LinuxAppImageBuilder extends AbstractAppImageBuilder {
 
@@ -127,7 +128,7 @@ private void createLauncherForEntryPoint(Map<String, ? super Object> params,
                 mainParams);
         if (iconResource != null) {
             Path iconTarget = appLayout.destktopIntegrationDirectory().resolve(
-                    APP_NAME.fetchFrom(params) + IOUtils.getSuffix(Path.of(
+                    APP_NAME.fetchFrom(params) + PathUtils.getSuffix(Path.of(
                     DEFAULT_ICON)));
             iconResource.saveToFile(iconTarget);
         }

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -44,6 +44,7 @@
 import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
 import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
 import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
+import jdk.jpackage.internal.util.FileUtils;
 
 abstract class LinuxPackageBundler extends AbstractBundler {
 
@@ -144,7 +145,7 @@ public final Path execute(Map<String, ? super Object> params,
                     // Application image is a newly created directory tree.
                     // Move it.
                     srcAppLayout.move(thePackage.sourceApplicationLayout());
-                    IOUtils.deleteRecursive(srcAppImageRoot);
+                    FileUtils.deleteRecursive(srcAppImageRoot);
                 }
             }
 

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -25,25 +25,20 @@
 
 package jdk.jpackage.internal;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
 import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
 import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
 import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
 import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
 import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
+import jdk.jpackage.internal.util.FileUtils;
 
 public abstract class MacBaseInstallerBundler extends AbstractBundler {
 
@@ -187,7 +182,7 @@ protected Path prepareAppBundle(Map<String, ? super Object> params)
                 StandardBundlerParam.getPredefinedAppImage(params);
         if (predefinedImage != null) {
             appDir = appImageRoot.resolve(APP_NAME.fetchFrom(params) + ".app");
-            IOUtils.copyRecursive(predefinedImage, appDir,
+            FileUtils.copyRecursive(predefinedImage, appDir,
                     LinkOption.NOFOLLOW_LINKS);
 
             // Create PackageFile if predefined app image is not signed

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -48,6 +48,7 @@
 import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
 import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE;
 import static jdk.jpackage.internal.StandardBundlerParam.DMG_CONTENT;
+import jdk.jpackage.internal.util.FileUtils;
 
 public class MacDmgBundler extends MacBaseInstallerBundler {
 
@@ -294,7 +295,7 @@ private Path buildDMG( Map<String, ? super Object> params,
                     MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params));
             Path dest = root.resolve("Contents/Home");
 
-            IOUtils.copyRecursive(source, dest);
+            FileUtils.copyRecursive(source, dest);
 
             srcFolder = newRoot;
         }
@@ -319,7 +320,7 @@ private Path buildDMG( Map<String, ? super Object> params,
         List <String> dmgContent = DMG_CONTENT.fetchFrom(params);
         for (String content : dmgContent) {
             Path path = Path.of(content);
-            IOUtils.copyRecursive(path, srcFolder.resolve(path.getFileName()));
+            FileUtils.copyRecursive(path, srcFolder.resolve(path.getFileName()));
         }
         // create temp image
         ProcessBuilder pb = new ProcessBuilder(
@@ -381,9 +382,9 @@ private Path buildDMG( Map<String, ? super Object> params,
                 Path destPath = mountedRoot
                         .resolve(srcFolder.getFileName());
                 Files.createDirectory(destPath);
-                IOUtils.copyRecursive(srcFolder, destPath);
+                FileUtils.copyRecursive(srcFolder, destPath);
             } else {
-                IOUtils.copyRecursive(srcFolder, mountedRoot);
+                FileUtils.copyRecursive(srcFolder, mountedRoot);
             }
         }
 

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacLaunchersAsServices.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 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
@@ -33,6 +33,7 @@
 import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
 import static jdk.jpackage.internal.OverridableResource.createResource;
 import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
+import jdk.jpackage.internal.util.PathUtils;
 
 /**
  * Helper to install launchers as services using "launchd".
@@ -95,7 +96,7 @@ private static class Launcher extends UnixLauncherAsService {
 
             // It is recommended to set value of "label" property in launchd
             // .plist file equal to the name of this .plist file without the suffix.
-            String label = IOUtils.replaceSuffix(plistFilename.getFileName(), "").toString();
+            String label = PathUtils.replaceSuffix(plistFilename.getFileName(), "").toString();
 
             getResource()
                     .setPublicName(plistFilename)

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -62,6 +62,8 @@
 import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
 import static jdk.jpackage.internal.OverridableResource.createResource;
 import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
+import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.XmlUtils;
 
 public class MacPkgBundler extends MacBaseInstallerBundler {
 
@@ -267,7 +269,7 @@ private void prepareDistributionXMLFile(Map<String, ? super Object> params)
         Log.verbose(MessageFormat.format(I18N.getString(
                 "message.preparing-distribution-dist"), f.toAbsolutePath().toString()));
 
-        IOUtils.createXml(f, xml -> {
+        XmlUtils.createXml(f, xml -> {
             xml.writeStartElement("installer-gui-script");
             xml.writeAttribute("minSpecVersion", "1");
 
@@ -452,7 +454,7 @@ private String getRoot(Map<String, ? super Object> params,
             source = appLocation;
             dest = newRoot.resolve(appLocation.getFileName());
         }
-        IOUtils.copyRecursive(source, dest);
+        FileUtils.copyRecursive(source, dest);
 
         return newRoot.toString();
     }

src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java

@@ -32,8 +32,6 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Stream;
 import static jdk.jpackage.internal.OverridableResource.createResource;
 import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
 import static jdk.jpackage.internal.StandardBundlerParam.ICON;
@@ -42,6 +40,8 @@
 import static jdk.jpackage.internal.StandardBundlerParam.OUTPUT_DIR;
 import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
 import jdk.jpackage.internal.resources.ResourceLocator;
+import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.PathUtils;
 
 /*
  * AbstractAppImageBuilder
@@ -92,15 +92,15 @@ protected void copyApplication(Map<String, ? super Object> params)
                 }
             }
 
-            IOUtils.copyRecursive(inputPath,
+            FileUtils.copyRecursive(inputPath,
                     appLayout.appDirectory().toAbsolutePath(), excludes);
         }
 
         AppImageFile.save(root, params);
 
         List<String> items = APP_CONTENT.fetchFrom(params);
         for (String item : items) {
-            IOUtils.copyRecursive(Path.of(item),
+            FileUtils.copyRecursive(Path.of(item),
                 appLayout.contentDirectory().resolve(Path.of(item).getFileName()));
         }
     }
@@ -115,7 +115,7 @@ public static OverridableResource createIconResource(String defaultIconName,
         }
 
         final String resourcePublicName = APP_NAME.fetchFrom(params)
-                + IOUtils.getSuffix(Path.of(defaultIconName));
+                + PathUtils.getSuffix(Path.of(defaultIconName));
 
         IconType iconType = getLauncherIconType(params);
         if (iconType == IconType.NoIcon) {

src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Map;
+import jdk.jpackage.internal.util.FileUtils;
 
 
 /**
@@ -55,7 +56,7 @@ public String toString() {
     @Override
     public void cleanup(Map<String, ? super Object> params) {
         try {
-            IOUtils.deleteRecursive(
+            FileUtils.deleteRecursive(
                     StandardBundlerParam.TEMP_ROOT.fetchFrom(params));
         } catch (IOException e) {
             Log.verbose(e.getMessage());

src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -59,6 +59,7 @@
 import static jdk.jpackage.internal.StandardBundlerParam.MENU_HINT;
 import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
 import static jdk.jpackage.internal.StandardBundlerParam.APP_STORE;
+import jdk.jpackage.internal.util.XmlUtils;
 
 public final class AppImageFile {
 
@@ -247,7 +248,7 @@ private static void save(Path appImageDir,
             addLauncherInfoSave = appImage.getAddLaunchers();
         }
 
-        IOUtils.createXml(getPathInAppImage(appImageDir), xml -> {
+        XmlUtils.createXml(getPathInAppImage(appImageDir), xml -> {
             xml.writeStartElement("jpackage-state");
             xml.writeAttribute("version", getVersion());
             xml.writeAttribute("platform", getPlatform());