abbendended .Warmup() idea, left tests in to proof that cache hit is once per appdomain and always fast afterwards

Author: Mpdreamz

dep/repositories.config

@@ -2,7 +2,6 @@
 <repositories>
   <repository path="..\src\CodeGeneration\CodeGeneration.LowLevelClient\packages.config" />
   <repository path="..\src\CodeGeneration\CodeGeneration.YamlTestsRunner\packages.config" />
-  <repository path="..\src\Connections\Elasticsearch.Net.Connection.HttpClient\packages.config" />
   <repository path="..\src\Connections\Elasticsearch.Net.Connection.Thrift\packages.config" />
   <repository path="..\src\Elasticsearch.Net\packages.config" />
   <repository path="..\src\Nest\packages.config" />

src/Nest/Domain/Connection/ConnectionSettings.cs

@@ -58,8 +58,8 @@ string IConnectionSettingsValues.DefaultIndex
 		{
 			get
 			{
-				if (this._defaultIndex.IsNullOrEmpty())
-					throw new NullReferenceException("No default index set on connection!");
+				//if (this._defaultIndex.IsNullOrEmpty())
+				//	throw new NullReferenceException("No default index set on connection!");
 				return this._defaultIndex;
 			}
 		}

src/Nest/Resolvers/ElasticContractResolver.cs

@@ -97,7 +97,6 @@ protected override IList<JsonProperty> CreateProperties(Type type, MemberSeriali
 			defaultProperties = PropertiesOf<IQuery>(type, memberSerialization, defaultProperties, lookup);
 			defaultProperties = PropertiesOf<IQueryContainer>(type, memberSerialization, defaultProperties, lookup);
 			defaultProperties = PropertiesOf<IRequest>(type, memberSerialization, defaultProperties, lookup);
-			//defaultProperties = PropertiesOf<ISearchRequest>(type, memberSerialization, defaultProperties, lookup);
 			defaultProperties = PropertiesOf<IFilter>(type, memberSerialization, defaultProperties, lookup, append: true);
 			defaultProperties = PropertiesOf<IFilterContainer>(type, memberSerialization, defaultProperties, lookup);
 			defaultProperties = PropertiesOf<IRandomScoreFunction>(type, memberSerialization, defaultProperties, lookup);

src/Nest/Resolvers/SettingsContractResolver.cs

@@ -27,7 +27,7 @@ public SettingsContractResolver(IContractResolver wrapped, IConnectionSettingsVa
 		{
 			this.ConnectionSettings = connectionSettings;
 			this.Infer = new ElasticInferrer(this.ConnectionSettings);
-			this._wrapped = wrapped;
+			this._wrapped = wrapped ?? new DefaultContractResolver();
 		}
 
 		public JsonContract ResolveContract(Type type)

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

@@ -9,31 +9,31 @@ public class HealthTests : IntegrationTests
 		[Test]
 		public void ClusterHealth()
 		{
-			var r = this._client.ClusterHealth(h=>h.Level(Level.Cluster));
+			var r = this.Client.ClusterHealth(h=>h.Level(Level.Cluster));
 			Assert.True(r.IsValid);
 		}
 		[Test]
 		public void ClusterHealthPerIndex()
 		{
-			var r = this._client.ClusterHealth(h=>h.Index(ElasticsearchConfiguration.DefaultIndex).Level(Level.Cluster));
+			var r = this.Client.ClusterHealth(h=>h.Index(ElasticsearchConfiguration.DefaultIndex).Level(Level.Cluster));
 			Assert.True(r.IsValid);
 		}
 		[Test]
 		public void IndexHealth()
 		{
-			var r = this._client.ClusterHealth(h=>h.Level(Level.Indices));
+			var r = this.Client.ClusterHealth(h=>h.Level(Level.Indices));
 			Assert.True(r.IsValid);
 		}
 		[Test]
 		public void ShardHealth()
 		{
-			var r = this._client.ClusterHealth(h=>h.Level(Level.Shards));
+			var r = this.Client.ClusterHealth(h=>h.Level(Level.Shards));
 			Assert.True(r.IsValid);
 		}
 		[Test]
 		public void DetailedHealth()
 		{
-			var r = this._client.ClusterHealth(h => h
+			var r = this.Client.ClusterHealth(h => h
 				.Level(Level.Shards)
 				.Timeout("30s")
 				.WaitForNodes("1")
@@ -44,7 +44,7 @@ public void DetailedHealth()
 		[Test]
 		public void DetailedHealthPerIndex()
 		{
-			var r = this._client.ClusterHealth(h => h
+			var r = this.Client.ClusterHealth(h => h
 				.Indices(ElasticsearchConfiguration.DefaultIndex)
 				.Level(Level.Shards)
 				.Timeout("30s")

src/Tests/Nest.Tests.Integration/ConnectionTests.cs

@@ -16,13 +16,13 @@ public class ConnectionTests : IntegrationTests
 		public void TestSettings()
 		{
 			Assert.AreEqual(ElasticsearchConfiguration.DefaultIndex, ElasticsearchConfiguration.DefaultIndex);
-			Assert.AreEqual(this._settings.MaximumAsyncConnections, Test.Default.MaximumAsyncConnections);
+			Assert.AreEqual(this.Settings.MaximumAsyncConnections, ElasticsearchConfiguration.MaxConnections);
 		}
 
 		[Test]
 		public void TestConnectSuccess()
 		{
-			var rootNodeInfo = _client.RootNodeInfo();
+			var rootNodeInfo = this.Client.RootNodeInfo();
 			Assert.True(rootNodeInfo.IsValid);
 			Assert.True(rootNodeInfo.ConnectionStatus.Success);
 		}
@@ -67,7 +67,7 @@ public void connect_to_unknown_hostname()
 		[Test]
 		public void TestConnectSuccessWithUri()
 		{
-			var settings = new ConnectionSettings(Test.Default.Uri, "index");
+			var settings = new ConnectionSettings(ElasticsearchConfiguration.CreateBaseUri(), "index");
 			var client = new ElasticClient(settings);
 			var result = client.RootNodeInfo();
 
@@ -78,12 +78,12 @@ public void TestConnectSuccessWithUri()
 		[Test]
 		public void ConnectUsingRawClient()
 		{
-			var result = this._client.Raw.Info();
+			var result = this.Client.Raw.Info();
 			Assert.IsTrue(result.Success);
 			StringAssert.EndsWith(":9200/?pretty=true", result.RequestUrl);
 
 
-			var resultWithQueryString = this._client.Raw.Info(qs => qs.AddQueryString("hello", "world"));
+			var resultWithQueryString = this.Client.Raw.Info(qs => qs.AddQueryString("hello", "world"));
 			Assert.IsTrue(resultWithQueryString.Success);
 
 			StringAssert.EndsWith(":9200/?hello=world&pretty=true", resultWithQueryString.RequestUrl);
@@ -92,7 +92,7 @@ public void ConnectUsingRawClient()
 		[Test]
 		public void ConnectUsingRawClientComplexCall()
 		{
-			var result = this._client.Raw.ClusterHealth(s => s
+			var result = this.Client.Raw.ClusterHealth(s => s
 				.Level(Level.Indices)
 				.Local(true)
 				.WaitForActiveShards(1)

src/Tests/Nest.Tests.Integration/Core/Bulk/BulkTests.cs

@@ -14,7 +14,7 @@ public class BulkTests : IntegrationTests
 		[Test]
 		public void Bulk()
 		{
-			var result = this._client.Bulk(b => b
+			var result = this.Client.Bulk(b => b
 				.Index<ElasticsearchProject>(i => i.Document(new ElasticsearchProject {Id = 2}))
 				.Delete<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 4 }))
 				.Create<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 123123 }))
@@ -32,22 +32,22 @@ public void Bulk()
 			deleteResponses.Should().HaveCount(1);
 			deleteResponses.First().Id.Should().BeEquivalentTo("4");
 			deleteResponses.First().Index.Should().BeEquivalentTo(ElasticsearchConfiguration.DefaultIndex);
-			deleteResponses.First().Type.Should().BeEquivalentTo(this._client.Infer.TypeName<ElasticsearchProject>());
+			deleteResponses.First().Type.Should().BeEquivalentTo(this.Client.Infer.TypeName<ElasticsearchProject>());
 
 			createResponses.Should().HaveCount(1);
 			createResponses.First().Id.Should().BeEquivalentTo("123123");
 			createResponses.First().Index.Should().BeEquivalentTo(ElasticsearchConfiguration.DefaultIndex);
-			createResponses.First().Type.Should().BeEquivalentTo(this._client.Infer.TypeName<ElasticsearchProject>());
+			createResponses.First().Type.Should().BeEquivalentTo(this.Client.Infer.TypeName<ElasticsearchProject>());
 
 			indexResponses.Should().HaveCount(1);
 			indexResponses.First().Id.Should().BeEquivalentTo("2");
 			indexResponses.First().Index.Should().BeEquivalentTo(ElasticsearchConfiguration.DefaultIndex);
-			indexResponses.First().Type.Should().BeEquivalentTo(this._client.Infer.TypeName<ElasticsearchProject>());
+			indexResponses.First().Type.Should().BeEquivalentTo(this.Client.Infer.TypeName<ElasticsearchProject>());
 		}
 		[Test]
 		public void DoubleCreateReturnsOneError()
 		{
-			var result = this._client.Bulk(b => b
+			var result = this.Client.Bulk(b => b
 				.Create<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 12315555 }))
 				.Create<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 12315555 }))
 			);
@@ -61,7 +61,7 @@ public void DoubleCreateReturnsOneError()
 		public void BulkWithFixedIndex()
 		{
 			var indexName = ElasticsearchConfiguration.NewUniqueIndexName();
-			var result = this._client.Bulk(b => b
+			var result = this.Client.Bulk(b => b
 				.FixedPath(indexName, "mytype")
 				.Index<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 2 }))
 				.Create<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 3 }))
@@ -97,7 +97,7 @@ public void BulkWithFixedIndexOveriddenIndividualy()
 			var indexName = ElasticsearchConfiguration.NewUniqueIndexName();
 			var indexName2 = ElasticsearchConfiguration.NewUniqueIndexName();
 			var indexName3 = ElasticsearchConfiguration.NewUniqueIndexName();
-			var result = this._client.Bulk(b => b
+			var result = this.Client.Bulk(b => b
 				.FixedPath(indexName, "mytype")
 				.Index<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 2 }).Index(indexName2))
 				.Create<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 3 }).Type("esproj"))
@@ -135,7 +135,7 @@ public void BulkAlternativeWayOfWriting()
 			foreach (var i in Enumerable.Range(3000, 1000))
 				descriptor.Index<ElasticsearchProject>(op => op.Document(new ElasticsearchProject {Id = i}));
 
-			var result = this._client.Bulk(d=>descriptor);
+			var result = this.Client.Bulk(d=>descriptor);
 			result.Should().NotBeNull();
 			result.IsValid.Should().BeTrue();
 			result.Errors.Should().BeFalse();

src/Tests/Nest.Tests.Integration/Core/ClearScroll/ClearScrollTests.cs

@@ -15,14 +15,14 @@ public class ClearScrollTests : IntegrationTests
 		[SkipVersion("1.1.0", "Scroll ids in request body broken in 1.1.0 and fixed in 1.1.1")]
 		public void ClearScroll()
 		{
-			var searchResults = this._client.Search<ElasticsearchProject>(s => s.Scroll("1m").SearchType(SearchType.Scan));
+			var searchResults = this.Client.Search<ElasticsearchProject>(s => s.Scroll("1m").SearchType(SearchType.Scan));
 			var validScrollId = searchResults.ScrollId;
 			validScrollId.Should().NotBeNullOrWhiteSpace();
 
-			var clearResponse = this._client.ClearScroll(cs => cs.ScrollId(validScrollId));
+			var clearResponse = this.Client.ClearScroll(cs => cs.ScrollId(validScrollId));
 			clearResponse.IsValid.Should().BeTrue();
 
-			var bogusClearResponse = this._client.ClearScroll(cs => cs.ScrollId("asdasdadasdasd"));
+			var bogusClearResponse = this.Client.ClearScroll(cs => cs.ScrollId("asdasdadasdasd"));
 			bogusClearResponse.IsValid.Should().BeFalse();
 		}