8349564: Clean warnings found in jpackage tests when building them with -Xlint:all

Reviewed-by: almatvee

Author: Alexey Semenyuk

test/jdk/tools/jpackage/apps/ChildProcessAppLauncher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -21,9 +21,7 @@
  * questions.
  */
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Path;
 
 public class ChildProcessAppLauncher {
     public static void main(String[] args) throws IOException, InterruptedException {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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,7 +35,6 @@
 import static java.util.stream.Collectors.toMap;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
-import static jdk.internal.util.OperatingSystem.LINUX;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Parameters;
@@ -52,12 +51,12 @@
 public class AnnotationsTest {
 
     public static void main(String... args) {
-        runTests(BasicTest.class, ParameterizedInstanceTest.class);
+        runTests(List.of(BasicTest.class, ParameterizedInstanceTest.class));
         for (var os : OperatingSystem.values()) {
             try {
                 TestBuilderConfig.setOperatingSystem(os);
                 TKit.log("Current operating system: " + os);
-                runTests(IfOSTest.class);
+                runTests(List.of(IfOSTest.class));
             } finally {
                 TestBuilderConfig.setDefaults();
             }
@@ -301,17 +300,17 @@ public static Collection<Object[]> dateSupplier() {
         });
     }
 
-    private static void runTests(Class<? extends TestExecutionRecorder>... tests) {
+    private static void runTests(List<Class<? extends TestExecutionRecorder>> tests) {
         ACTUAL_TEST_DESCS.get().clear();
 
-        var expectedTestDescs = Stream.of(tests)
+        var expectedTestDescs = tests.stream()
                 .map(AnnotationsTest::getExpectedTestDescs)
                 .flatMap(x -> x)
                 // Collect in the map to check for collisions for free
                 .collect(toMap(x -> x, x -> ""))
                 .keySet();
 
-        var args = Stream.of(tests).map(test -> {
+        var args = tests.stream().map(test -> {
             return String.format("--jpt-run=%s", test.getName());
         }).toArray(String[]::new);
 
@@ -324,6 +323,7 @@ private static void runTests(Class<? extends TestExecutionRecorder>... tests) {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private static Stream<String> getExpectedTestDescs(Class<?> type) {
         return toSupplier(() -> {
             var method = type.getMethod("getExpectedTestDescs");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -106,7 +106,7 @@ ArgsBuilder expectFail() {
     }
 
     @Parameters
-    public static Collection input() {
+    public static Collection<?> input() {
         List<Object[]> data = new ArrayList<>();
         buildArgs().applyVariantsTo(data);
         buildArgs().actualPaths("foo").assertOp(CONTAINS).applyTo(data);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, 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
@@ -87,10 +87,15 @@ public final AdditionalLauncher setLauncherAsService() {
     }
 
     public final AdditionalLauncher addRawProperties(
-            Map.Entry<String, String>... v) {
+            Map.Entry<String, String> v) {
         return addRawProperties(List.of(v));
     }
 
+    public final AdditionalLauncher addRawProperties(
+            Map.Entry<String, String> v, Map.Entry<String, String> v2) {
+        return addRawProperties(List.of(v, v2));
+    }
+
     public final AdditionalLauncher addRawProperties(
             Collection<Map.Entry<String, String>> v) {
         rawProperties.addAll(v);

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

@@ -34,6 +34,6 @@ public static <T> Comm<T> compare(Set<T> a, Set<T> b) {
         unique1.removeAll(common);
         Set<T> unique2 = new HashSet<>(b);
         unique2.removeAll(common);
-        return new Comm(common, unique1, unique2);
+        return new Comm<T>(common, unique1, unique2);
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, 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
@@ -36,17 +36,17 @@ public class CommandArguments<T> {
 
     public final T clearArguments() {
         args.clear();
-        return (T) this;
+        return thiz();
     }
 
     public final T addArgument(String v) {
         args.add(v);
-        return (T) this;
+        return thiz();
     }
 
     public final T addArguments(List<String> v) {
         args.addAll(v);
-        return (T) this;
+        return thiz();
     }
 
     public final T addArgument(Path v) {
@@ -77,5 +77,10 @@ protected boolean isMutable() {
         return true;
     }
 
+    @SuppressWarnings("unchecked")
+    private T thiz() {
+        return (T) this;
+    }
+
     protected List<String> args;
 }

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

@@ -259,7 +259,8 @@ Result getValue() {
             return value;
         }
 
-        private final Result value;
+        private final transient Result value;
+        private static final long serialVersionUID = 1L;
     }
 
     /*

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, 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
@@ -47,18 +47,10 @@ public static Runnable identity(Runnable v) {
         return v;
     }
 
-    public static <T, R> Function<T, R> identity(Function<T, R> v) {
-        return v;
-    }
-
     public static <T, R> Function<T, R> identityFunction(Function<T, R> v) {
         return v;
     }
 
-    public static <T> Predicate<T> identity(Predicate<T> v) {
-        return v;
-    }
-
     public static <T> Predicate<T> identityPredicate(Predicate<T> v) {
         return v;
     }

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

@@ -393,7 +393,7 @@ public AppOutputVerifier addParams(Map<String, String> v) {
             return addParams(v.entrySet());
         }
 
-        public AppOutputVerifier addParams(Map.Entry<String, String>... v) {
+        public AppOutputVerifier addParams(Map.Entry<String, String> v) {
             return addParams(List.of(v));
         }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, 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
@@ -264,7 +264,7 @@ private void setIcon(Path iconPath, Path launcherPath) {
 
         static final WinIconVerifier instance = new WinIconVerifier();
 
-        private final Class executableRebranderClass;
+        private final Class<?> executableRebranderClass;
         private final Method lockResource;
         private final Method unlockResource;
         private final Method iconSwapWrapper;