Merge branch 'develop' of github.com:elasticsearch/elasticsearch-net into develop

Author: Mpdreamz

src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/ApiEndpoint.cs

@@ -213,8 +213,8 @@ public IEnumerable<CsharpMethod> CsharpMethods
 							QueryStringParamName = queryStringParamName,
 							ReturnType = string.Format("ElasticsearchResponse<{0}>", defaultBoundGeneric),
 							ReturnTypeGeneric = null,
-							//CallTypeGeneric = defaultBoundGeneric == "DynamicDictionary" ? "Dictionary<string, object>" : defaultBoundGeneric,
-							CallTypeGeneric = defaultBoundGeneric,
+							CallTypeGeneric = defaultBoundGeneric == "DynamicDictionary" 
+								? "Dictionary<string, object>" : defaultBoundGeneric,
 							ReturnDescription = 
 								"ElasticsearchResponse&lt;T&gt; holding the response body deserialized as DynamicDictionary"
 								+ explanationOfDynamic,
@@ -234,8 +234,8 @@ public IEnumerable<CsharpMethod> CsharpMethods
 							QueryStringParamName = queryStringParamName,
 							ReturnType = string.Format("Task<ElasticsearchResponse<{0}>>", defaultBoundGeneric),
 							ReturnTypeGeneric = null,
-							//CallTypeGeneric = defaultBoundGeneric == "DynamicDictionary" ? "Dictionary<string, object>" : defaultBoundGeneric,
-							CallTypeGeneric = defaultBoundGeneric,
+							CallTypeGeneric = defaultBoundGeneric == "DynamicDictionary" 
+								? "Dictionary<string, object>" : defaultBoundGeneric,
 							ReturnDescription = 
 								"Task that'll return an ElasticsearchResponse&lt;T$gt; holding the response body deserialized as DynamicDictionary"
 								+ explanationOfDynamic,

src/Elasticsearch.Net/Domain/Response/ElasticsearchResponse.cs

@@ -22,7 +22,26 @@ namespace Elasticsearch.Net
 	// TODO: Make this class internal in 2.0
 	public static class ElasticsearchResponse
 	{
-		internal static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse from, TTo to)
+		public static Task<ElasticsearchResponse<DynamicDictionary>> WrapAsync(Task<ElasticsearchResponse<Dictionary<string, object>>> responseTask)
+		{
+			return responseTask
+				.ContinueWith(t =>
+				{
+					if (t.IsFaulted && t.Exception != null)
+					{
+						t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
+						return null; //won't be hit
+					}
+					return ToDynamicResponse(t.Result);
+				});
+		}
+
+		public static ElasticsearchResponse<DynamicDictionary> Wrap(ElasticsearchResponse<Dictionary<string, object>> response)
+		{
+			return ToDynamicResponse(response);
+		}
+
+		public static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse from, TTo to)
 		{
 			var response = new ElasticsearchResponse<TTo>(from.Settings)
 			{
@@ -43,6 +62,11 @@ internal static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse
 				tt.RequestInformation = response;
  			return response;
 		}
+
+		public static ElasticsearchResponse<DynamicDictionary> ToDynamicResponse(ElasticsearchResponse<Dictionary<string, object>> response)
+		{
+			return CloneFrom(response, response.Response != null ? DynamicDictionary.Create(response.Response) : null);
+		}
 	}
 
 	public class ElasticsearchResponse<T> : IElasticsearchResponse