fix #389 search preference should be part of the querystring not body

Author: Mpdreamz

.gitignore

@@ -40,3 +40,5 @@ build/keys/keypair.snk
 !build/tools/*
 !build/tools/scriptcs/*
 /dep/Newtonsoft.Json.4.0.2
+
+/src/Nest.Tests.Unit/*.ncrunchproject

src/Nest.Tests.Integration/Reproduce/Reproduce389Tests.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Nest.Tests.MockData;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+using System.Diagnostics;
+using FluentAssertions;
+
+namespace Nest.Tests.Integration.Reproduce
+{
+	/// <summary>
+	/// tests to reproduce reported errors
+	/// </summary>
+	[TestFixture]
+	public class Reproduce389Tests : IntegrationTests
+	{
+
+		/// <summary>
+		///	https://github.com/Mpdreamz/NEST/issues/308
+		/// </summary>
+		[Test]
+		public void DoesPreferenceOnTheBodyThrowAnElasticsearchException()
+		{
+			var result = _client.Search<ElasticSearchProject>(op => op
+				.Query(q => 
+					q.Term(t => t.Name, "nest")
+				)
+				.ExecuteOnPrimary()
+				.Fields(
+					field => field.Name
+				)
+				.From(0)
+				.Size(2)
+			);
+			Assert.True(result.IsValid, result.ConnectionStatus.ToString());
+			StringAssert.Contains("preference=_primary", result.ConnectionStatus.RequestUrl);
+
+
+
+
+		}
+
+	}
+}

src/Nest.Tests.Unit/Nest.Tests.Unit.ncrunchproject

@@ -4,7 +4,7 @@
 namespace Nest.Tests.Unit.Search.SearchOptions
 {
 	[TestFixture]
-	public class SearchOptionTests
+	public class SearchOptionTests : BaseJsonTests
 	{
 		[Test]
 		public void TestFromSize()
@@ -76,9 +76,8 @@ public void TestPreference()
 				.From(0)
 				.Size(10)
 				.Preference("_primary");
-			var json = TestElasticClient.Serialize(s);
-			var expected = @"{ from: 0, size: 10, preference: ""_primary"" }";
-			Assert.True(json.JsonEquals(expected));
+			var result = this._client.Search(s);
+			StringAssert.Contains("preference=_primary", result.ConnectionStatus.RequestUrl);
 		}
 		[Test]
 		public void TestExecuteOnPrimary()
@@ -87,9 +86,8 @@ public void TestExecuteOnPrimary()
 				.From(0)
 				.Size(10)
 				.ExecuteOnPrimary();
-			var json = TestElasticClient.Serialize(s);
-			var expected = @"{ from: 0, size: 10, preference: ""_primary"" }";
-			Assert.True(json.JsonEquals(expected));
+			var result = this._client.Search(s);
+			StringAssert.Contains("preference=_primary", result.ConnectionStatus.RequestUrl);
 		}
 		[Test]
 		public void TestExecuteOnLocalShard()
@@ -98,9 +96,8 @@ public void TestExecuteOnLocalShard()
 				.From(0)
 				.Size(10)
 				.ExecuteOnLocalShard();
-			var json = TestElasticClient.Serialize(s);
-			var expected = @"{ from: 0, size: 10, preference: ""_local"" }";
-			Assert.True(json.JsonEquals(expected));
+			var result = this._client.Search(s);
+			StringAssert.Contains("preference=_local", result.ConnectionStatus.RequestUrl);
 		}
 		[Test]
 		public void TestExecuteOnNode()
@@ -109,10 +106,8 @@ public void TestExecuteOnNode()
 				.From(0)
 				.Size(10)
 				.ExecuteOnNode("somenode");
-			var json = TestElasticClient.Serialize(s);
-			var expected = @"{ from: 0, size: 10, 
-				preference: ""_only_node:somenode"" }";
-			Assert.True(json.JsonEquals(expected));
+			var result = this._client.Search(s);
+			StringAssert.Contains("preference=_only_node:somenode", result.ConnectionStatus.RequestUrl);
 		}
 		[Test]
 		public void TestFields()

src/Nest.Tests.Unit/Search/SearchOptions/SearchOptionTests.cs

@@ -23,7 +23,7 @@ public abstract class SearchDescriptorBase
 		internal bool _AllIndices { get; set; }
 		internal bool _AllTypes { get; set; }
 
-		[JsonProperty(PropertyName = "preference")]
+		//[JsonProperty(PropertyName = "preference")]
 		internal string _Preference { get; set; }
 
 		internal Func<dynamic, Hit<dynamic>, Type> _ConcreteTypeSelector;

src/Nest/DSL/SearchDescriptor.cs

@@ -464,7 +464,9 @@ private Dictionary<string, string> GetSearchParameters<T>(SearchDescriptor<T> de
 			if (!descriptor._Routing.IsNullOrEmpty())
 				dict.Add("routing", descriptor._Routing);
 			if (!descriptor._Scroll.IsNullOrEmpty())
-				dict.Add("scroll", descriptor._Scroll);
+				dict.Add("scroll", descriptor._Scroll);
+			if (!descriptor._Preference.IsNullOrEmpty())
+				dict.Add("preference", descriptor._Preference);
 			this.AddSearchType<T>(descriptor, dict);
 			return dict;
 		}