This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit e7f48fe359e4e051463ec4461a35e8f269854d74 Author: Justin Bertram <[email protected]> AuthorDate: Mon Feb 3 22:30:07 2025 -0600 ARTEMIS-5293 use Files.readString() & Files.writeString() where possible --- .../artemis/cli/commands/helper/HelperCreate.java | 8 ++------ .../org/apache/activemq/cli/test/FileBrokerTest.java | 19 ++++++++----------- .../activemq/artemis/maven/ArtemisCreatePlugin.java | 8 ++------ .../tests/integration/amqp/JMSSaslGssapiTest.java | 2 +- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperCreate.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperCreate.java index 06933e1a28..e118cd2278 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperCreate.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperCreate.java @@ -20,8 +20,6 @@ package org.apache.activemq.artemis.cli.commands.helper; import java.io.File; import java.io.IOException; import java.lang.invoke.MethodHandles; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; @@ -353,13 +351,11 @@ public class HelperCreate extends HelperBase { } private void copyWithReplacements(Path original, Path target) throws IOException { - Charset charset = StandardCharsets.UTF_8; - - String content = new String(Files.readAllBytes(original), charset); + String content = Files.readString(original); for (int i = 0; i + 1 < replacePairs.length; i += 2) { content = content.replaceAll(replacePairs[i], replacePairs[i + 1]); } - Files.write(target, content.getBytes(charset)); + Files.writeString(target, content); } private void copyConfigurationFiles(String[] list, diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/FileBrokerTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/FileBrokerTest.java index cc68936644..eb9655d8d6 100644 --- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/FileBrokerTest.java +++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/FileBrokerTest.java @@ -16,16 +16,8 @@ */ package org.apache.activemq.cli.test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - import java.io.File; import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -45,6 +37,12 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager import org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class FileBrokerTest { @Test @@ -203,10 +201,9 @@ public class FileBrokerTest { private void replacePatternInFile(String file, String regex, String replacement) throws IOException { Path path = Paths.get(file); - Charset charset = StandardCharsets.UTF_8; - String content = new String(Files.readAllBytes(path), charset); + String content = Files.readString(path); String replaced = content.replaceAll(regex, replacement); - Files.write(path, replaced.getBytes(charset)); + Files.writeString(path, replaced); Files.setLastModifiedTime(path, FileTime.fromMillis(System.currentTimeMillis())); } } diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java index 0260abdf45..2381b42826 100644 --- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java @@ -20,8 +20,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintStream; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; @@ -358,13 +356,11 @@ public class ArtemisCreatePlugin extends ArtemisAbstractPlugin { } private void copyWithReplacements(Path original, Path target) throws IOException { - Charset charset = StandardCharsets.UTF_8; - - String content = new String(Files.readAllBytes(original), charset); + String content = Files.readString(original); for (int i = 0; i + 1 < replacePairs.length; i += 2) { content = content.replaceAll(replacePairs[i], replacePairs[i + 1]); } - Files.write(target, content.getBytes(charset)); + Files.writeString(target, content); } private String getCommandline(List<String> listCommands) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSSaslGssapiTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSSaslGssapiTest.java index a0a8f9c83d..ba8e477217 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSSaslGssapiTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSSaslGssapiTest.java @@ -321,7 +321,7 @@ public class JMSSaslGssapiTest extends JMSClientTestSupport { private static void rewriteKrbConfFile(MiniKdc server) throws Exception { final Path template = Paths.get(JMSSaslGssapiTest.class.getClassLoader().getResource(KRB5_CONFIG_TEMPLATE).toURI()); - final String krb5confTemplate = new String(Files.readAllBytes(template), StandardCharsets.UTF_8); + final String krb5confTemplate = Files.readString(template); final String replacementPort = Integer.toString(server.getPort()); // Replace the port template with the current actual port of the MiniKDC Server instance. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
