Bulk: allow null values in action/metadata line parameters

tlrx · tlrx · commit 02bd52aa42dd · 2015-06-03T12:33:10.000+02:00
Closes elastic#11458
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
@@ -330,7 +330,7 @@ public BulkRequest add(BytesReference data, @Nullable String defaultIndex, @Null
                             } else {
                                 throw new IllegalArgumentException("Action/metadata line [" + line + "] contains an unknown parameter [" + currentFieldName + "]");
                             }
-                        } else {
+                        } 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 + "]");
                         }
                     }
diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
@@ -169,4 +169,12 @@ public void testSimpleBulk9() throws Exception {
                     e.getMessage().contains("Malformed action/metadata line [3], expected START_OBJECT or END_OBJECT but found [START_ARRAY]"), equalTo(true));
         }
     }
+
+    @Test
+    public void testSimpleBulk10() throws Exception {
+        String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk10.json");
+        BulkRequest bulkRequest = new BulkRequest();
+        bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), null, null);
+        assertThat(bulkRequest.numberOfActions(), equalTo(9));
+    }
 }
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json
@@ -0,0 +1,15 @@
+{ "index"  : {"_index":null, "_type":"type1", "_id":"0"} }
+{ "field1" : "value1" }
+{ "index"  : {"_index":"test", "_type":null, "_id":"0"} }
+{ "field1" : "value1" }
+{ "index"  : {"_index":"test", "_type":"type1", "_id":null} }
+{ "field1" : "value1" }
+{ "delete"  : {"_index":null, "_type":"type1", "_id":"0"} }
+{ "delete"  : {"_index":"test", "_type":null, "_id":"0"} }
+{ "delete"  : {"_index":"test", "_type":"type1", "_id":null} }
+{ "create"  : {"_index":null, "_type":"type1", "_id":"0"} }
+{ "field1" : "value1" }
+{ "create"  : {"_index":"test", "_type":null, "_id":"0"} }
+{ "field1" : "value1" }
+{ "create"  : {"_index":"test", "_type":"type1", "_id":null} }
+{ "field1" : "value1" }

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ public BulkRequest add(BytesReference data, @Nullable String defaultIndex, @Null`
`330`	`330`	`} else {`
`331`	`331`	`throw new IllegalArgumentException("Action/metadata line [" + line + "] contains an unknown parameter [" + currentFieldName + "]");`
`332`	`332`	`}`
`333`		`- } else {`
	`333`	`+ } else if (token != XContentParser.Token.VALUE_NULL) {`
`334`	`334`	`throw new IllegalArgumentException("Malformed action/metadata line [" + line + "], expected a simple value for field [" + currentFieldName + "] but found [" + token + "]");`
`335`	`335`	`}`
`336`	`336`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,4 +169,12 @@ public void testSimpleBulk9() throws Exception {`
`169`	`169`	`e.getMessage().contains("Malformed action/metadata line [3], expected START_OBJECT or END_OBJECT but found [START_ARRAY]"), equalTo(true));`
`170`	`170`	`}`
`171`	`171`	`}`
	`172`	`+`
	`173`	`+ @Test`
	`174`	`+ public void testSimpleBulk10() throws Exception {`
	`175`	`+ String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk10.json");`
	`176`	`+ BulkRequest bulkRequest = new BulkRequest();`
	`177`	`+ bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), null, null);`
	`178`	`+ assertThat(bulkRequest.numberOfActions(), equalTo(9));`
	`179`	`+ }`
`172`	`180`	`}`