Simplify and generalize

virajs · Mar 3, 2014 · 61e4ffd · 61e4ffd
1 parent 91fdbfd
commit 61e4ffd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 21 deletions.
diff --git a/SolrNet/Commands/Replication/FetchIndexCommand.cs b/SolrNet/Commands/Replication/FetchIndexCommand.cs
@@ -15,7 +15,7 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace SolrNet.Commands.Replication
 {
@@ -26,33 +26,20 @@ namespace SolrNet.Commands.Replication
     /// </summary>
 	public class FetchIndexCommand : ReplicationCommand 
     {
-        /// <summary>
-        /// Forces the specified slave to fetch a copy of the index from its master. If you like, you 
-        /// can pass an extra attribute such as masterUrl or compression (or any other parameter which 
-        /// is specified in the <lst name="slave" /> tag) to do a one time replication from a master. 
-        /// This obviates the need for hard-coding the master in the slave. 
-        /// </summary>
-        public FetchIndexCommand()
-        {
-            AddParameter("command", "fetchindex");
-        }
-
         /// <summary>
         /// Forces the specified slave to fetch a copy of the index from its master. If you like, you 
         /// can pass an extra attribute such as masterUrl or compression (or any other parameter which 
         /// is specified in the <lst name="slave" /> tag) to do a one time replication from a master. 
         /// This obviates the need for hard-coding the master in the slave. 
         /// </summary>
         /// <param name="parameters">Optional parameters</param>
-        public FetchIndexCommand(Dictionary<string, string> parameters)
+        public FetchIndexCommand(IEnumerable<KeyValuePair<string, string>> parameters)
         {
-            if (parameters == null || parameters.Count == 0)
-                throw new ArgumentException("Parameters must be specified.", "parameters");
-
             AddParameter("command", "fetchindex");
 
-            foreach (string key in parameters.Keys)
-                AddParameter(key, parameters[key]);
+            if (parameters != null)
+                foreach (var kv in parameters)
+                    AddParameter(kv.Key, kv.Value);
         }
 	}
 }
diff --git a/SolrNet/ISolrCoreReplication.cs b/SolrNet/ISolrCoreReplication.cs
@@ -58,7 +58,7 @@ public interface ISolrCoreReplication
         /// This obviates the need for hard-coding the master in the slave. 
         /// </summary>
         /// <param name="parameters">Optional parameters</param>
-        ReplicationStatusResponse FetchIndex(Dictionary<string, string> parameters);
+        ReplicationStatusResponse FetchIndex(IEnumerable<KeyValuePair<string, string>> parameters);
 
         /// <summary>
         /// Aborts copying an index from a master to the specified slave.

diff --git a/SolrNet/Impl/SolrCoreReplication.cs b/SolrNet/Impl/SolrCoreReplication.cs
@@ -90,7 +90,7 @@ public ReplicationStatusResponse DisablePoll()
         /// </summary>
         public ReplicationStatusResponse FetchIndex()
         {
-            return SendAndParseStatus(new FetchIndexCommand());
+            return FetchIndex(null);
         }
 
         /// <summary>
@@ -100,7 +100,7 @@ public ReplicationStatusResponse FetchIndex()
         /// This obviates the need for hard-coding the master in the slave. 
         /// </summary>
         /// <param name="parameters">Optional parameters</param>
-        public ReplicationStatusResponse FetchIndex(Dictionary<string, string> parameters)
+        public ReplicationStatusResponse FetchIndex(IEnumerable<KeyValuePair<string, string>> parameters)
         {
             return SendAndParseStatus(new FetchIndexCommand(parameters));
         }