CU-85zrnb6u1_PW---631--XML-Handling

Author: ptorres-prowide

iso20022-core/src/main/java/com/prowidesoftware/swift/model/mx/MxParseUtils.java

@@ -115,6 +115,8 @@ static Object parseSAXSource(final SAXSource source, final Class targetClass, fi
 
             if(params.charset!=null){
                 source.getInputSource().setEncoding(params.charset.name());
+            } else {
+                source.getInputSource().setEncoding(Charset.defaultCharset().name());
             }
 
             JAXBElement element = unmarshaller.unmarshal(source, targetClass);

iso20022-core/src/test/java/com/prowidesoftware/issues/IssueJira631Test.java

@@ -4,21 +4,16 @@
 import com.prowidesoftware.swift.model.mx.MxPacs00800108;
 import com.prowidesoftware.swift.model.mx.MxReadParams;
 import com.prowidesoftware.swift.model.mx.MxWriteConfiguration;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.parallel.Execution;
 
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
-@Disabled
-@Execution(SAME_THREAD)
+//@Execution(SAME_THREAD)
 public class IssueJira631Test {
 
     @Test
@@ -64,7 +59,7 @@ void testBusinessAppHeaderV02() throws IllegalAccessException, NoSuchFieldExcept
         System.setProperty("file.encoding", currentCharset);
     }
 
-    @Test //Single thread
+    @Test
     void testMxPacsWithWindowsEncoding() throws IllegalAccessException, NoSuchFieldException {
         String currentCharset = Charset.defaultCharset().name();
         Field defaultCharset = Charset.class.getDeclaredField("defaultCharset");
@@ -281,15 +276,16 @@ void testMxPacsWithIBMEncoding() throws IllegalAccessException, NoSuchFieldExcep
         MxPacs00800108 parse = MxPacs00800108.parse(xmlAsString);
         assertNotNull(parse);
 
-        MxWriteConfiguration mxWriteConfiguration = new MxWriteConfiguration();
-        String modelToStringMsg = parse.message(mxWriteConfiguration);
+        String modelToStringMsg = parse.message();
+        System.out.println("Model message with defaultCharset, Cp1141");
         System.out.println(modelToStringMsg);
         assertFalse(modelToStringMsg.contains("encoding="));
 
         MxPacs00800108 stringToModelMx = MxPacs00800108.parse(modelToStringMsg);
         assertNotNull(stringToModelMx);
 
         System.setProperty("file.encoding", currentCharset);
+        System.out.println("Charset reset from Cp1141 to " + currentCharset);
     }
 
 }