commit 2e9ae3b3af1c94f7931b15f7d1cfb87bdf141ab8
author Andrew Gaul <gaul@apache.org> Sat Dec 05 22:53:11 2020 +0900
committer Andrew Gaul <gaul@apache.org> Sat Dec 05 22:54:37 2020 +0900
tree b13f24f38ab6abba6e9430a322e15880eb47c32b
parent e7885359a7755ac5ad6298f35b7547a31e1c5548

JCLOUDS-1559: Add explicit Charset to fromJson calls

aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/handlers/ECSErrorRetryHandler.java

diff --git a/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/handlers/ECSErrorRetryHandler.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/handlers/ECSErrorRetryHandler.java
index 0a32145..f2869de 100644
--- a/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/handlers/ECSErrorRetryHandler.java
+++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/handlers/ECSErrorRetryHandler.java
@@ -27,6 +27,7 @@
 import org.jclouds.json.Json;
 
 import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Set;
 
 import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream;
@@ -56,7 +57,7 @@
          // Content can be null in the case of HEAD requests
          if (response.getPayload() != null) {
             closeClientButKeepContentStream(response);
-            ErrorMessage error = json.fromJson(new ByteArrayInputStream(content), ErrorMessage.class);
+            ErrorMessage error = json.fromJson(new ByteArrayInputStream(content), StandardCharsets.UTF_8, ErrorMessage.class);
             if (error != null) {
                return shouldRetryRequestOnError(command, response, error);
             }

dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/utils/ParseResponse.java

diff --git a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/utils/ParseResponse.java b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/utils/ParseResponse.java
index 809d934..0a487d7 100644
--- a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/utils/ParseResponse.java
+++ b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/utils/ParseResponse.java
@@ -30,6 +30,7 @@
 
 import javax.annotation.Resource;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 import static org.jclouds.http.HttpUtils.releasePayload;
 
@@ -48,7 +49,7 @@
    public String apply(HttpResponse from) {
       Response response = null;
       try (InputStream gson = from.getPayload().openStream()) {
-         response = json.fromJson(gson, TypeLiteral.get(Response.class).getType());
+         response = json.fromJson(gson, StandardCharsets.UTF_8, TypeLiteral.get(Response.class).getType());
          return tryFindInfoPropertyValue(response);
       } catch (Exception e) {
          StringBuilder message = new StringBuilder();