Merge branch 'master' into feature/official-raw-client

Author: Mpdreamz

src/Nest.Tests.Integration/Search/SubClassSupport/SubClassSupportTests.cs

@@ -115,6 +115,7 @@ public void MultipleTypesUsingBaseClassMultiSearch()
 					.MatchAll()
 				)
 				.Search<MyBaseClass>("using_selector", s => s.AllIndices()
+          .Types("classas","classbs")
 					.ConcreteTypeSelector((o, h) => o.classBProperty != null ? typeof(ClassB) : typeof(ClassA))
 					.From(0)
 					.Size(100)

src/Nest/Domain/Connection/Connection.cs

@@ -75,13 +75,14 @@ public Task<ConnectionStatus> Post(string path, string data)
 		{
 			var r = this.CreateConnection(path, "POST");
 			return this.DoAsyncRequest(r, data);
-
 		}
+
 		public Task<ConnectionStatus> Put(string path, string data)
 		{
 			var r = this.CreateConnection(path, "PUT");
 			return this.DoAsyncRequest(r, data);
 		}
+
 		public Task<ConnectionStatus> Delete(string path, string data)
 		{
 			var r = this.CreateConnection(path, "DELETE");
@@ -146,14 +147,14 @@ private void SetBasicAuthorizationIfNeeded(HttpWebRequest myReq)
 			if (myUri != null && !string.IsNullOrEmpty(myUri.UserInfo))
 			{
 				myReq.Headers["Authorization"] =
-					"Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(myUri.UserInfo));
+				  "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(myUri.UserInfo));
 			}
 		}
 
 		protected virtual HttpWebRequest CreateWebRequest(string path, string method)
 		{
 			var url = this._CreateUriString(path);
-			
+
 			HttpWebRequest myReq = (HttpWebRequest)WebRequest.Create(url);
 			myReq.Accept = "application/json";
 			myReq.ContentType = "application/json";
@@ -205,19 +206,19 @@ protected virtual ConnectionStatus DoSynchronousRequest(HttpWebRequest request,
 					};
 					tracer.SetResult(cs);
 
-                    _ConnectionSettings.ConnectionStatusHandler(cs);
+					_ConnectionSettings.ConnectionStatusHandler(cs);
 
 					return cs;
 				}
 			}
-				
+
 		}
 
 		protected virtual Task<ConnectionStatus> DoAsyncRequest(HttpWebRequest request, string data = null)
 		{
 			var tcs = new TaskCompletionSource<ConnectionStatus>();
 			if (this._ConnectionSettings.MaximumAsyncConnections <= 0
-				|| this._ResourceLock == null)
+			  || this._ResourceLock == null)
 				return this.CreateIterateTask(request, data, tcs);
 
 			var timeout = this._ConnectionSettings.Timeout;
@@ -226,7 +227,7 @@ protected virtual Task<ConnectionStatus> DoAsyncRequest(HttpWebRequest request,
 				using (var tracer = new ConnectionStatusTracer(this._ConnectionSettings.TraceEnabled))
 				{
 					var m = "Could not start the operation before the timeout of " + timeout +
-						"ms completed while waiting for the semaphore";
+					  "ms completed while waiting for the semaphore";
 					var cs = new ConnectionStatus(this._ConnectionSettings, new TimeoutException(m));
 					tcs.SetResult(cs);
 					tracer.SetResult(cs);
@@ -338,9 +339,9 @@ public void Iterate(IEnumerable<Task> asyncIterator, TaskCompletionSource<Connec
 
 		private Uri _CreateUriString(string path)
 		{
-            var s = this._ConnectionSettings;
-			
-				
+			var s = this._ConnectionSettings;
+
+
 			if (s.QueryStringParameters != null)
 			{
 				var tempUri = new Uri(s.Uri, path);
@@ -349,7 +350,7 @@ private Uri _CreateUriString(string path)
 			}
 			path = this._ConnectionSettings.DontDoubleEscapePathDotsAndSlashes ? path : path.Replace("%2F", "%252F");
 			var uri = new Uri(s.Uri, path);
-		
+
 			//WebRequest.Create will replace %2F with / 
 			//this is a 'security feature'
 			//see http://mikehadlow.blogspot.nl/2011/08/how-to-stop-systemuri-un-escaping.html

src/Nest/Domain/Connection/IConnection.cs

@@ -1,26 +1,26 @@
 using System;
-using System.Threading.Tasks;
-
-namespace Nest
-{
-	public interface IConnection
-	{
-		Task<ConnectionStatus> Get(string path);
-		ConnectionStatus GetSync(string path);
-
-		Task<ConnectionStatus> Head(string path);
-		ConnectionStatus HeadSync(string path);
-
-		Task<ConnectionStatus> Post(string path, string data);
-		ConnectionStatus PostSync(string path, string data);
-
-		Task<ConnectionStatus> Put(string path, string data);
-		ConnectionStatus PutSync(string path, string data);
-
-	    Task<ConnectionStatus> Delete(string path);
-	    ConnectionStatus DeleteSync(string path);
-
-		Task<ConnectionStatus> Delete(string path, string data);
-		ConnectionStatus DeleteSync(string path, string data);
-	}
-}
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	public interface IConnection
+	{
+		Task<ConnectionStatus> Get(string path);
+		ConnectionStatus GetSync(string path);
+
+		Task<ConnectionStatus> Head(string path);
+		ConnectionStatus HeadSync(string path);
+
+		Task<ConnectionStatus> Post(string path, string data);
+		ConnectionStatus PostSync(string path, string data);
+
+		Task<ConnectionStatus> Put(string path, string data);
+		ConnectionStatus PutSync(string path, string data);
+
+		Task<ConnectionStatus> Delete(string path);
+		ConnectionStatus DeleteSync(string path);
+
+		Task<ConnectionStatus> Delete(string path, string data);
+		ConnectionStatus DeleteSync(string path, string data);
+	}
+}

src/Nest/ElasticClient-Aliases.cs

@@ -30,22 +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);
-	        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>
+		/// 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)

src/Nest/ElasticClient-MultiGet.cs

@@ -86,6 +86,9 @@ private ConnectionStatus _multiGetUsingDescriptor(Action<MultiGetDescriptor> mul
 			multiGetSelector(descriptor);
 			var data = @"{ ""docs"" : [";
 			var objects = new List<string>();
+
+			descriptor._GetOperations.ThrowIfEmpty("MultiGetFull called but no get operations were specified");
+
 			foreach (var g in descriptor._GetOperations)
 			{
 				string objectJson = "{";
@@ -130,6 +133,8 @@ private ConnectionStatus _multiGetUsingDescriptor(Action<MultiGetDescriptor> mul
 		private IEnumerable<T> MultiGet<T>(IEnumerable<string> ids, string path)
 			where T : class
 		{
+			ids.ThrowIfEmpty("ids");
+
 			var data = @"{{ ""ids"": {0} }}".F(this.Serialize(ids));
 			var response = this.Connection.PostSync(path + "_mget", data);