From 927143a3c6e4f4d659b643809edb972cb829f04c Mon Sep 17 00:00:00 2001 From: phlppchrtn Date: Fri, 31 May 2024 23:58:22 +0200 Subject: [PATCH] + simple --- .../java/io/vertigo/core/util/FileUtil.java | 36 ++++++------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/vertigo-core/src/main/java/io/vertigo/core/util/FileUtil.java b/vertigo-core/src/main/java/io/vertigo/core/util/FileUtil.java index fccc8cd33..0d90a9aa2 100644 --- a/vertigo-core/src/main/java/io/vertigo/core/util/FileUtil.java +++ b/vertigo-core/src/main/java/io/vertigo/core/util/FileUtil.java @@ -17,16 +17,18 @@ */ package io.vertigo.core.util; -import java.io.BufferedOutputStream; -import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; +import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.util.List; import java.util.Locale; import java.util.regex.Pattern; @@ -64,18 +66,10 @@ public static String read(final URL url) { Assertion.check().isNotNull(url); //--- try { - try (final BufferedReader reader = new BufferedReader( - new InputStreamReader(url.openStream(), StandardCharsets.UTF_8))) { - final StringBuilder buff = new StringBuilder(); - String line = reader.readLine(); - while (line != null) { - buff.append(line); - line = reader.readLine(); - buff.append("\r\n"); - } - return buff.toString(); - } - } catch (final IOException e) { + Path path = Paths.get(url.toURI()); + List lines = Files.readAllLines(path, StandardCharsets.UTF_8); + return String.join("\r\n", lines); + } catch (final IOException | URISyntaxException e) { throw WrappedException.wrap(e, "Error when reading file : '{0}'", url); } } @@ -87,13 +81,7 @@ public static String read(final URL url) { * @throws IOException Erreur d'entrée/sortie */ public static void copy(final InputStream in, final OutputStream out) throws IOException { - final int bufferSize = 10 * 1024; - final byte[] bytes = new byte[bufferSize]; - int read = in.read(bytes); - while (read != -1) { - out.write(bytes, 0, read); - read = in.read(bytes); - } + in.transferTo(out); } /** @@ -103,9 +91,7 @@ public static void copy(final InputStream in, final OutputStream out) throws IOE * @throws IOException Erreur d'entrée/sortie */ public static void copy(final InputStream in, final File file) throws IOException { - try (final OutputStream out = new BufferedOutputStream(Files.newOutputStream(file.toPath()))) { - FileUtil.copy(in, out); - } + Files.copy(in, file.toPath(), StandardCopyOption.REPLACE_EXISTING); } /**