solve charset problem when receiving message in app

* specified encoding (UTF-8) at other places metasfresh/metasfresh-edi-legacy#6
metasfresh · Jan 11, 2020 · f7d30ae · f7d30ae
1 parent 6653f38
commit f7d30ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/de/metas/ui/web/devtools/MigrationScriptRestController.java b/src/main/java/de/metas/ui/web/devtools/MigrationScriptRestController.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDate;
@@ -285,7 +286,7 @@ private static byte[] toByteArray(final List<String> lines)
 		{
 			lines.stream()
 					.map(s -> s + "\n")
-					.map(String::getBytes)
+					.map(s->s.getBytes(StandardCharsets.UTF_8))
 					.forEach(bytes -> {
 						try
 						{

diff --git a/src/main/java/de/metas/ui/web/window/descriptor/sql/DocumentFieldValueLoaders.java b/src/main/java/de/metas/ui/web/window/descriptor/sql/DocumentFieldValueLoaders.java
@@ -2,6 +2,7 @@
 
 import java.awt.Color;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.sql.Array;
 import java.sql.Blob;
 import java.sql.Clob;
@@ -270,7 +271,7 @@ else if (valueObj instanceof Clob)
 			{
 				final Clob lob = (Clob)valueObj;
 				final long length = lob.length();
-				valueBytes = lob.getSubString(1, (int)length).getBytes();
+				valueBytes = lob.getSubString(1, (int)length).getBytes(StandardCharsets.UTF_8);
 			}
 			else if (valueObj instanceof Blob)
 			{
@@ -280,7 +281,7 @@ else if (valueObj instanceof Blob)
 			}
 			else if (valueObj instanceof String)
 			{
-				valueBytes = ((String)valueObj).getBytes();
+				valueBytes = ((String)valueObj).getBytes(StandardCharsets.UTF_8);
 			}
 			else if (valueObj instanceof byte[])
 			{