Only parse string values, do not parse nulls

Author: tlrx

core/src/main/java/org/elasticsearch/ElasticsearchException.java

@@ -436,17 +436,17 @@ private static ElasticsearchException innerFromXContent(XContentParser parser) t
                             currentFieldName = parser.currentName();
                         } else {
                             List<String> values = headers.getOrDefault(currentFieldName, new ArrayList<>());
-                            if (token.isValue() || token == XContentParser.Token.VALUE_NULL) {
-                                values.add(parser.textOrNull());
+                            if (token == XContentParser.Token.VALUE_STRING) {
+                                values.add(parser.text());
                             } else if (token == XContentParser.Token.START_ARRAY) {
                                 while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
-                                    if (token.isValue() || token == XContentParser.Token.VALUE_NULL) {
-                                        values.add(parser.textOrNull());
+                                    if (token == XContentParser.Token.VALUE_STRING) {
+                                        values.add(parser.text());
                                     } else {
                                         parser.skipChildren();
                                     }
                                 }
-                            } else if (token == XContentParser.Token.START_ARRAY) {
+                            } else if (token == XContentParser.Token.START_OBJECT) {
                                 parser.skipChildren();
                             }
                             headers.put(currentFieldName, values);
@@ -463,8 +463,8 @@ private static ElasticsearchException innerFromXContent(XContentParser parser) t
                 // Arrays of objects are not supported yet and just ignored and skipped.
                 List<String> values = new ArrayList<>();
                 while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
-                    if (token.isValue() || token == XContentParser.Token.VALUE_NULL) {
-                        values.add(parser.textOrNull());
+                    if (token == XContentParser.Token.VALUE_STRING) {
+                        values.add(parser.text());
                     } else {
                         parser.skipChildren();
                     }

core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java

@@ -643,7 +643,7 @@ private static Tuple<Throwable, ElasticsearchException> randomExceptions() {
 
                     int nbValues = randomIntBetween(1, 3);
                     for (int j = 0; j < nbValues; j++) {
-                        values.add(frequently() ? randomAsciiOfLength(5) : null);
+                        values.add(frequently() ? randomAsciiOfLength(5) : "");
                     }
                     randomHeaders.put("header_" + i, values);
                 }
@@ -663,7 +663,7 @@ private static Tuple<Throwable, ElasticsearchException> randomExceptions() {
 
                     int nbValues = randomIntBetween(1, 3);
                     for (int j = 0; j < nbValues; j++) {
-                        values.add(frequently() ? randomAsciiOfLength(5) : null);
+                        values.add(frequently() ? randomAsciiOfLength(5) : "");
                     }
                     randomMetadata.put("es.metadata_" + i, values);
                 }
@@ -682,7 +682,7 @@ private static Tuple<Throwable, ElasticsearchException> randomExceptions() {
                     if (frequently()) {
                         resourceIds = new String[randomIntBetween(1, 3)];
                         for (int j = 0; j < resourceIds.length; j++) {
-                            resourceIds[j] = frequently() ? randomAsciiOfLength(5) : null;
+                            resourceIds[j] = frequently() ? randomAsciiOfLength(5) : "";
                         }
                     }
                     actualException.setResources(resourceType, resourceIds);