Merge branch '2.x' into fix/2.x-get-mappings

Author: russcam

docs/asciidoc/query-dsl/specialized/script/script-query-usage.asciidoc

@@ -18,7 +18,6 @@ See the Elasticsearch documentation on {ref_current}/query-dsl-script-query.html
 q
 .Script(sn => sn
     .Name("named_query")
-    .Boost(1.1)
     .Inline(_templateString)
     .Params(p => p.Add("param1", 50))
 )
@@ -31,7 +30,6 @@ q
 new ScriptQuery
 {
     Name = "named_query",
-    Boost = 1.1,
     Inline = _templateString,
     Params = new Dictionary<string, object>
     {
@@ -46,7 +44,6 @@ new ScriptQuery
 {
   "script": {
     "_name": "named_query",
-    "boost": 1.1,
     "script": {
       "inline": "doc['numberOfCommits'].value > param1",
       "params": {

src/Benchmarking/Properties/AssemblyInfo.cs

@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.3.0")]
-[assembly: AssemblyInformationalVersionAttribute("2.3.0")]
+[assembly: AssemblyFileVersionAttribute("2.3.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";

src/Benchmarking/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.0",
+  "version": "2.3.1",
   "compilationOptions": {
     "warningsAsErrors": false,
     "define": [ "LINQ", "NDESK_OPTIONS" ],

src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs

@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.3.0")]
-[assembly: AssemblyInformationalVersionAttribute("2.3.0")]
+[assembly: AssemblyFileVersionAttribute("2.3.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";

src/CodeGeneration/CodeGeneration.LowLevelClient/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.0",
+  "version": "2.3.1",
   "compilationOptions": {
     "warningsAsErrors": false,
     "emitEntryPoint": true

src/CodeGeneration/Nest.Litterateur/Properties/AssemblyInfo.cs

@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.3.0")]
-[assembly: AssemblyInformationalVersionAttribute("2.3.0")]
+[assembly: AssemblyFileVersionAttribute("2.3.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";

src/CodeGeneration/Nest.Litterateur/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.0",
+  "version": "2.3.1",
   "compilationOptions": {
     "warningsAsErrors": false,
     "emitEntryPoint": true

src/Elasticsearch.Net/Properties/AssemblyInfo.cs

@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.3.0")]
-[assembly: AssemblyInformationalVersionAttribute("2.3.0")]
+[assembly: AssemblyFileVersionAttribute("2.3.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";

src/Elasticsearch.Net/project.json

@@ -24,8 +24,8 @@
     "url": "https://github.com/elastic/elasticsearch-net"
   },
   "copyright": "2014-2016 Elasticsearch BV",
-  "version": "2.3.0",
-  "releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases/tag/2.3.0",
+  "version": "2.3.1",
+  "releaseNotes": "See https://github.com/elastic/elasticsearch-net/releases/tag/2.3.1",
   "compilationOptions": {
     "warningsAsErrors": false
   },

src/Nest/CommonAbstractions/Extensions/ExpressionExtensions.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Linq;
 using System.Linq.Expressions;
+using System.Text.RegularExpressions;
 
 namespace Nest
 {
@@ -44,5 +46,26 @@ protected override Expression VisitUnary(UnaryExpression node)
 				return node;
 			}
 		}
+
+		private static readonly Regex ExpressionRegex = new Regex(@"^\s*(.*)\s*\=\>\s*\1\.");
+		private static readonly Regex MemberExpressionRegex = new Regex(@"^[^\.]*\.");
+
+		internal static object ComparisonValueFromExpression(this Expression expression, out Type type)
+		{
+			type = null;
+
+			if (expression == null) return null;
+
+			var lambda = expression as LambdaExpression;
+			if (lambda == null)
+				return ExpressionRegex.Replace(expression.ToString(), string.Empty);
+
+			type = lambda.Parameters.FirstOrDefault()?.Type;
+
+			var memberExpression = lambda.Body as MemberExpression;
+			return memberExpression != null
+				? MemberExpressionRegex.Replace(memberExpression.ToString(), string.Empty)
+				: ExpressionRegex.Replace(expression.ToString(), string.Empty);
+		}
 	}
-}
+}