Merge remote-tracking branch 'origin/issues/80_BundleGenerator_Encoding'

hhund · hhund · commit 28058acc352b · 2022-07-06T16:20:41.000+02:00
into develop
diff --git a/codex-processes-ap1-test-data-generator/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/tools/generator/BundleGenerator.java b/codex-processes-ap1-test-data-generator/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/tools/generator/BundleGenerator.java
@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -53,7 +54,7 @@ private Bundle readAndCleanBundle(Path bundleTemplateFile)
 	private void writeBundle(Path bundleFile, Bundle bundle)
 	{
 		try (OutputStream out = Files.newOutputStream(bundleFile);
-				OutputStreamWriter writer = new OutputStreamWriter(out))
+				OutputStreamWriter writer = new OutputStreamWriter(out, StandardCharsets.UTF_8))
 		{
 			newXmlParser().encodeResourceToWriter(bundle, writer);
 		}

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import java.io.InputStream;`
`5`	`5`	`import java.io.OutputStream;`
`6`	`6`	`import java.io.OutputStreamWriter;`
	`7`	`+import java.nio.charset.StandardCharsets;`
`7`	`8`	`import java.nio.file.Files;`
`8`	`9`	`import java.nio.file.Path;`
`9`	`10`	`import java.nio.file.Paths;`
`@@ -53,7 +54,7 @@ private Bundle readAndCleanBundle(Path bundleTemplateFile)`
`53`	`54`	`private void writeBundle(Path bundleFile, Bundle bundle)`
`54`	`55`	`{`
`55`	`56`	`try (OutputStream out = Files.newOutputStream(bundleFile);`
`56`		`- OutputStreamWriter writer = new OutputStreamWriter(out))`
	`57`	`+ OutputStreamWriter writer = new OutputStreamWriter(out, StandardCharsets.UTF_8))`
`57`	`58`	`{`
`58`	`59`	`newXmlParser().encodeResourceToWriter(bundle, writer);`
`59`	`60`	`}`