Fix AASX dataformat to make use of Serializer default charset

Author: Daespen

dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/AASXDeserializer.java

@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -31,6 +30,7 @@
 import org.apache.poi.openxml4j.opc.PackagingURIHelper;
 
 import io.adminshell.aas.v3.dataformat.DeserializationException;
+import io.adminshell.aas.v3.dataformat.Serializer;
 import io.adminshell.aas.v3.dataformat.xml.XmlDeserializer;
 import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
 import io.adminshell.aas.v3.model.File;
@@ -125,7 +125,7 @@ private String getXMLResourceString(OPCPackage aasxPackage) throws InvalidFormat
         // Read the content from the PackagePart
         InputStream stream = xmlPart.getInputStream();
         StringWriter writer = new StringWriter();
-        IOUtils.copy(stream, writer, StandardCharsets.UTF_8);
+        IOUtils.copy(stream, writer, Serializer.DEFAULT_CHARSET);
         return writer.toString();
     }
 

dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/AASXSerializer.java

@@ -101,7 +101,7 @@ public void write(AssetAdministrationShellEnvironment environment, Collection<In
         String xml = xmlSerializer.write(environment);
 
         // Save the XML to aasx/xml/content.xml
-        PackagePart xmlPart = createAASXPart(rootPackage, origin, XML_PATH, MIME_XML, AASSPEC_RELTYPE, xml.getBytes());
+        PackagePart xmlPart = createAASXPart(rootPackage, origin, XML_PATH, MIME_XML, AASSPEC_RELTYPE, xml.getBytes(Serializer.DEFAULT_CHARSET));
 
         storeFilesInAASX(environment.getSubmodels(), files, rootPackage, xmlPart);