Merge pull request jooby-project#2561 from lukasbarti/fix-gson-encoding

jknack · web-flow · commit 7138c8393d5e · 2022-04-18T15:05:42.000-03:00
Fix GsonModule to also use UTF-8 encoding while decoding
diff --git a/modules/jooby-gson/src/main/java/io/jooby/json/GsonModule.java b/modules/jooby-gson/src/main/java/io/jooby/json/GsonModule.java
@@ -99,10 +99,10 @@ public GsonModule() {
       throws Exception {
     Body body = ctx.body();
     if (body.isInMemory()) {
-      return gson.fromJson(new InputStreamReader(new ByteArrayInputStream(body.bytes())), type);
+      return gson.fromJson(new InputStreamReader(new ByteArrayInputStream(body.bytes()), UTF_8), type);
     } else {
       try (InputStream stream = body.stream()) {
-        return gson.fromJson(new InputStreamReader(stream), type);
+        return gson.fromJson(new InputStreamReader(stream, UTF_8), type);
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,10 @@ public GsonModule() {`
`99`	`99`	`throws Exception {`
`100`	`100`	`Body body = ctx.body();`
`101`	`101`	`if (body.isInMemory()) {`
`102`		`- return gson.fromJson(new InputStreamReader(new ByteArrayInputStream(body.bytes())), type);`
	`102`	`+ return gson.fromJson(new InputStreamReader(new ByteArrayInputStream(body.bytes()), UTF_8), type);`
`103`	`103`	`} else {`
`104`	`104`	`try (InputStream stream = body.stream()) {`
`105`		`- return gson.fromJson(new InputStreamReader(stream), type);`
	`105`	`+ return gson.fromJson(new InputStreamReader(stream, UTF_8), type);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`