set-props: support UTF-8 encoded properties file (#328)

Author: itzg

build.gradle

@@ -123,6 +123,14 @@ java {
     sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
+compileJava {
+  options.encoding = 'utf-8'
+}
+
+compileTestJava {
+  options.encoding = 'utf-8'
+}
+
 githubReleaser {
     project {
         homepage = 'https://github.com/itzg/mc-image-helper'

src/main/java/me/itzg/helpers/properties/SetPropertiesCommand.java

@@ -1,8 +1,9 @@
 package me.itzg.helpers.properties;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
@@ -70,8 +71,8 @@ public Integer call() throws Exception {
 
         final Properties properties = new Properties();
         if (Files.exists(propertiesFile)) {
-            try (InputStream propsIn = Files.newInputStream(propertiesFile)) {
-                properties.load(propsIn);
+            try (Reader propsReader = Files.newBufferedReader(propertiesFile, StandardCharsets.UTF_8)) {
+                properties.load(propsReader);
             }
         }
 

src/test/java/me/itzg/helpers/properties/SetPropertiesCommandTest.java

@@ -7,6 +7,7 @@
 import java.io.InputStream;
 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;
@@ -34,7 +35,7 @@ class SetPropertiesCommandTest {
 
     @BeforeEach
     void setUp() throws IOException, URISyntaxException {
-        propertiesFile = preparePropertiesFile();
+        propertiesFile = preparePropertiesFile("server.properties");
 
         final URL definitionsResource = getClass().getResource("/properties/property-definitions.json");
         assertThat(definitionsResource).isNotNull();
@@ -173,6 +174,24 @@ void handlesModifiedCustomProperties() throws IOException {
             .containsEntry("key2", "value2");
     }
 
+    @Test
+    void handlesExistingUnicodePropertyValue() throws IOException {
+        final Path outputProperties = preparePropertiesFile("with-unicode.txt");
+
+        final int exitCode = new CommandLine(new SetPropertiesCommand())
+            .execute(
+                "--custom-property", "key1=value1",
+                outputProperties.toString()
+            );
+
+        assertThat(exitCode).isEqualTo(ExitCode.OK);
+
+        assertThat(outputProperties)
+            .content(StandardCharsets.UTF_8)
+            .containsIgnoringNewLines("motd=\\u00A7c\\u00A7lT\\u00A76\\u00A7le\\u00A7e\\u00A7ls\\u00A7a\\u00A7lt\\u00A73\\u00A7li\\u00A79\\u00A7ln\\u00A75\\u00A7lg \\u00A76\\u00A7l1\\u00A7e\\u00A7l2\\u00A7a\\u00A7l3")
+            .containsIgnoringNewLines("key1=value1");
+    }
+
     private void assertPropertiesEqualExcept(Properties properties, String... propertiesToIgnore) {
         final HashSet<Object> actualKeys = new HashSet<>(properties.keySet());
         Arrays.asList(propertiesToIgnore).forEach(actualKeys::remove);
@@ -196,12 +215,13 @@ private Properties loadProperties() throws IOException {
         return properties;
     }
 
-    private Path preparePropertiesFile() throws IOException {
-        try (InputStream in = getClass().getClassLoader().getResourceAsStream("properties/server.properties")) {
-            assertThat(in).isNotNull();
-            final Path outFile = tempDir.resolve("server.properties");
-            Files.copy(in, outFile);
-            return outFile;
+    private Path preparePropertiesFile(String filename) throws IOException {
+        final URL resource = getClass().getClassLoader().getResource("properties/" + filename);
+        assertThat(resource).isNotNull();
+        try {
+            return Files.copy(Paths.get(resource.toURI()), tempDir.resolve(filename));
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
         }
     }
 }

src/test/resources/properties/with-unicode.txt

@@ -0,0 +1 @@
+motd=§c§lT§6§le§e§ls§a§lt§3§li§9§ln§5§lg §6§l1§e§l2§a§l3