Fix default indicesOptions in parsing RestoreSnapshotRequest

liketic · liketic · commit 9c657d7fb08e · 2017-11-16T11:02:01.000+08:00
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
@@ -403,7 +403,7 @@ public CreateSnapshotRequest source(Map<String, Object> source) {
                 includeGlobalState = nodeBooleanValue(entry.getValue(), "include_global_state");
             }
         }
-        indicesOptions(IndicesOptions.fromMap(source, IndicesOptions.strictExpandOpen()));
+        indicesOptions(IndicesOptions.fromMap(source, indicesOptions));
         return this;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
@@ -505,6 +505,7 @@ public Settings indexSettings() {
      * @param source restore definition
      * @return this request
      */
+    @SuppressWarnings("unchecked")
     public RestoreSnapshotRequest source(Map<String, Object> source) {
         for (Map.Entry<String, Object> entry : source.entrySet()) {
             String name = entry.getKey();
@@ -558,7 +559,7 @@ public RestoreSnapshotRequest source(Map<String, Object> source) {
                 }
             }
         }
-        indicesOptions(IndicesOptions.fromMap((Map<String, Object>) source, IndicesOptions.lenientExpandOpen()));
+        indicesOptions(IndicesOptions.fromMap(source, indicesOptions));
         return this;
     }
 
diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java b/core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java
@@ -37,7 +37,7 @@ public void testRestoreSnapshotRequestParsing() throws IOException {
 
         XContentBuilder builder = jsonBuilder().startObject();
 
-        if(randomBoolean()) {
+        if (randomBoolean()) {
             builder.field("indices", "foo,bar,baz");
         } else {
             builder.startArray("indices");
@@ -76,6 +76,10 @@ public void testRestoreSnapshotRequestParsing() throws IOException {
             builder.value("set3");
             builder.endArray();
         }
+        boolean includeIgnoreUnavailable = randomBoolean();
+        if (includeIgnoreUnavailable) {
+            builder.field("ignore_unavailable", indicesOptions.ignoreUnavailable());
+        }
 
         BytesReference bytes = builder.endObject().bytes();
 
@@ -89,15 +93,18 @@ public void testRestoreSnapshotRequestParsing() throws IOException {
         assertEquals(partial, request.partial());
         assertEquals("val1", request.settings().get("set1"));
         assertArrayEquals(request.ignoreIndexSettings(), new String[]{"set2", "set3"});
-
+        boolean expectedIgnoreAvailable = includeIgnoreUnavailable
+            ? indicesOptions.ignoreUnavailable()
+            : IndicesOptions.strictExpandOpen().ignoreUnavailable();
+        assertEquals(expectedIgnoreAvailable, request.indicesOptions().ignoreUnavailable());
     }
 
     public void testCreateSnapshotRequestParsing() throws IOException {
         CreateSnapshotRequest request = new CreateSnapshotRequest("test-repo", "test-snap");
 
         XContentBuilder builder = jsonBuilder().startObject();
 
-        if(randomBoolean()) {
+        if (randomBoolean()) {
             builder.field("indices", "foo,bar,baz");
         } else {
             builder.startArray("indices");
@@ -134,6 +141,10 @@ public void testCreateSnapshotRequestParsing() throws IOException {
             builder.value("set3");
             builder.endArray();
         }
+        boolean includeIgnoreUnavailable = randomBoolean();
+        if (includeIgnoreUnavailable) {
+            builder.field("ignore_unavailable", indicesOptions.ignoreUnavailable());
+        }
 
         BytesReference bytes = builder.endObject().bytes();
 
@@ -144,6 +155,10 @@ public void testCreateSnapshotRequestParsing() throws IOException {
         assertArrayEquals(request.indices(), new String[]{"foo", "bar", "baz"});
         assertEquals(partial, request.partial());
         assertEquals("val1", request.settings().get("set1"));
+        boolean expectedIgnoreAvailable = includeIgnoreUnavailable
+            ? indicesOptions.ignoreUnavailable()
+            : IndicesOptions.strictExpandOpen().ignoreUnavailable();
+        assertEquals(expectedIgnoreAvailable, request.indicesOptions().ignoreUnavailable());
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ public CreateSnapshotRequest source(Map<String, Object> source) {`
`403`	`403`	`includeGlobalState = nodeBooleanValue(entry.getValue(), "include_global_state");`
`404`	`404`	`}`
`405`	`405`	`}`
`406`		`- indicesOptions(IndicesOptions.fromMap(source, IndicesOptions.strictExpandOpen()));`
	`406`	`+ indicesOptions(IndicesOptions.fromMap(source, indicesOptions));`
`407`	`407`	`return this;`
`408`	`408`	`}`
`409`	`409`
Original file line number	Diff line number	Diff line change
`@@ -505,6 +505,7 @@ public Settings indexSettings() {`
`505`	`505`	`* @param source restore definition`
`506`	`506`	`* @return this request`
`507`	`507`	`*/`
	`508`	`+ @SuppressWarnings("unchecked")`
`508`	`509`	`public RestoreSnapshotRequest source(Map<String, Object> source) {`
`509`	`510`	`for (Map.Entry<String, Object> entry : source.entrySet()) {`
`510`	`511`	`String name = entry.getKey();`
`@@ -558,7 +559,7 @@ public RestoreSnapshotRequest source(Map<String, Object> source) {`
`558`	`559`	`}`
`559`	`560`	`}`
`560`	`561`	`}`
`561`		`- indicesOptions(IndicesOptions.fromMap((Map<String, Object>) source, IndicesOptions.lenientExpandOpen()));`
	`562`	`+ indicesOptions(IndicesOptions.fromMap(source, indicesOptions));`
`562`	`563`	`return this;`
`563`	`564`	`}`
`564`	`565`