moved settings configuration to static class

Author: Mpdreamz

src/Elasticsearch.Net/Domain/ElasticsearchDynamicValue.cs

@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Dynamic;
 using System.Globalization;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -85,6 +86,11 @@ public ElasticsearchDynamicValue this[int i]
 				{
 					return new ElasticsearchDynamicValue(l[i]);
 				}
+				var d = this.Value as IDictionary<string, object>;
+				if (d != null && d.Count -1 >= i)
+				{
+					return new ElasticsearchDynamicValue(d.Values.ToList()[i]);
+				}
 				return new ElasticsearchDynamicValue(null);
 			}
 		}

src/Nest/Resolvers/Converters/DictionaryKeysAreNotPropertyNamesJsonConverter.cs

@@ -41,8 +41,10 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 					continue;
 				string key;
 				var pp = entry.Key as PropertyPathMarker;
-				var pn = entry.Key as PropertyNameMarker; 
-				if (pp != null)
+				var pn = entry.Key as PropertyNameMarker;
+				if (contract == null)
+					key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture);
+				else if (pp != null)
 					key = contract.Infer.PropertyPath(pp);
 				else if (pn != null)
 					key = contract.Infer.PropertyName(pn);

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

@@ -47,6 +47,7 @@ public void SearchShouldNotHaveBlips()
 			//Search once so that caches are sure to exist.
 			var timing = this.Search();
 
+
 			var timings = new List<Timings>();
 			for (var i = 0; i < 1000; i++)
 			{

src/Tests/Nest.Tests.Unit/BaseJsonTests.cs

@@ -16,9 +16,16 @@
 using System.Reflection;
 using System.IO;
 using Moq;
+using PUrify;
 
 namespace Nest.Tests.Unit
 {
+	public static class UnitTestDefaults
+	{
+		public static readonly Uri Uri = new Uri("http://localhost:9200").Purify();
+		public static readonly string DefaultIndex = "nest_test_data";
+	}
+
 	public class BaseJsonTests
 	{
 		protected readonly IConnectionSettingsValues _settings;
@@ -30,7 +37,7 @@ public class BaseJsonTests
 
 		public BaseJsonTests()
 		{
-			this._settings = new ConnectionSettings(Test.Default.Uri, Test.Default.DefaultIndex)
+			this._settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex)
 				.ExposeRawResponse();
 			this._connection = new InMemoryConnection(this._settings);
 			this._client = new ElasticClient(this._settings, this._connection);
@@ -45,7 +52,7 @@ protected void deb(string s)
 		}
 		protected ElasticClient GetFixedReturnClient(MethodBase methodInfo, string fileName)
 		{
-			var settings = new ConnectionSettings(Test.Default.Uri, "default-index")
+			var settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex)
 				.ExposeRawResponse();
 			var file = this.GetFileFromMethod(methodInfo, fileName);
 			var jsonResponse = File.ReadAllText(file);

src/Tests/Nest.Tests.Unit/Cluster/HealthTests.cs

@@ -19,7 +19,7 @@ public void ClusterHealth()
 		[Test]
 		public void ClusterHealthPerIndex()
 		{
-			var r = this._client.ClusterHealth(h=>h.Index(Test.Default.DefaultIndex).Level(LevelOptions.Cluster));
+			var r = this._client.ClusterHealth(h=>h.Index(UnitTestDefaults.DefaultIndex).Level(LevelOptions.Cluster));
 			var u = new Uri(r.ConnectionStatus.RequestUrl);
 			u.AbsolutePath.Should().StartWith("/_cluster/health/nest_test_data");
 			u.Query.Should().Contain("level=cluster");

src/Tests/Nest.Tests.Unit/Cluster/State/StateTests.cs

@@ -20,7 +20,7 @@ public void ClusterState()
 		[Test]
 		public void ClusterStatePerIndex()
 		{
-			var r = this._client.ClusterState(h=>h.Index(Test.Default.DefaultIndex).FlatSettings());
+			var r = this._client.ClusterState(h=>h.Index(UnitTestDefaults.DefaultIndex).FlatSettings());
 			var u = new Uri(r.ConnectionStatus.RequestUrl);
 			u.AbsolutePath.Should().StartWith("/_cluster/state");
 			u.Query.Should().Contain("flat_settings=true");

src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/BaseAnalysisTests.cs

@@ -11,7 +11,7 @@ public class BaseAnalysisTests : BaseJsonTests
 	{
 		public IIndicesOperationResponse Analysis(Func<AnalysisDescriptor, AnalysisDescriptor> analysisSelector)
 		{
-			var result = this._client.CreateIndex(Test.Default.DefaultIndex, c => c
+			var result = this._client.CreateIndex(UnitTestDefaults.DefaultIndex, c => c
 				.Analysis(analysisSelector)
 			);
 			result.Should().NotBeNull();

src/Tests/Nest.Tests.Unit/Internals/Inferno/HostNameWithPathTests.cs

@@ -11,8 +11,8 @@ namespace Nest.Tests.Unit.Internals.Inferno
 	[TestFixture]
 	public class HostNameWithPathTests
 	{
-		private static Uri HostName = new Uri(Test.Default.Uri, "/my-api-token");
-		private static ConnectionSettings Settings = new ConnectionSettings(HostName,Test.Default.DefaultIndex);
+		private static Uri HostName = new Uri(UnitTestDefaults.Uri, "/my-api-token");
+		private static ConnectionSettings Settings = new ConnectionSettings(HostName, UnitTestDefaults.DefaultIndex);
 
 		private static ElasticClient Client = new ElasticClient(Settings, new InMemoryConnection(Settings));
 

src/Tests/Nest.Tests.Unit/Internals/Inferno/MapTypeNamesTests.cs

@@ -22,7 +22,7 @@ public class MyCustomAtrributeName { }
 		[Test]
 		public void ResolveToSepcifiedTypeNames()
 		{
-			var clientSettings = new ConnectionSettings(Test.Default.Uri, "mydefaultindex")
+			var clientSettings = new ConnectionSettings(UnitTestDefaults.Uri, "mydefaultindex")
 				.MapDefaultTypeNames(p => p
 					.Add(typeof(Car), "automobile")
 					.Add(typeof(Person), "human")
@@ -61,7 +61,7 @@ public void ResolveToSepcifiedTypeNames()
 		[Test]
 		public void DefaultTypeNamesTakePrecedenceOverCustomTypeNameInferrer()
 		{
-			var clientSettings = new ConnectionSettings(Test.Default.Uri, "mydefaultindex")
+			var clientSettings = new ConnectionSettings(UnitTestDefaults.Uri, "mydefaultindex")
 				.MapDefaultTypeNames(p => p
 					.Add(typeof(Developer), "codemonkey")
 				)
@@ -81,7 +81,7 @@ public void DefaultTypeNamesTakePrecedenceOverCustomTypeNameInferrer()
 		[Test]
 		public void AttributeTypeNamesTakePrecedenceOverDefaultTypeNameInferrer()
 		{
-			var clientSettings = new ConnectionSettings(Test.Default.Uri, "mydefaultindex")
+			var clientSettings = new ConnectionSettings(UnitTestDefaults.Uri, "mydefaultindex")
 				.SetDefaultTypeNameInferrer(t => t.Name.ToUpperInvariant())
 				;
 
@@ -94,7 +94,7 @@ public void AttributeTypeNamesTakePrecedenceOverDefaultTypeNameInferrer()
 		[Test]
 		public void MapTypeIndicesTakesPrecedenceOverAttributeName()
 		{
-			var clientSettings = new ConnectionSettings(Test.Default.Uri,"mydefaultindex")
+			var clientSettings = new ConnectionSettings(UnitTestDefaults.Uri,"mydefaultindex")
 				.MapDefaultTypeNames(dt=>dt
 					.Add(typeof(MyCustomAtrributeName), "micutype")
 				)

src/Tests/Nest.Tests.Unit/Internals/Inferno/PropertyNameResolverTests.cs

@@ -65,7 +65,7 @@ internal class UserItemData
 		[Test]
 		public void TestUsesDefaultPropertyNameResolver()
 		{
-			var settings = new ConnectionSettings(Test.Default.Uri, Test.Default.DefaultIndex)
+			var settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex)
 				.SetDefaultPropertyNameInferrer(p => p);
 			var client = new ElasticClient(settings);
 			Expression<Func<UserItemData, object>> exp = (m) => m.UserLabels;

src/Tests/Nest.Tests.Unit/Internals/Serialize/SerializeTests.cs

@@ -52,21 +52,20 @@ public void ClassWithCollectionSerializes()
 		[Test]
 		public void SerializingSearchIsFastEnough()
 		{
-			//Do a serialize once, give json.net a fair fighting chance to cache
-			var data = this._client.Serializer.Serialize(new SearchDescriptor<ElasticsearchProject>()
-				   .From(0)
-				   .Size(10)
-				   .Fields(f => f.Id, f => f.Country)
-				   .SortAscending(f => f.LOC)
-				   .SortDescending(f => f.Country)
-				   .Query(q => q
-					   .MatchAll()
-				   )
-			   );
-            Assert.NotNull(data);
-			var sw = Stopwatch.StartNew();
+			//seraialize once to build cache
+			var randomDeserialize = this._client.Serializer.Serialize(new SearchDescriptor<ElasticsearchProject>()
+				.From(0)
+				.Size(10)
+				.Fields(f => f.Id, f => f.Country)
+				.SortAscending(f => f.LOC)
+				.SortDescending(f => f.Country)
+				.Query(q => q
+					.MatchAll()
+				)
+			);
 
-			data = this._client.Serializer.Serialize(new SearchDescriptor<ElasticsearchProject>()
+			var sw = Stopwatch.StartNew();
+			var data = this._client.Serializer.Serialize(new SearchDescriptor<ElasticsearchProject>()
 				.From(0)
 				.Size(10)
 				.Fields(f => f.Id, f => f.Country)
@@ -77,7 +76,7 @@ public void SerializingSearchIsFastEnough()
 				)
 			);
 			Assert.LessOrEqual(sw.ElapsedMilliseconds, 10);
-            Assert.NotNull(data);
+			Assert.NotNull(data);
 
 		}
 	}

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -284,11 +284,6 @@
     <Compile Include="Search\Suggest\PhraseSuggestTests.cs" />
     <Compile Include="Search\Suggest\TermSuggestTests.cs" />
     <Compile Include="Settings\UsePrettyResponseTests.cs" />
-    <Compile Include="Test.Designer.cs">
-      <DependentUpon>Test.settings</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
     <Compile Include="TestElasticClient.cs" />
     <Compile Include="Core\Update\UpdateTests.cs" />
   </ItemGroup>
@@ -850,10 +845,6 @@
     <None Include="Search\Sort\RandomScriptSort.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Test.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Test.Designer.cs</LastGenOutput>
-    </None>
     <None Include="Search\Query\Singles\Terms\TermsOfTypeInt.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/Tests/Nest.Tests.Unit/Settings/UsePrettyResponseTests.cs

@@ -12,7 +12,7 @@ public class UsePrettyResponses : BaseJsonTests
 		[Test]
 		public void UsePrettyResponsesShouldSurviveUrlModififications()
 		{
-			var settings = new ConnectionSettings(Test.Default.Uri, Test.Default.DefaultIndex)
+			var settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex)
 				.UsePrettyResponses();
 			var connection = new InMemoryConnection(settings);
 			var client = new ElasticClient(settings, connection);

src/Tests/Nest.Tests.Unit/Test.Designer.cs

@@ -11,7 +11,7 @@ public static class TestElasticClient
 		public static ConnectionSettings Settings;
 		static TestElasticClient()
 		{
-			Settings = new ConnectionSettings(Test.Default.Uri,"nest_test_data");
+			Settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex);
 
 			Client = new ElasticClient(Settings);
 		}