Remove remaining File usages

Author: gnodet

its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java

@@ -18,18 +18,16 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Collections;
-
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.security.HashLoginService;
@@ -182,11 +180,11 @@ public InputStream stream(String path) throws IOException {
             return this;
         }
 
-        public HttpServerBuilder source(final File source) {
+        public HttpServerBuilder source(final Path source) {
             this.source = new StreamSource() {
                 @Override
                 public InputStream stream(String path) throws IOException {
-                    return new FileInputStream(new File(source, path));
+                    return Files.newInputStream(source.resolve(path));
                 }
             };
             return this;
@@ -227,7 +225,7 @@ public static void main(String[] args) throws Exception {
                 .port(0) //
                 .username("maven") //
                 .password("secret") //
-                .source(new File("/tmp/repo")) //
+                .source(Path.of("/tmp/repo")) //
                 .build();
         server.start();
     }

its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java

@@ -18,14 +18,15 @@
  */
 package org.apache.maven.it;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.FileTime;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
+import org.codehaus.plexus.util.FileUtils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -35,71 +36,45 @@
 class ItUtils {
 
     public static String calcHash(Path file, String algo) throws Exception {
-        return ItUtils.calcHash(file.toFile(), algo);
-    }
-
-    public static String calcHash(File file, String algo) throws Exception {
         MessageDigest digester = MessageDigest.getInstance(algo);
 
-        DigestInputStream dis;
-        try (FileInputStream is = new FileInputStream(file)) {
-            dis = new DigestInputStream(is, digester);
-
-            for (byte[] buffer = new byte[1024 * 4]; dis.read(buffer) >= 0; ) {
+        try (InputStream is = new DigestInputStream(Files.newInputStream(file), digester)) {
+            byte[] buffer = new byte[1024 * 4];
+            while (is.read(buffer) >= 0) {
                 // just read it
             }
         }
 
         byte[] digest = digester.digest();
-
         StringBuilder hash = new StringBuilder(digest.length * 2);
-
         for (byte aDigest : digest) {
             int b = aDigest & 0xFF;
-
             if (b < 0x10) {
                 hash.append('0');
             }
-
             hash.append(Integer.toHexString(b));
         }
 
         return hash.toString();
     }
 
-    /**
-     * @deprecated Use {@link Verifier#setUserHomeDirectory(Path)} instead.
-     */
-    @Deprecated
-    public static void setUserHome(Verifier verifier, File file) {
-        setUserHome(verifier, file.toPath());
-    }
-
-    /**
-     * @deprecated Use {@link Verifier#setUserHomeDirectory(Path)} instead.
-     */
-    @Deprecated
-    public static void setUserHome(Verifier verifier, Path home) {
-        verifier.setUserHomeDirectory(home);
-    }
-
-    public static void assertCanonicalFileEquals(File expected, File actual) throws IOException {
-        assertEquals(expected.getCanonicalFile(), actual.getCanonicalFile());
-    }
-
     public static void assertCanonicalFileEquals(Path expected, Path actual) throws IOException {
         assertEquals(expected.toFile().getCanonicalFile(), actual.toFile().getCanonicalFile());
     }
 
-    public static void assertCanonicalFileEquals(String expected, String actual, String message) throws IOException {
-        assertEquals(new File(expected).getCanonicalFile(), new File(actual).getCanonicalFile(), message);
+    public static void createFile(Path path) throws IOException {
+        Files.newInputStream(path, StandardOpenOption.CREATE).close();
     }
 
-    public static void assertCanonicalFileEquals(String expected, String actual) throws IOException {
-        assertEquals(new File(expected).getCanonicalFile(), new File(actual).getCanonicalFile());
+    public static long lastModified(Path path) throws IOException {
+        return Files.getLastModifiedTime(path).toMillis();
     }
 
-    public static void createFile(Path path) throws IOException {
-        Files.newInputStream(path, StandardOpenOption.CREATE).close();
+    public static void lastModified(Path path, long millis) throws IOException {
+        Files.setLastModifiedTime(path, FileTime.fromMillis(millis));
+    }
+
+    public static void deleteDirectory(Path path) throws IOException {
+        FileUtils.deleteDirectory(path.toFile());
     }
 }

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.it;
 
-import java.io.File;
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.it;
 
-import java.io.File;
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.it;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.List;
 

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.it;
 
-import java.io.File;
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.it;
 
-import java.io.File;
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.it;
 
-import java.io.File;
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.it;
 
-import java.io.File;
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.it;
 
-import java.io.File;
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;