fix: handle arrays in error response (#2017)

* fix: handle arrays in error response

* Address feedback

Co-authored-by: Zeynep Karasozen <[email protected]>

Author: zeynepsu

aws-android-sdk-core/src/main/java/com/amazonaws/http/JsonErrorResponseHandler.java

@@ -190,7 +190,7 @@ public static JsonErrorResponse fromResponse(HttpResponse response) throws IOExc
             int statusCode = response.getStatusCode();
 
             // parse error body
-            Map<String, String> map = JsonUtils.jsonToMap(new BufferedReader(new InputStreamReader(
+            Map<String, String> map = JsonUtils.jsonToStringMapWithList(new BufferedReader(new InputStreamReader(
                     response.getContent(), StringUtils.UTF8)));
 
             /*

aws-android-sdk-core/src/main/java/com/amazonaws/util/json/JsonUtils.java

@@ -141,6 +141,87 @@ public static Map<String, String> jsonToMap(String json) {
         return jsonToMap(new StringReader(json));
     }
 
+    /**
+     * Convenient method to convert a JSON string to a map. Arrays
+     * are not discarded, they are read into the value as a string.
+     * Number and boolean are also stored as string.
+     * Nested arrays are not supported.
+     *
+     * @param in reader
+     * @return a non null, unmodifiable, string to string map
+     */
+    @SuppressWarnings("unchecked")
+    public static Map<String, String> jsonToStringMapWithList(Reader in) {
+        AwsJsonReader reader = getJsonReader(in);
+        try {
+            // in case it's empty
+            if (reader.peek() == null) {
+                return Collections.EMPTY_MAP;
+            }
+            Map<String, String> map = new HashMap<String, String>();
+            reader.beginObject();
+            while (reader.hasNext()) {
+                String key = reader.nextName();
+                if (reader.isContainer()) {
+                    if (AwsJsonToken.BEGIN_ARRAY.equals(reader.peek())) {
+                        final StringWriter out = new StringWriter();
+                        final AwsJsonWriter writer = getJsonWriter(out);
+                        reader.beginArray();
+                        writer.beginArray();
+                        try {
+                            while (!AwsJsonToken.END_ARRAY.equals(reader.peek())) {
+                                AwsJsonToken nextToken = reader.peek();
+                                if (AwsJsonToken.BEGIN_OBJECT.equals(nextToken)){
+                                    reader.beginObject();
+                                    writer.beginObject();
+                                } else if (AwsJsonToken.FIELD_NAME.equals(nextToken)){
+                                    String name = reader.nextName();
+                                    // do not write key if the value is a nested array
+                                    if (!AwsJsonToken.BEGIN_ARRAY.equals(reader.peek())) {
+                                        writer.name(name);
+                                    }
+                                } else if (AwsJsonToken.END_OBJECT.equals(nextToken)){
+                                    reader.endObject();
+                                    writer.endObject();
+                                } else if (AwsJsonToken.END_ARRAY.equals(nextToken)) {
+                                    reader.endArray();
+                                    writer.endArray();
+                                } else if (AwsJsonToken.VALUE_STRING.equals(nextToken)
+                                        || AwsJsonToken.VALUE_NUMBER.equals(nextToken)
+                                        || AwsJsonToken.VALUE_NULL.equals(nextToken)
+                                        || AwsJsonToken.VALUE_BOOLEAN.equals(nextToken)) {
+                                    String value = reader.nextString();
+                                    writer.value(value);
+                                }
+                                else {
+                                    // skip non string nodes inside the array
+                                    reader.skipValue();
+                                }
+                            }
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        reader.endArray();
+                        writer.endArray();
+                        writer.flush();
+                        writer.close();
+                        map.put(key, out.toString());
+                    } else {
+                        // skip non string or non array nodes
+                        reader.skipValue();
+                    }
+                } else {
+                    map.put(key, reader.nextString());
+                }
+            }
+            reader.endObject();
+            reader.close();
+            return Collections.unmodifiableMap(map);
+        } catch (IOException e) {
+            throw new AmazonClientException("Unable to parse JSON String.", e);
+        }
+    }
+
     /**
      * Encode a string to string map as a JSON string.
      *

aws-android-sdk-core/src/test/java/com/amazonaws/util/json/JsonUtilsTest.java

@@ -44,6 +44,24 @@ public class JsonUtilsTest {
             + "\"object\":{}"
             + "}";
 
+    private static final String JSON_STRING_WITH_ARRAYS = "{\"string\":\"string\","
+            + "\"long\":123,"
+            + "\"double\":123.45,"
+            + "\"null\":null,"
+            + "\"true\":true,"
+            + "\"false\":false,"
+            + "\"encoding\":\"Chloë\","
+            + "\"array\":[\"string\",123,123.45,null,true,false],"
+            + "\"array2\":[{\"key1\":\"string1\"},{\"key2\":\"string2\"}],"
+            + "\"array3\":[{\"key1\":123.45},{\"key2\":false}],"
+            + "\"array4\":[\"string\",123,[\"string\",123,123.45,null,true,false],123.45,null,true],"
+            + "\"array5\":[{\"key1\":\"string1\"},{\"key2\":[{\"key3\":\"string2\"}]},{\"key3\":\"string3\"}],"
+            + "\"array6\":[[],[[]]],"
+            + "\"array7\":[],"
+            + "\"array8\":[null],"
+            + "\"array9\":[\"A\",{\"B\":[[]]},\"C\",[[]],\"D\",null],"
+            + "\"object\":{}"
+            + "}";
     @Test
     public void testJsonToMap() {
         Map<String, String> map = JsonUtils.jsonToMap(JSON_STRING);
@@ -58,6 +76,29 @@ public void testJsonToMap() {
         assertNull("object is ignored", map.get("object"));
     }
 
+    @Test
+    public void testJsonToMapWithList() {
+        Map<String, String> map = JsonUtils.jsonToStringMapWithList(new StringReader(JSON_STRING_WITH_ARRAYS));
+        Map<String, String> actualMap = new HashMap<>();
+        actualMap.put("string", "string");
+        actualMap.put("long", "123");
+        actualMap.put("double", "123.45");
+        actualMap.put("null", null);
+        actualMap.put("true", "true");
+        actualMap.put("false", "false");
+        actualMap.put("encoding", "Chloë");
+        actualMap.put("array", "[\"string\",\"123\",\"123.45\",null,\"true\",\"false\"]");
+        actualMap.put("array2", "[{\"key1\":\"string1\"},{\"key2\":\"string2\"}]");
+        actualMap.put("array3", "[{\"key1\":\"123.45\"},{\"key2\":\"false\"}]");
+        actualMap.put("array4", "[\"string\",\"123\",\"123.45\",null,\"true\"]");
+        actualMap.put("array5", "[{\"key1\":\"string1\"},{},{\"key3\":\"string3\"}]");
+        actualMap.put("array6", "[]");
+        actualMap.put("array7", "[]");
+        actualMap.put("array8", "[null]");
+        actualMap.put("array9", "[\"A\",{},\"C\",\"D\",null]");
+        assertEquals(actualMap, map);
+    }
+
     @Test
     public void testMapToJson() {
         Map<String, String> source = new HashMap<String, String>();