Fix parsing of the fields parameter of bulk requests.

Author: jpountz

core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java

@@ -30,7 +30,6 @@
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -332,10 +331,16 @@ public BulkRequest add(BytesReference data, @Nullable String defaultIndex, @Null
                             } else if ("_retry_on_conflict".equals(currentFieldName) || "_retryOnConflict".equals(currentFieldName)) {
                                 retryOnConflict = parser.intValue();
                             } else if ("fields".equals(currentFieldName)) {
+                                throw new IllegalArgumentException("Action/metadata line [" + line + "] contains a simple value for parameter [fields] while a list is expected");
+                            } else {
+                                throw new IllegalArgumentException("Action/metadata line [" + line + "] contains an unknown parameter [" + currentFieldName + "]");
+                            }
+                        } else if (token == XContentParser.Token.START_ARRAY) {
+                            if ("fields".equals(currentFieldName)) {
                                 List<Object> values = parser.list();
                                 fields = values.toArray(new String[values.size()]);
                             } else {
-                                throw new IllegalArgumentException("Action/metadata line [" + line + "] contains an unknown parameter [" + currentFieldName + "]");
+                                throw new IllegalArgumentException("Malformed action/metadata line [" + line + "], expected a simple value for field [" + currentFieldName + "] but found [" + token + "]");
                             }
                         } else if (token != XContentParser.Token.VALUE_NULL) {
                             throw new IllegalArgumentException("Malformed action/metadata line [" + line + "], expected a simple value for field [" + currentFieldName + "] but found [" + token + "]");

rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json

@@ -38,7 +38,7 @@
           "description" : "Default document type for items which don't provide one"
         },
         "fields": {
-          "type": "string",
+          "type": "list",
           "description" : "Default comma-separated list of fields to return in the response for updates"
         }
       }