louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use UTF-8 when creating new Strings from byte[].

Browse Source
This commit is contained in:
langfr
2025-10-08 11:29:54 +01:00
parent cae963a1ca
commit 95b9325222
13 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/main/java/org/mustangproject/ZUGFeRD/DAPullProvider.java
View File

@@ -182,7 +182,7 @@ public class DAPullProvider extends ZUGFeRD2PullProvider {
// Additional Documents of XRechnung (Rechnungsbegruendende Unterlagen - BG-24 XRechnung)
if (trans.getAdditionalReferencedDocuments() != null) {
for (final FileAttachment f : trans.getAdditionalReferencedDocuments()) {
final String documentContent = new String(Base64.getEncoder().encodeToString(f.getData()));
final String documentContent = Base64.getEncoder().encodeToString(f.getData());
xml += "<ram:AdditionalReferencedDocument>"
+ "<ram:IssuerAssignedID>" + f.getFilename() + "</ram:IssuerAssignedID>"
+ "<ram:TypeCode>916</ram:TypeCode>"

2
library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java
View File

@@ -257,7 +257,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider {
// Additional Documents of XRechnung (Rechnungsbegruendende Unterlagen - BG-24 XRechnung)
if (trans.getAdditionalReferencedDocuments() != null) {
for (final FileAttachment f : trans.getAdditionalReferencedDocuments()) {
final String documentContent = new String(Base64.getEncoder().encodeToString(f.getData()));
final String documentContent = Base64.getEncoder().encodeToString(f.getData());
xml += "<ram:AdditionalReferencedDocument>"
+ "<ram:IssuerAssignedID>" + f.getFilename() + "</ram:IssuerAssignedID>"
+ "<ram:TypeCode>916</ram:TypeCode>"

2
library/src/main/java/org/mustangproject/ZUGFeRD/UBLDAPullProvider.java
View File

@@ -117,7 +117,7 @@ public class UBLDAPullProvider implements IXMLProvider {
final StringWriter sw = new StringWriter();
Document document = null;
try {
document = DocumentHelper.parseText(new String(ublData));
document = DocumentHelper.parseText(new String(ublData, StandardCharsets.UTF_8));
} catch (final DocumentException e1) {
LOGGER.error ("Failed to parse UBL", e1);
}

2
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
View File

@@ -91,7 +91,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider {
final StringWriter sw = new StringWriter();
Document document = null;
try {
document = DocumentHelper.parseText(new String(zugferdData));
document = DocumentHelper.parseText(new String(zugferdData, StandardCharsets.UTF_8));
} catch (final DocumentException e1) {
LOGGER.error ("Failed to parse ZUGFeRD data", e1);
}

4
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
View File

@@ -95,7 +95,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
final StringWriter sw = new StringWriter();
Document document = null;
try {
document = DocumentHelper.parseText(new String(zugferdData));
document = DocumentHelper.parseText(new String(zugferdData, StandardCharsets.UTF_8));
} catch (final DocumentException e1) {
LOGGER.error("Failed to parse ZUGFeRD data", e1);
}
@@ -620,7 +620,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
// Additional Documents of XRechnung (Rechnungsbegruendende Unterlagen - BG-24 XRechnung)
if (trans.getAdditionalReferencedDocuments() != null) {
for (final FileAttachment f : trans.getAdditionalReferencedDocuments()) {
final String documentContent = new String(Base64.getEncoder().encodeToString(f.getData()));
final String documentContent = Base64.getEncoder().encodeToString(f.getData());
xml += "<ram:AdditionalReferencedDocument>"
+ "<ram:IssuerAssignedID>" + f.getFilename() + "</ram:IssuerAssignedID>"
+ "<ram:TypeCode>916</ram:TypeCode>"

3
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
View File

@@ -14,6 +14,7 @@ package org.mustangproject.ZUGFeRD;
* @author jstaerk
*/
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -479,7 +480,7 @@ public class ZUGFeRDImporter extends ZUGFeRDInvoiceImporter {
return null;
}
return new String(rawXML);
return new String(rawXML, StandardCharsets.UTF_8);
}

2
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
View File

@@ -1223,7 +1223,7 @@ public class ZUGFeRDInvoiceImporter {
return null;
}
if (rawXML.length < 3) {
return new String(rawXML);
return new String(rawXML, StandardCharsets.UTF_8);
}