fix: remove use of commons-io in dev-server (#22860)

Remove the usage of commons-io
in vaadin-dev-server module as
it is not required and has been
comming from transitive dependency.

Fixes #22858

Author: caalador

vaadin-dev-server/src/main/java/com/vaadin/base/devserver/AbstractDevServerRunner.java

@@ -27,6 +27,7 @@
 import java.net.InetAddress;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
@@ -38,8 +39,6 @@
 import java.util.function.BiConsumer;
 import java.util.regex.Pattern;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,6 +57,7 @@
 import com.vaadin.flow.server.VaadinResponse;
 import com.vaadin.flow.server.VaadinService;
 import com.vaadin.flow.server.VaadinSession;
+import com.vaadin.flow.server.frontend.FileIOUtils;
 import com.vaadin.flow.server.frontend.FrontendTools;
 import com.vaadin.flow.server.frontend.FrontendUtils;
 import com.vaadin.flow.server.startup.ApplicationConfiguration;
@@ -513,8 +513,8 @@ private static int getRunningDevServerPort(File npmFolder) {
         File portFile = getDevServerPortFile(npmFolder);
         if (portFile.canRead()) {
             try {
-                String portString = FileUtils
-                        .readFileToString(portFile, StandardCharsets.UTF_8)
+                String portString = Files
+                        .readString(portFile.toPath(), StandardCharsets.UTF_8)
                         .trim();
                 if (!portString.isEmpty()) {
                     port = Integer.parseInt(portString);
@@ -530,7 +530,11 @@ private static int getRunningDevServerPort(File npmFolder) {
      * Remove the running port from the vaadinContext and temporary file.
      */
     private void removeRunningDevServerPort() {
-        FileUtils.deleteQuietly(devServerPortFile);
+        try {
+            FileIOUtils.delete(devServerPortFile);
+        } catch (IOException e) {
+            // ignore
+        }
     }
 
     @Override
@@ -550,7 +554,7 @@ private void reuseExistingPort(int port) {
 
     private void saveRunningDevServerPort() {
         try {
-            FileUtils.writeStringToFile(devServerPortFile, String.valueOf(port),
+            Files.writeString(devServerPortFile.toPath(), String.valueOf(port),
                     StandardCharsets.UTF_8);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
@@ -678,9 +682,10 @@ static boolean handleRequestInternal(VaadinSession session,
         } else {
             if (request.getHeader("X-DevModePoll") == null) {
                 // The initial request while the dev server is starting
-                InputStream inputStream = AbstractDevServerRunner.class
-                        .getResourceAsStream("dev-mode-not-ready.html");
-                IOUtils.copy(inputStream, response.getOutputStream());
+                try (InputStream inputStream = AbstractDevServerRunner.class
+                        .getResourceAsStream("dev-mode-not-ready.html")) {
+                    inputStream.transferTo(response.getOutputStream());
+                }
             } else {
                 // A polling request while the server is starting
                 response.getWriter().write("Pending");

vaadin-dev-server/src/main/java/com/vaadin/base/devserver/OpenInCurrentIde.java

@@ -18,7 +18,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.ProcessHandle.Info;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -28,10 +27,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.vaadin.flow.internal.StringUtil;
 import com.vaadin.open.OSUtils;
 import com.vaadin.open.Open;
 
@@ -179,8 +178,7 @@ static void run(String command, String... arguments)
         Process process = pb.start();
         int exitCode = process.waitFor();
         if (exitCode != 0) {
-            String output = IOUtils.toString(process.getInputStream(),
-                    StandardCharsets.UTF_8);
+            String output = StringUtil.toUTF8String(process.getInputStream());
             throw new IOException(
                     "Command " + cmd + " terminated with exit code " + exitCode
                             + ".\nOutput:\n" + output);

vaadin-dev-server/src/main/java/com/vaadin/base/devserver/startup/DevModeInitializer.java

@@ -48,7 +48,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -535,12 +534,13 @@ private static void generateJarFromJBossVfsFolder(Object jarVirtualFile,
 
                 String relativePath = (String) getPathNameRelativeToMethod
                         .invoke(child, jarVirtualFile);
-                InputStream inputStream = (InputStream) openStreamMethod
-                        .invoke(child);
-                ZipEntry zipEntry = new ZipEntry(relativePath);
-                zipOutputStream.putNextEntry(zipEntry);
-                IOUtils.copy(inputStream, zipOutputStream);
-                zipOutputStream.closeEntry();
+                try (InputStream inputStream = (InputStream) openStreamMethod
+                        .invoke(child)) {
+                    ZipEntry zipEntry = new ZipEntry(relativePath);
+                    zipOutputStream.putNextEntry(zipEntry);
+                    inputStream.transferTo(zipOutputStream);
+                    zipOutputStream.closeEntry();
+                }
             }
         }
     }

vaadin-dev-server/src/main/java/com/vaadin/base/devserver/stats/ProjectHelpers.java

@@ -25,7 +25,6 @@
 import java.util.UUID;
 import java.util.stream.Stream;
 
-import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -245,7 +244,7 @@ static File resolveStatisticsStore() {
                 vaadinHome = File.createTempFile(
                         StatisticsConstants.VAADIN_FOLDER_NAME,
                         UUID.randomUUID().toString());
-                FileUtils.forceMkdir(vaadinHome);
+                Files.createDirectories(vaadinHome.toPath());
             } catch (IOException e) {
                 getLogger().debug("Failed to create temp directory ", e);
                 return null;

vaadin-dev-server/src/test/java/com/vaadin/base/devserver/DevModeEndpointTest.java

@@ -18,6 +18,7 @@
 import jakarta.servlet.ServletRegistration;
 
 import java.io.File;
+import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.HashMap;
@@ -26,7 +27,6 @@
 import java.util.Set;
 
 import net.jcip.annotations.NotThreadSafe;
-import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -109,7 +109,7 @@ public void setup() throws Exception {
         Mockito.when(servletContext.getClassLoader())
                 .thenReturn(this.getClass().getClassLoader());
 
-        FileUtils.forceMkdir(new File(baseDir, "src/main/java"));
+        Files.createDirectories(new File(baseDir, "src/main/java").toPath());
 
         devModeStartupListener = new DevModeStartupListener();
     }

vaadin-dev-server/src/test/java/com/vaadin/base/devserver/startup/DevModeInitializerTest.java

@@ -26,6 +26,7 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39,7 +40,6 @@
 import java.util.function.Function;
 
 import net.jcip.annotations.NotThreadSafe;
-import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -327,10 +327,10 @@ public void shouldUseByteCodeScannerIfPropertySet() throws Exception {
     }
 
     private String getFlowGeneratedImports() throws IOException {
-        return FileUtils.readFileToString(
-                FrontendUtils.getFlowGeneratedImports(new File(npmFolder,
-                        FrontendUtils.DEFAULT_FRONTEND_DIR)),
-                StandardCharsets.UTF_8);
+        return Files.readString(FrontendUtils
+                .getFlowGeneratedImports(
+                        new File(npmFolder, FrontendUtils.DEFAULT_FRONTEND_DIR))
+                .toPath(), StandardCharsets.UTF_8);
     }
 
     @Test

vaadin-dev-server/src/test/java/com/vaadin/base/devserver/startup/DevModeInitializerTestBase.java

@@ -22,6 +22,8 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -31,7 +33,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 import org.mockito.Mockito;
@@ -131,12 +132,13 @@ public void setup() throws Exception {
         // Not this needs to update according to dependencies in
         // NodeUpdater.getDefaultDependencies and
         // NodeUpdater.getDefaultDevDependencies
-        FileUtils.write(mainPackageFile, getInitalPackageJson().toString(),
-                "UTF-8");
+        Files.writeString(mainPackageFile.toPath(),
+                getInitalPackageJson().toString(), StandardCharsets.UTF_8);
         // Create a minimal valid vite.config.ts that exports an empty
         // configuration
-        FileUtils.write(devServerConfigFile, "export default {}\n", "UTF-8");
-        FileUtils.forceMkdir(new File(baseDir, "src/main/java"));
+        Files.writeString(devServerConfigFile.toPath(), "export default {}\n",
+                StandardCharsets.UTF_8);
+        Files.createDirectories(new File(baseDir, "src/main/java").toPath());
 
         devModeStartupListener = new DevModeStartupListener();
     }

vaadin-dev-server/src/test/java/com/vaadin/base/devserver/stats/AbstractStatisticsTest.java

@@ -17,8 +17,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 
-import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.mockito.Mockito;
 
@@ -49,7 +50,8 @@ protected static File createTempStorage(String testResourceName)
                 TestUtils.getTestResource(testResourceName).getFile());
         File result = File.createTempFile("test", "json");
         result.deleteOnExit();
-        FileUtils.copyFile(original, result);
+        Files.copy(original.toPath(), result.toPath(),
+                StandardCopyOption.REPLACE_EXISTING);
         return result;
     }
 

vaadin-dev-server/src/test/java/com/vaadin/base/devserver/stats/DevModeUsageStatisticsTest.java

@@ -16,16 +16,16 @@
 package com.vaadin.base.devserver.stats;
 
 import java.io.File;
-import java.nio.charset.StandardCharsets;
+import java.io.InputStream;
 
 import net.jcip.annotations.NotThreadSafe;
-import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import tools.jackson.databind.JsonNode;
 import tools.jackson.databind.node.ObjectNode;
 
 import com.vaadin.flow.internal.JacksonUtils;
+import com.vaadin.flow.internal.StringUtil;
 import com.vaadin.flow.testutil.TestUtils;
 import com.vaadin.pro.licensechecker.MachineId;
 
@@ -39,10 +39,11 @@ public void clientData() throws Exception {
                 .getTestFolder("stats-data/maven-project-folder1");
         DevModeUsageStatistics.init(mavenProjectFolder, storage, sender);
 
-        String data = IOUtils.toString(
-                TestUtils.getTestResource("stats-data/client-data-1.txt"),
-                StandardCharsets.UTF_8);
-        DevModeUsageStatistics.handleBrowserData(wrapStats(data));
+        try (InputStream testResource = TestUtils
+                .getTestResource("stats-data/client-data-1.txt").openStream()) {
+            String data = StringUtil.toUTF8String(testResource);
+            DevModeUsageStatistics.handleBrowserData(wrapStats(data));
+        }
     }
 
     @Test

vaadin-dev-server/src/test/java/com/vaadin/base/devserver/stats/ProjectHelpersTest.java

@@ -16,12 +16,10 @@
 package com.vaadin.base.devserver.stats;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
-import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -88,7 +86,7 @@ public void writeAndReadUserKey() throws IOException {
         // Check file
         File userFile = new File(System.getProperty("user.home"),
                 ".vaadin/userKey");
-        String fromFile = IOUtils.toString(new FileInputStream(userFile),
+        String fromFile = Files.readString(userFile.toPath(),
                 StandardCharsets.UTF_8);
         Assert.assertEquals("{\"key\":\"" + userKey + "\"}", fromFile);