Support for supplying index settings on restore #1362

Author: robertlyson

src/Nest/DSL/RestoreDescriptor.cs

@@ -111,9 +111,10 @@ public RestoreDescriptor RenameReplacement(string renameReplacement)
 			return this;
 		}
 
-		public RestoreDescriptor IndexSettings(Func<UpdateSettingsDescriptor, UpdateSettingsDescriptor> settings)
+		public RestoreDescriptor IndexSettings(Func<UpdateSettingsDescriptor, UpdateSettingsDescriptor> settingsSelector)
 		{
-			Self.IndexSettings = settings(new UpdateSettingsDescriptor());
+			settingsSelector.ThrowIfNull("settings");
+			Self.IndexSettings = settingsSelector(new UpdateSettingsDescriptor());
 			return this;
 		}
 

src/Tests/Nest.Tests.Unit/Core/Repository/RestoreTests.cs

@@ -29,24 +29,26 @@ public void Restore()
 		}
 
 		[Test]
-		[ExpectedException]
+		[ExpectedException(typeof(ArgumentNullException))]
 		public void Null_IgnoreIndexSettings_ThorwException()
 		{
 			List<string> ignoreIndexSettings = null;
 			_client.Restore("repository", "snapshotName",
 				descriptor => descriptor
+					.Index("index")
 					.IgnoreIndexSettings(ignoreIndexSettings));
 		}
 
 		[Test]
-		[ExpectedException]
+		[ExpectedException(typeof(ArgumentNullException))]
 		public void Null_IndexSettings_ThorwException()
 		{
-			Func<UpdateSettingsDescriptor, UpdateSettingsDescriptor> settings = null;
+			Func<UpdateSettingsDescriptor, UpdateSettingsDescriptor> settingsSelector = null;
 
 			var restoreResponse = _client.Restore("repository", "snapshotName",
 				descriptor => descriptor
-					.IndexSettings(settings));
+					.Index("index")
+					.IndexSettings(settingsSelector));
 		}
 	}
 }