LinuxPackagingPipeline, WinPackagingPipeline: remove unused normalizeShortcuts() methods

Author: alexeysemenyukoracle

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

@@ -24,7 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.ApplicationBuilder.normalizeLauncherProperty;
 import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
 
 import java.io.IOException;
@@ -37,12 +36,8 @@
 import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
 import jdk.jpackage.internal.PackagingPipeline.TaskID;
 import jdk.jpackage.internal.model.Application;
-import jdk.jpackage.internal.model.ApplicationLaunchers;
 import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.model.Launcher;
-import jdk.jpackage.internal.model.LauncherShortcut;
-import jdk.jpackage.internal.model.LinuxLauncher;
-import jdk.jpackage.internal.model.LinuxLauncherMixin;
 import jdk.jpackage.internal.model.LinuxPackage;
 import jdk.jpackage.internal.resources.ResourceLocator;
 
@@ -69,17 +64,6 @@ static PackagingPipeline.Builder build(Optional<LinuxPackage> pkg) {
         return builder;
     }
 
-    static ApplicationLaunchers normalizeShortcuts(ApplicationLaunchers appLaunchers) {
-        return normalizeLauncherProperty(appLaunchers, launcher -> {
-            // Return "true" if shortcut is not configured for the launcher.
-            return launcher.shortcut().isEmpty();
-        }, (LinuxLauncher launcher) -> {
-            return launcher.shortcut().flatMap(LauncherShortcut::startupDirectory);
-        }, (launcher, shortcut) -> {
-            return LinuxLauncher.create(launcher, new LinuxLauncherMixin.Stub(Optional.of(new LauncherShortcut(shortcut))));
-        });
-    }
-
     private static void writeLauncherLib(
             AppImageBuildEnv<Application, LinuxApplicationLayout> env) throws IOException {
 

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

@@ -24,26 +24,19 @@
  */
 package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.ApplicationBuilder.normalizeLauncherProperty;
 import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 import jdk.jpackage.internal.PackagingPipeline.AppImageBuildEnv;
 import jdk.jpackage.internal.PackagingPipeline.BuildApplicationTaskID;
 import jdk.jpackage.internal.PackagingPipeline.CopyAppImageTaskID;
 import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
 import jdk.jpackage.internal.PackagingPipeline.TaskID;
-import jdk.jpackage.internal.model.ApplicationLaunchers;
 import jdk.jpackage.internal.model.ApplicationLayout;
-import jdk.jpackage.internal.model.LauncherShortcut;
 import jdk.jpackage.internal.model.PackagerException;
 import jdk.jpackage.internal.model.WinApplication;
 import jdk.jpackage.internal.model.WinLauncher;
-import jdk.jpackage.internal.model.WinLauncherMixin;
 
 final class WinPackagingPipeline {
 
@@ -60,33 +53,6 @@ static PackagingPipeline.Builder build() {
                         .applicationAction(WinPackagingPipeline::rebrandLaunchers).add();
     }
 
-    static ApplicationLaunchers normalizeShortcuts(ApplicationLaunchers appLaunchers) {
-
-        appLaunchers = normalizeShortcuts(appLaunchers, WinLauncher::startMenuShortcut, (launcher, shortcut) -> {
-            return new WinLauncherMixin.Stub(launcher.isConsole(), shortcut, launcher.desktopShortcut());
-        });
-
-        appLaunchers = normalizeShortcuts(appLaunchers, WinLauncher::desktopShortcut, (launcher, shortcut) -> {
-            return new WinLauncherMixin.Stub(launcher.isConsole(), launcher.startMenuShortcut(), shortcut);
-        });
-
-        return appLaunchers;
-    }
-
-    private static ApplicationLaunchers normalizeShortcuts(
-            ApplicationLaunchers appLaunchers,
-            Function<WinLauncher, Optional<LauncherShortcut>> shortcutGetter,
-            BiFunction<WinLauncherMixin, Optional<LauncherShortcut>, WinLauncherMixin> shortcutOverrider) {
-        return normalizeLauncherProperty(appLaunchers, launcher -> {
-            // Return "true" if shortcut is not configured for the launcher.
-            return shortcutGetter.apply(launcher).isEmpty();
-        }, (WinLauncher launcher) -> {
-            return shortcutGetter.apply(launcher).flatMap(LauncherShortcut::startupDirectory);
-        }, (launcher, shortcut) -> {
-            return WinLauncher.create(launcher, shortcutOverrider.apply(launcher, Optional.of(new LauncherShortcut(shortcut))));
-        });
-    }
-
     private static void rebrandLaunchers(AppImageBuildEnv<WinApplication, ApplicationLayout> env)
             throws IOException, PackagerException {
         for (var launcher : env.app().launchers()) {