Merge branch 'fix/2.x-allow404s' into 2.x

russcam · russcam · commit 1f6d87b270db · 2016-11-09T12:40:50.000+11:00
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Allow404/ApiEndpointsThatAllow404.cs b/src/CodeGeneration/ApiGenerator/Overrides/Allow404/ApiEndpointsThatAllow404.cs
@@ -15,8 +15,8 @@ public static class ApiEndpointsThatAllow404
 			"IndexTemplateExists",
 			"TypeExists",
 			"Exists",
-			//"Get"
-			//"Delete",
+			"Get",
+			"Delete",
 		};
 	}
 }
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json
@@ -39,7 +39,7 @@
         },
         "refresh": {
           "type" : "boolean",
-          "description" : "Refresh the index after performing the operation"
+          "description" : "Refresh the affected shards after performing the operation"
         },
         "routing": {
           "type" : "string",
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/DeleteByQuery/root.html b/src/CodeGeneration/ApiGenerator/RestSpecification/DeleteByQuery/root.html
diff --git a/src/CodeGeneration/ApiGenerator/last_downloaded_version.txt b/src/CodeGeneration/ApiGenerator/last_downloaded_version.txt
@@ -1 +1 @@
-v2.4.0
+v2.4.1
diff --git a/src/Elasticsearch.Net/Domain/Enums.Generated.cs b/src/Elasticsearch.Net/Domain/Enums.Generated.cs
@@ -7,7 +7,7 @@
 
 ///This file contains all the typed enums that the client rest api spec exposes.
 ///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-///Generated of commit v2.4.0
+///Generated of commit v2.4.1
 namespace Elasticsearch.Net
 {
 	
diff --git a/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs b/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs
@@ -6,8 +6,8 @@
 using System.Linq.Expressions;
 
 ///This file contains all the typed querystring parameters that are generated of the client spec.
-///This file is automatically generated from https://github.com/elastic/elasticsearch/tree/v2.4.0/rest-api-spec
-///Generated of commit v2.4.0
+///This file is automatically generated from https://github.com/elastic/elasticsearch/tree/v2.4.1/rest-api-spec
+///Generated of commit v2.4.1
 
 namespace Elasticsearch.Net
 {
diff --git a/src/Elasticsearch.Net/ElasticLowLevelClient.Generated.cs b/src/Elasticsearch.Net/ElasticLowLevelClient.Generated.cs
@@ -1535,7 +1535,7 @@ public Task<ElasticsearchResponse<T>> CountPercolateAsync<T>(string index, strin
 		///<param name="id">The document ID</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		public ElasticsearchResponse<T> Delete<T>(string index, string type, string id, Func<DeleteRequestParameters, DeleteRequestParameters> requestParameters = null)
-			where T : class => this.DoRequest<T>(DELETE, Url($"{index.NotNull("index")}/{type.NotNull("type")}/{id.NotNull("id")}"), null, _params(requestParameters));
+			where T : class => this.DoRequest<T>(DELETE, Url($"{index.NotNull("index")}/{type.NotNull("type")}/{id.NotNull("id")}"), null, _params(requestParameters, allow404: true));
 		
 		///<summary>Represents a DELETE on /{index}/{type}/{id} 
 		///<para></para>Returns: A task of ElasticsearchResponse&lt;T&gt; where the behaviour depends on the type of T:
@@ -1551,7 +1551,7 @@ public ElasticsearchResponse<T> Delete<T>(string index, string type, string id,
 		///<param name="id">The document ID</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		public Task<ElasticsearchResponse<T>> DeleteAsync<T>(string index, string type, string id, Func<DeleteRequestParameters, DeleteRequestParameters> requestParameters = null)
-			where T : class => this.DoRequestAsync<T>(DELETE, Url($"{index.NotNull("index")}/{type.NotNull("type")}/{id.NotNull("id")}"), null, _params(requestParameters));
+			where T : class => this.DoRequestAsync<T>(DELETE, Url($"{index.NotNull("index")}/{type.NotNull("type")}/{id.NotNull("id")}"), null, _params(requestParameters, allow404: true));
 		
 		///<summary>Represents a DELETE on /_scripts/{lang}/{id} 
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
@@ -1835,7 +1835,7 @@ public Task<ElasticsearchResponse<T>> FieldStatsAsync<T>(string index, PostData<
 		///<param name="id">The document ID</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		public ElasticsearchResponse<T> Get<T>(string index, string type, string id, Func<GetRequestParameters, GetRequestParameters> requestParameters = null)
-			where T : class => this.DoRequest<T>(GET, Url($"{index.NotNull("index")}/{type.NotNull("type")}/{id.NotNull("id")}"), null, _params(requestParameters));
+			where T : class => this.DoRequest<T>(GET, Url($"{index.NotNull("index")}/{type.NotNull("type")}/{id.NotNull("id")}"), null, _params(requestParameters, allow404: true));
 		
 		///<summary>Represents a GET on /{index}/{type}/{id} 
 		///<para></para>Returns: A task of ElasticsearchResponse&lt;T&gt; where the behaviour depends on the type of T:
@@ -1851,7 +1851,7 @@ public ElasticsearchResponse<T> Get<T>(string index, string type, string id, Fun
 		///<param name="id">The document ID</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		public Task<ElasticsearchResponse<T>> GetAsync<T>(string index, string type, string id, Func<GetRequestParameters, GetRequestParameters> requestParameters = null)
-			where T : class => this.DoRequestAsync<T>(GET, Url($"{index.NotNull("index")}/{type.NotNull("type")}/{id.NotNull("id")}"), null, _params(requestParameters));
+			where T : class => this.DoRequestAsync<T>(GET, Url($"{index.NotNull("index")}/{type.NotNull("type")}/{id.NotNull("id")}"), null, _params(requestParameters, allow404: true));
 		
 		///<summary>Represents a GET on /_scripts/{lang}/{id} 
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
diff --git a/src/Elasticsearch.Net/IElasticLowLevelClient.Generated.cs b/src/Elasticsearch.Net/IElasticLowLevelClient.Generated.cs
@@ -15,7 +15,7 @@ namespace Elasticsearch.Net
 	///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
 	///</pre>
 	///<pre>
-	///Generated of commit v2.4.0
+	///Generated of commit v2.4.1
 	///</pre>
 	///</summary>
 	public partial interface IElasticLowLevelClient
diff --git a/src/Nest/_Generated/_Descriptors.generated.cs b/src/Nest/_Generated/_Descriptors.generated.cs
@@ -7,7 +7,7 @@
 
 //This file lays the base for all the descriptors based on the query string parameters in the spec for IElasticClient.
 //This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-//Generated of commit v2.4.0
+//Generated of commit v2.4.1
 
 namespace Nest
 {
diff --git a/src/Nest/_Generated/_RequestParametersExtensions.Generated.cs b/src/Nest/_Generated/_RequestParametersExtensions.Generated.cs
@@ -9,7 +9,7 @@
 
 ///This file contains all the typed request parameters that are generated of the client spec.
 ///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-///Generated of commit v2.4.0
+///Generated of commit v2.4.1
 
 namespace Nest
 {
diff --git a/src/Nest/_Generated/_Requests.generated.cs b/src/Nest/_Generated/_Requests.generated.cs
@@ -9,7 +9,7 @@
 
 //This file contains all the typed querystring parameters that are generated of the client spec.
 //This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-//Generated of commit v2.4.0
+//Generated of commit v2.4.1
 
 namespace Nest
 {
diff --git a/src/Tests/Document/Single/Delete/DeleteApiTests.cs b/src/Tests/Document/Single/Delete/DeleteApiTests.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using Elasticsearch.Net;
+using FluentAssertions;
 using Nest;
 using Tests.Framework;
 using Tests.Framework.Integration;
@@ -35,5 +36,35 @@ protected override LazyResponses ClientUsage() => Calls(
 
 		protected override Func<DeleteDescriptor<Project>, IDeleteRequest> Fluent => null;
 		protected override DeleteRequest<Project> Initializer => new DeleteRequest<Project>(CallIsolatedValue);
+	}
+
+	public class DeleteNonExistentDocumentApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IDeleteResponse, IDeleteRequest, DeleteDescriptor<Project>, DeleteRequest<Project>>
+	{
+		public DeleteNonExistentDocumentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override LazyResponses ClientUsage() => Calls(
+			fluent: (client, f) => client.Delete<Project>(CallIsolatedValue),
+			fluentAsync: (client, f) => client.DeleteAsync<Project>(CallIsolatedValue),
+			request: (client, r) => client.Delete(r),
+			requestAsync: (client, r) => client.DeleteAsync(r)
+		);
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 404;
+		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
+		protected override string UrlPath => $"/project/project/{CallIsolatedValue}";
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override Func<DeleteDescriptor<Project>, IDeleteRequest> Fluent => null;
+		protected override DeleteRequest<Project> Initializer => new DeleteRequest<Project>(CallIsolatedValue);
+
+		protected override void ExpectResponse(IDeleteResponse response)
+		{
+			response.Found.Should().BeFalse();
+			response.Index.Should().Be("project");
+			response.Type.Should().Be("project");
+			response.Id.Should().Be(this.CallIsolatedValue);
+		}
 	}
 }
diff --git a/src/Tests/Document/Single/DocumentCrudTests.cs b/src/Tests/Document/Single/DocumentCrudTests.cs
@@ -81,5 +81,9 @@ [I] protected async Task DocumentIsUpdated() => await this.AssertOnGetAfterUpdat
 		[I] protected async Task DocumentIsDeleted() => await this.AssertOnGetAfterDelete(r =>
 			r.Found.Should().BeFalse()
 		);
+
+		[I] protected override async Task GetAfterDeleteIsValid() => await this.AssertOnGetAfterDelete(r =>
+			r.ShouldBeValid()
+		);
 	}
 }
diff --git a/src/Tests/Document/Single/Get/GetApiTests.cs b/src/Tests/Document/Single/Get/GetApiTests.cs
@@ -44,6 +44,40 @@ protected override void ExpectResponse(IGetResponse<Project> response)
 		}
 	}
 
+	public class GetNonExistentDocumentApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<Project>, IGetRequest, GetDescriptor<Project>, GetRequest<Project>>
+	{
+		protected string ProjectId => this.CallIsolatedValue;
+
+		protected string ProjectIdForUrl => Uri.EscapeDataString(this.ProjectId);
+
+		public GetNonExistentDocumentApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		protected override LazyResponses ClientUsage() => Calls(
+			fluent: (client, f) => client.Get<Project>(this.ProjectId, f),
+			fluentAsync: (client, f) => client.GetAsync<Project>(this.ProjectId, f),
+			request: (client, r) => client.Get<Project>(r),
+			requestAsync: (client, r) => client.GetAsync<Project>(r)
+		);
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 404;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override string UrlPath => $"/project/project/{ProjectIdForUrl}";
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override Func<GetDescriptor<Project>, IGetRequest> Fluent => null;
+
+		protected override GetRequest<Project> Initializer => new GetRequest<Project>(this.ProjectId);
+
+		protected override void ExpectResponse(IGetResponse<Project> response)
+		{
+			response.Found.Should().BeFalse();
+			response.Index.Should().Be("project");
+			response.Type.Should().Be("project");
+			response.Id.Should().Be(this.CallIsolatedValue);
+		}
+	}
+
 	public class GetApiParentTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetResponse<CommitActivity>, IGetRequest, GetDescriptor<CommitActivity>, GetRequest<CommitActivity>>
 	{
 		protected CommitActivity CommitActivity => CommitActivity.CommitActivities.First();
diff --git a/src/Tests/Reproduce/GithubIssue2306.cs b/src/Tests/Reproduce/GithubIssue2306.cs
@@ -0,0 +1,31 @@
+﻿using FluentAssertions;
+using Tests.Framework;
+using Tests.Framework.Integration;
+using Tests.Framework.MockData;
+using Xunit;
+
+namespace Tests.Reproduce
+{
+	public class GithubIssue2306 : IClusterFixture<ReadOnlyCluster>
+	{
+		private readonly ReadOnlyCluster _cluster;
+
+		public GithubIssue2306(ReadOnlyCluster cluster)
+		{
+			_cluster = cluster;
+		}
+
+		[I]
+		public void DeleteNonExistentDocumentReturnsNotFound()
+		{
+			var client = _cluster.Client;
+			var response = client.Delete<Project>("non-existent-id");
+
+			response.ShouldBeValid();
+			response.Found.Should().BeFalse();
+			response.Index.Should().Be("project");
+			response.Type.Should().Be("project");
+			response.Id.Should().Be("non-existent-id");
+		}
+	}
+}
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -570,6 +570,7 @@
     <Compile Include="Document\Multiple\ReindexOnServer\ReindexOnServerApiTests.cs" />
     <Compile Include="Document\Multiple\UpdateByQuery\UpdateByQueryApiTests.cs" />
     <Compile Include="Document\Multiple\UpdateByQuery\UpdateByQueryUrlTests.cs" />
+    <Compile Include="Reproduce\GithubIssue2306.cs" />
     <Compile Include="Reproduce\GithubIssue2309.cs" />
     <Compile Include="Framework\Extensions\UriExtensions.cs" />
     <Compile Include="Framework\Integration\CallUniqueValues.cs" />

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public static class ApiEndpointsThatAllow404`
`15`	`15`	`"IndexTemplateExists",`
`16`	`16`	`"TypeExists",`
`17`	`17`	`"Exists",`
`18`		`- //"Get"`
`19`		`- //"Delete",`
	`18`	`+ "Get",`
	`19`	`+ "Delete",`
`20`	`20`	`};`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`///This file contains all the typed enums that the client rest api spec exposes.`
`9`	`9`	`///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec`
`10`		`-///Generated of commit v2.4.0`
	`10`	`+///Generated of commit v2.4.1`
`11`	`11`	`namespace Elasticsearch.Net`
`12`	`12`	`{`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`using System.Linq.Expressions;`
`7`	`7`
`8`	`8`	`///This file contains all the typed querystring parameters that are generated of the client spec.`
`9`		`-///This file is automatically generated from https://github.com/elastic/elasticsearch/tree/v2.4.0/rest-api-spec`
`10`		`-///Generated of commit v2.4.0`
	`9`	`+///This file is automatically generated from https://github.com/elastic/elasticsearch/tree/v2.4.1/rest-api-spec`
	`10`	`+///Generated of commit v2.4.1`
`11`	`11`
`12`	`12`	`namespace Elasticsearch.Net`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`//This file lays the base for all the descriptors based on the query string parameters in the spec for IElasticClient.`
`9`	`9`	`//This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec`
`10`		`-//Generated of commit v2.4.0`
	`10`	`+//Generated of commit v2.4.1`
`11`	`11`
`12`	`12`	`namespace Nest`
`13`	`13`	`{`