8260522: Clean up warnings in hotspot JTReg runtime tests

Reviewed-by: lfoltan, coleenp

Author: Harold Seigel

test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, 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
@@ -63,8 +63,8 @@ public static void main(String[] args) throws Exception {
     public static class runJcmd {
 
         public static void main(String[] args) throws Exception {
-            int minHeapFreeRatio = new Integer((new DynamicVMOption("MinHeapFreeRatio")).getValue());
-            int maxHeapFreeRatio = new Integer((new DynamicVMOption("MaxHeapFreeRatio")).getValue());
+            int minHeapFreeRatio = Integer.valueOf((new DynamicVMOption("MinHeapFreeRatio")).getValue());
+            int maxHeapFreeRatio = Integer.valueOf((new DynamicVMOption("MaxHeapFreeRatio")).getValue());
             PidJcmdExecutor executor = new PidJcmdExecutor();
 
             Asserts.assertGT(minHeapFreeRatio, 0, "MinHeapFreeRatio must be greater than 0");

test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/DoubleJVMOption.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, 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
@@ -76,7 +76,7 @@ public DoubleJVMOption(String name, double min, double max) {
      */
     @Override
     void setMin(String min) {
-        this.min = new Double(min);
+        this.min = Double.valueOf(min);
     }
 
     /**
@@ -96,7 +96,7 @@ String getMin() {
      */
     @Override
     void setMax(String max) {
-        this.max = new Double(max);
+        this.max = Double.valueOf(max);
     }
 
     /**

test/hotspot/jtreg/runtime/LoadClass/LongBCP.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, 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
@@ -39,6 +39,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.spi.ToolProvider;
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
@@ -47,6 +48,9 @@ public class LongBCP {
 
     private static final int MAX_PATH = 260;
 
+    private static final ToolProvider JAR = ToolProvider.findFirst("jar")
+        .orElseThrow(() -> new RuntimeException("ToolProvider for jar not found"));
+
     public static void main(String args[]) throws Exception {
         Path sourceDir = Paths.get(System.getProperty("test.src"), "test-classes");
         Path classDir = Paths.get(System.getProperty("test.classes"));
@@ -85,11 +89,9 @@ public static void main(String args[]) throws Exception {
               .shouldHaveExitValue(0);
 
         // create a hello.jar
-        sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
         String helloJar = destDir.toString() + File.separator + "hello.jar";
-        if (!jarTool.run(new String[]
-            {"-cf", helloJar, "-C", destDir.toString(), "Hello.class"})) {
-            throw new RuntimeException("Could not write the Hello jar file");
+        if (JAR.run(System.out, System.err, "-cf", helloJar, "-C", destDir.toString(), "Hello.class") != 0) {
+            throw new RuntimeException("jar operation for hello.jar failed");
         }
 
         // run with long bootclasspath to hello.jar

test/hotspot/jtreg/runtime/LoadClass/TriggerResize.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, 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
@@ -89,7 +89,7 @@ public static void main(String args[]) throws Exception
   {
     int count = 0;
     if (args.length >= 1) {
-      Integer i = new Integer(args[0]);
+      Integer i = Integer.parseInt(args[0]);
       count = i.intValue();
     }
 

test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, 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
@@ -50,7 +50,6 @@ public class CommandLineFlagCombo {
     // shared base address test table
     private static final String[] testTable = {
         "-XX:+UseG1GC", "-XX:+UseSerialGC", "-XX:+UseParallelGC",
-        "-XX:+FlightRecorder",
         "-XX:+UseLargePages", // may only take effect on machines with large-pages
         "-XX:+UseCompressedClassPointers",
         "-XX:+UseCompressedOops",
@@ -122,7 +121,7 @@ private static boolean skipTestCase(String testEntry) throws Exception {
             }
         }
 
-        if (!WhiteBox.getWhiteBox().isJFRIncludedInVmBuild() && testEntry.equals("-XX:+FlightRecorder"))
+        if (!WhiteBox.getWhiteBox().isJFRIncludedInVmBuild())
         {
             System.out.println("JFR does not exist");
             return true;

test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, 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
@@ -49,7 +49,6 @@ public static void main(String[] args) throws Exception {
         output = TestCommon.exec(appJar,
             "-XX:+UnlockDiagnosticVMOptions",
             "-Xint",
-            "-XX:+FlightRecorder",
             "-XX:StartFlightRecording=duration=15s,filename=myrecording.jfr,settings=profile,dumponexit=true",
             "TestWithProfilerHelper");
         TestCommon.checkExec(output);

test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsApp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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
@@ -45,7 +45,7 @@ public class MirrorWithReferenceFieldsApp {
 
     public MirrorWithReferenceFieldsApp() {
         non_archived_field_1 = new Object();
-        non_archived_field_2 = new Integer(1);
+        non_archived_field_2 = Integer.valueOf(1);
     }
 
     public static void main(String args[]) throws Exception {

test/hotspot/jtreg/runtime/modules/PatchModule/BasicJarBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, 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
@@ -31,13 +31,16 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import sun.tools.jar.Main;
+import java.util.spi.ToolProvider;
 
 // Using JarBuilder requires that all to-be-jarred classes should be placed
 // in the current working directory, aka "."
 public class BasicJarBuilder {
     private static final String classDir = System.getProperty("test.classes");
 
+    private static final ToolProvider JAR = ToolProvider.findFirst("jar")
+        .orElseThrow(() -> new RuntimeException("ToolProvider for jar not found"));
+
     public static void build(boolean classesInWorkDir, String jarName,
         String ...classNames) throws Exception {
 
@@ -73,8 +76,7 @@ private static void addClassArgs(ArrayList<String> args, String jarclassDir,
     }
 
     private static void createJar(ArrayList<String> args) {
-        Main jarTool = new Main(System.out, System.err, "jar");
-        if (!jarTool.run(args.toArray(new String[1]))) {
+        if (JAR.run(System.out, System.err, args.toArray(new String[1])) != 0) {
             throw new RuntimeException("jar operation failed");
         }
     }

test/hotspot/jtreg/runtime/records/RedefineRecord.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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,7 +28,6 @@
  * @summary Test that a class that is a record can be redefined.
  * @modules java.base/jdk.internal.misc
  * @modules java.instrument
- *          jdk.jartool/sun.tools.jar
  * @requires vm.jvmti
  * @run main RedefineRecord buildagent
  * @run main/othervm/timeout=6000 RedefineRecord runtest
@@ -41,11 +40,15 @@
 import java.lang.instrument.Instrumentation;
 import java.security.ProtectionDomain;
 import java.lang.instrument.IllegalClassFormatException;
+import java.util.spi.ToolProvider;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 
 public class RedefineRecord {
 
+    private static final ToolProvider JAR = ToolProvider.findFirst("jar")
+        .orElseThrow(() -> new RuntimeException("ToolProvider for jar not found"));
+
     record Tester(int x, String y, long z) { }
 
     static class LoggingTransformer implements ClassFileTransformer {
@@ -67,6 +70,7 @@ public static void premain(String agentArgs, Instrumentation inst) throws Except
             inst.retransformClasses(demoClass);
         }
     }
+
     private static void buildAgent() {
         try {
             ClassFileInstaller.main("RedefineRecord");
@@ -85,11 +89,11 @@ private static void buildAgent() {
             throw new RuntimeException("Could not write manifest file for the agent", e);
         }
 
-        sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
-        if (!jarTool.run(new String[] { "-cmf", "MANIFEST.MF", "redefineagent.jar", "RedefineRecord.class" })) {
+        if (JAR.run(System.out, System.err, "-cmf", "MANIFEST.MF", "redefineagent.jar", "RedefineRecord.class") != 0) {
             throw new RuntimeException("Could not write the agent jar file");
         }
     }
+
     public static void main(String argv[]) throws Exception {
         if (argv.length == 1 && argv[0].equals("buildagent")) {
             buildAgent();

test/hotspot/jtreg/runtime/reflect/ArrayGetIntException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, 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
@@ -32,7 +32,7 @@
 
 public class ArrayGetIntException {
     public static void main(String[] args) throws Exception {
-        Object[] objArray = {new Integer(Integer.MAX_VALUE)};
+        Object[] objArray = {Integer.valueOf(Integer.MAX_VALUE)};
 
         // this access is legal
         try {