Use stream and let stax figure out encoding

Author: cstamas

src/test/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcherTest.java

@@ -13,8 +13,10 @@
 
 package org.codehaus.plexus.components.secdispatcher.internal;
 
-import java.io.FileWriter;
+import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Base64;
 import java.util.Map;
 import java.util.Set;
@@ -49,9 +51,8 @@ private void saveSec(String masterSource) throws Exception {
         sec.setMasterSource(masterSource);
         sec.setMasterCipher(AESGCMNoPadding.CIPHER_ALG);
 
-        try (FileWriter fw = new FileWriter("./target/sec.xml")) {
-            new SecurityConfigurationStaxWriter().write(fw, sec);
-            fw.flush();
+        try (OutputStream fos = Files.newOutputStream(Paths.get("./target/sec.xml"))) {
+            new SecurityConfigurationStaxWriter().write(fos, sec);
         }
         System.setProperty(DefaultSecDispatcher.SYSTEM_PROPERTY_CONFIGURATION_LOCATION, "./target/sec.xml");
     }

src/test/java/org/codehaus/plexus/components/secdispatcher/internal/SecUtilTest.java

@@ -13,7 +13,9 @@
 
 package org.codehaus.plexus.components.secdispatcher.internal;
 
-import java.io.FileWriter;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Map;
 
 import org.codehaus.plexus.components.secdispatcher.model.Config;
@@ -54,9 +56,8 @@ private void saveSec(String masterSource) throws Exception {
 
         sec.addConfiguration(conf);
 
-        try (FileWriter fw = new FileWriter("./target/sec1.xml")) {
-            new SecurityConfigurationStaxWriter().write(fw, sec);
-            fw.flush();
+        try (OutputStream fos = Files.newOutputStream(Paths.get("./target/sec1.xml"))) {
+            new SecurityConfigurationStaxWriter().write(fos, sec);
         }
     }
 
@@ -65,9 +66,8 @@ public void prepare() throws Exception {
         System.setProperty(DefaultSecDispatcher.SYSTEM_PROPERTY_CONFIGURATION_LOCATION, "./target/sec.xml");
         SettingsSecurity sec = new SettingsSecurity();
         sec.setRelocation("./target/sec1.xml");
-        try (FileWriter fw = new FileWriter("./target/sec.xml")) {
-            new SecurityConfigurationStaxWriter().write(fw, sec);
-            fw.flush();
+        try (OutputStream fos = Files.newOutputStream(Paths.get("./target/sec.xml"))) {
+            new SecurityConfigurationStaxWriter().write(fos, sec);
         }
         saveSec("magic:mighty");
     }