Merge pull request #476 from Mpdreamz/feature/generation-for-1.0

Feature/generation for 1.0

Author: Mpdreamz

src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj

@@ -77,6 +77,7 @@
     <Compile Include="Domain\ApiUrlPart.cs" />
     <Compile Include="Domain\CsharpMethod.cs" />
     <Compile Include="Extensions.cs" />
+    <Compile Include="Overrides\Descriptors\DeleteWarmerDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\PutTemplateDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\SearchDescriptorOverrides.cs" />
     <Compile Include="Program.cs" />

src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/DeleteWarmerDescriptorOverrides.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CodeGeneration.LowLevelClient.Overrides.Descriptors
+{
+	public class DeleteWarmerDescriptorOverrides : IDescriptorOverrides
+	{
+		public IEnumerable<string> SkipQueryStringParams
+		{
+			get
+			{
+				return new string[]
+				{
+					"name" 
+				};
+			}
+		}
+	}
+}

src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/SearchDescriptorOverrides.cs

@@ -33,7 +33,10 @@ public IEnumerable<string> SkipQueryStringParams
 					"version",
 					"q", //we dont support GET searches
 					"fields",
-					"sort"
+					"sort",
+					"_source",
+					"_source_include",
+					"_source_exclude"
 				};
 			}
 		}

src/Nest/DSL/CountDescriptor.cs

@@ -5,19 +5,17 @@
 namespace Nest
 {
 	[DescriptorFor("Count")]
-	[JsonConverter(typeof(CustomJsonConverter))]
 	public partial class CountDescriptor<T> 
 		:	QueryPathDescriptorBase<CountDescriptor<T>, T, CountQueryString>
-		, IActAsQuery
 		, IPathInfo<CountQueryString> 
-		, ICustomJson
 		where T : class
 	{
-		BaseQuery IActAsQuery._Query { get; set; }
+		[JsonProperty("query")]
+		internal BaseQuery _Query { get; set; }
 
 		public CountDescriptor<T> Query(Func<QueryDescriptor<T>, BaseQuery> querySelector)
 		{
-			((IActAsQuery)this)._Query = querySelector(new QueryDescriptor<T>());
+			this._Query = querySelector(new QueryDescriptor<T>());
 			return this;
 		}
 
@@ -31,10 +29,5 @@ ElasticsearchPathInfo<CountQueryString> IPathInfo<CountQueryString>.ToPathInfo(I
 
 			return pathInfo;
 		}
-
-		object ICustomJson.GetCustomJson()
-		{
-			return ((IActAsQuery) this)._Query;
-		}
 	}
 }

src/Nest/DSL/FluentDictionary.cs

@@ -1,7 +1,23 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Nest.Resolvers;
 
 namespace Nest
 {
+	public class FluentFieldList<T> : List<PropertyPathMarker> where T : class
+	{
+		public new FluentFieldList<T> Add(Expression<Func<T, object>> k)
+		{
+			base.Add(k);
+			return this;
+		}
+		public new FluentFieldList<T> Add(string k)
+		{
+			base.Add(k);
+			return this;
+		}
+	}
 	public class FluentDictionary<K, V> : Dictionary<K, V>
 	{
 		public FluentDictionary()

src/Nest/DSL/IQueryDescriptor.cs

@@ -41,9 +41,6 @@ interface IQueryDescriptor<T>
 		BaseQuery Terms(string field, params string[] terms);
 		BaseQuery TermsDescriptor(Action<TermsQueryDescriptor<T, object>> selector);
 		BaseQuery TermsDescriptor<K>(Action<TermsQueryDescriptor<T, K>> selector);
-		BaseQuery Text(Action<TextQueryDescriptor<T>> selector);
-		BaseQuery TextPhrase(Action<TextPhraseQueryDescriptor<T>> selector);
-		BaseQuery TextPhrasePrefix(Action<TextPhrasePrefixQueryDescriptor<T>> selector);
 		BaseQuery Match(Action<MatchQueryDescriptor<T>> selector);
 		BaseQuery MatchPhrase(Action<MatchPhraseQueryDescriptor<T>> selector);
 		BaseQuery MatchPhrasePrefix(Action<MatchPhrasePrefixQueryDescriptor<T>> selector);