Merge branch 'master' of github.com:Mpdreamz/NEST

elastic · Jul 4, 2013 · aa6185e · aa6185e
2 parents 6bbab2f + af72fb1
commit aa6185e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 12 deletions.
diff --git a/src/Nest/ElasticClient-Aliases.cs b/src/Nest/ElasticClient-Aliases.cs
@@ -30,18 +30,22 @@ private string _createCommand(string command, AliasParams aliasParam)
 			return cmd;
 		}
 
-		/// <summary>
-		/// Get all the indices pointing to an alias
-		/// </summary>
-		public IEnumerable<string> GetIndicesPointingToAlias(string alias)
-		{
-			var path = this.PathResolver.CreateIndexPath(alias, "/_aliases");
-			var status = this.Connection.GetSync(path);
-			var r = this.Deserialize<Dictionary<string, object>>(status.Result);
-			return r == null ? Enumerable.Empty<string>() : r.Keys;
-		}
+	    /// <summary>
+	    /// Get all the indices pointing to an alias
+	    /// </summary>
+	    public IEnumerable<string> GetIndicesPointingToAlias(string alias)
+	    {
+	        var path = this.PathResolver.CreateIndexPath(alias, "/_aliases");
+	        var status = this.Connection.GetSync(path);
+	        if (!status.Success)
+	        {
+	            return Enumerable.Empty<string>();
+	        }
+	        var r = this.Deserialize<Dictionary<string, object>>(status.Result);
+	        return r == null ? Enumerable.Empty<string>() : r.Keys;
+	    }
 
-		/// <summary>
+	    /// <summary>
 		/// Repoint an alias from a set of old indices to a set of new indices in one operation
 		/// </summary>
 		public IIndicesOperationResponse Swap(string alias, IEnumerable<string> oldIndices, IEnumerable<string> newIndices)

diff --git a/src/Nest/ElasticClient-MultiGet.cs b/src/Nest/ElasticClient-MultiGet.cs
@@ -31,6 +31,24 @@ public IEnumerable<T> MultiGet<T>(IEnumerable<string> ids)
 			return this.MultiGet<T>(ids, this.PathResolver.CreateIndexTypePath(index, typeName));
 		}
 		/// <summary>
+		/// Gets multiple documents of T by id in the specified index
+		/// </summary>
+		public IEnumerable<T> MultiGet<T>(string index, IEnumerable<int> ids)
+			where T : class
+		{
+			return this.MultiGet<T>(index, ids.Select(i => Convert.ToString(i)));
+		}
+		/// <summary>
+		/// Gets multiple documents of T by id in the specified index
+		/// </summary>
+		public IEnumerable<T> MultiGet<T>(string index, IEnumerable<string> ids)
+			where T : class
+		{
+			var typeName = this.GetTypeNameFor<T>();
+
+			return this.MultiGet<T>(ids, this.PathResolver.CreateIndexTypePath(index, typeName));
+		}
+		/// <summary>
 		/// Gets multiple documents of T by id in the specified index and the specified typename for T
 		/// </summary>
 		public IEnumerable<T> MultiGet<T>(string index, string type, IEnumerable<int> ids)

diff --git a/src/Nest/Extensions/UriExtensions.cs b/src/Nest/Extensions/UriExtensions.cs
@@ -6,7 +6,9 @@ public static class UriExtensions
     {
         public static string ToUrlAndOverridePath(this Uri uri, string path)
         {
-            return string.Format("http://{0}:{1}{2}", uri.Host, uri.Port, path);
+            return uri.Scheme == Uri.UriSchemeHttps ?
+                string.Format("https://{0}{1}", uri.Host, path) :
+                string.Format("http://{0}:{1}{2}", uri.Host, uri.Port, path);
         }
     }
 }