fixed test failures mainly to do with _all no no longer magically be rewritten

Mpdreamz · Mpdreamz · commit 208351b85b1b · 2019-04-10T18:13:26.000+02:00
diff --git a/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ElasticClient-ClusterGetSettings.cs b/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ElasticClient-ClusterGetSettings.cs
@@ -42,13 +42,12 @@ public IClusterGetSettingsResponse ClusterGetSettings(IClusterGetSettingsRequest
 		public Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(
 			Func<ClusterGetSettingsDescriptor, IClusterGetSettingsRequest> selector = null,
 			CancellationToken ct = default
-		) =>
-			ClusterGetSettingsAsync(selector.InvokeOrDefault(new ClusterGetSettingsDescriptor()), ct);
+		) => ClusterGetSettingsAsync(selector.InvokeOrDefault(new ClusterGetSettingsDescriptor()), ct);
 
 		/// <inheritdoc cref="ClusterGetSettings(System.Func{Nest.ClusterGetSettingsDescriptor,Nest.IClusterGetSettingsRequest})"/>
-		public Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(IClusterGetSettingsRequest request,
+		public Task<IClusterGetSettingsResponse> ClusterGetSettingsAsync(
+			IClusterGetSettingsRequest request,
 			CancellationToken ct = default
-		) =>
-			DoRequestAsync<IClusterGetSettingsRequest, IClusterGetSettingsResponse, ClusterGetSettingsResponse>(request, request.RequestParameters, ct);
+		) => DoRequestAsync<IClusterGetSettingsRequest, IClusterGetSettingsResponse, ClusterGetSettingsResponse>(request, request.RequestParameters, ct);
 	}
 }
diff --git a/src/Nest/Cluster/TaskManagement/GetTask/ElasticClient-GetTask.cs b/src/Nest/Cluster/TaskManagement/GetTask/ElasticClient-GetTask.cs
@@ -11,11 +11,13 @@ public partial interface IElasticClient
 
 		IGetTaskResponse GetTask(IGetTaskRequest request);
 
-		Task<IGetTaskResponse> GetTaskAsync(TaskId id, Func<GetTaskDescriptor, IGetTaskRequest> selector = null,
+		Task<IGetTaskResponse> GetTaskAsync(
+			TaskId id, 
+			Func<GetTaskDescriptor, IGetTaskRequest> selector = null,
 			CancellationToken ct = default
 		);
 
-		Task<IGetTaskResponse> GetTaskAsync(IGetTaskRequest request, CancellationToken cancellationToken = default);
+		Task<IGetTaskResponse> GetTaskAsync(IGetTaskRequest request, CancellationToken ct = default);
 	}
 
 	public partial class ElasticClient
diff --git a/src/Nest/CommonAbstractions/Request/ApiUrls.cs b/src/Nest/CommonAbstractions/Request/ApiUrls.cs
@@ -59,7 +59,12 @@ private static LookupTuple FromRoute(string route)
 					if (t[0] == '@')
 					{
 						if (r.TryGetValue(parts[i], out var v))
-							sb.Append(Uri.EscapeDataString(v.GetString(s)));
+						{
+							var sv = v.GetString(s);
+							if (string.IsNullOrEmpty(sv))
+								throw new Exception($"{parts[i]} of type ({v.GetType().Name}) did not resolve to a value  on url {route}");
+							sb.Append(Uri.EscapeDataString(sv));
+						}
 						else throw new Exception($"No value provided for {parts[i]} on url {route}");
 
 						i++;
diff --git a/src/Nest/CommonAbstractions/Request/RouteValues.cs b/src/Nest/CommonAbstractions/Request/RouteValues.cs
@@ -6,9 +6,6 @@ namespace Nest
 {
 	public class RouteValues : Dictionary<string, IUrlParameter>
 	{
-		// TODO Remove
-		public string Id => throw new Exception("need to be refactored out");
-
 		private RouteValues Route(string name, IUrlParameter routeValue, bool required = true)
 		{
 			switch (routeValue) {
diff --git a/src/Nest/Document/Single/Index/IndexRequest.cs b/src/Nest/Document/Single/Index/IndexRequest.cs
@@ -22,7 +22,7 @@ void IProxyRequest.WriteJson(IElasticsearchSerializer sourceSerializer, Stream s
 		protected void DefaultRouting() => Self.RequestParameters.SetQueryString("routing", new Routing(() => Document));
 
 		internal static HttpMethod GetHttpMethod(IIndexRequest<TDocument> request) =>
-			request.Id?.StringOrLongValue != null || request.RouteValues.Id != null ? HttpMethod.PUT : HttpMethod.POST;
+			request.Id?.StringOrLongValue != null || request.RouteValues.ContainsKey("id") ? HttpMethod.PUT : HttpMethod.POST;
 
 		partial void DocumentFromPath(TDocument document) => Document = document;
 	}
diff --git a/src/Tests/Tests/ClientConcepts/Troubleshooting/LoggingWithOnRequestCompleted.doc.cs b/src/Tests/Tests/ClientConcepts/Troubleshooting/LoggingWithOnRequestCompleted.doc.cs
@@ -136,9 +136,9 @@ public async Task UsingOnRequestCompletedForLogging()
 			list.Count.Should().Be(4);
 			list.Should().BeEquivalentTo(new[] // <6> Assert the list contains the contents written in the delegate passed to `OnRequestCompleted`
 			{
-				@"POST http://localhost:9200/_search?typed_keys=true&scroll=2m {""sort"":[{""_doc"":{""order"":""asc""}}]}",
+				@"POST http://localhost:9200/_all/_search?typed_keys=true&scroll=2m {""sort"":[{""_doc"":{""order"":""asc""}}]}",
 				@"Status: 200",
-				@"POST http://localhost:9200/_search?typed_keys=true&scroll=10m {""sort"":[{""_doc"":{""order"":""asc""}}]}",
+				@"POST http://localhost:9200/_all/_search?typed_keys=true&scroll=10m {""sort"":[{""_doc"":{""order"":""asc""}}]}",
 				@"Status: 200"
 			});
 		}
@@ -213,9 +213,9 @@ public async Task OnRequestCompletedPerRequest()
 			list.Count.Should().Be(4);
 			list.Should().BeEquivalentTo(new[]
 			{
-				@"POST http://localhost:9200/_search?typed_keys=true&scroll=2m", // <3> Only the method and url for the first request is captured
+				@"POST http://localhost:9200/_all/_search?typed_keys=true&scroll=2m", // <3> Only the method and url for the first request is captured
 				@"Status: 200",
-				@"POST http://localhost:9200/_search?typed_keys=true&scroll=10m {""sort"":[{""_doc"":{""order"":""asc""}}]}", // <4> the body of the second request is captured
+				@"POST http://localhost:9200/_all/_search?typed_keys=true&scroll=10m {""sort"":[{""_doc"":{""order"":""asc""}}]}", // <4> the body of the second request is captured
 				@"Status: 200"
 			});
 		}
diff --git a/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs b/src/Tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs
@@ -15,6 +15,8 @@ public ClusterGetSettingsApiTests(ReadOnlyCluster cluster, EndpointUsage usage)
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override string UrlPath => "/_cluster/settings";
 
+		protected override ClusterGetSettingsRequest Initializer { get; } = new ClusterGetSettingsRequest();
+
 		protected override LazyResponses ClientUsage() => Calls(
 			(client, f) => client.ClusterGetSettings(),
 			(client, f) => client.ClusterGetSettingsAsync(),
diff --git a/src/Tests/Tests/Document/Single/Get/GetUrlTests.cs b/src/Tests/Tests/Document/Single/Get/GetUrlTests.cs
@@ -20,12 +20,6 @@ await GET("/project/_doc/1")
 					.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(1)))
 				;
 
-			//new GetRequest<Project>(null, null, 1) is still an error
-			await GET("/project/_doc/1")
-					.Fluent(c => c.Get<Project>(1, g => g.Index(null)))
-					.FluentAsync(c => c.GetAsync<Project>(1, g => g.Index(null)))
-				;
-
 			await GET("/testindex/_doc/1")
 					.Fluent(c => c.Get<Project>(1, g => g.Index("testindex")))
 					.Request(c => c.Get<Project>(new GetRequest<Project>("testindex", 1)))
diff --git a/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs b/src/Tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs
@@ -17,12 +17,17 @@ await PUT($"/index1%2Cindex2/_settings")
 					.Fluent(c => c.UpdateIndexSettings(indices, s => s))
 					.Request(c => c.UpdateIndexSettings(new UpdateIndexSettingsRequest(index)))
 					.FluentAsync(c => c.UpdateIndexSettingsAsync(indices, s => s))
-					.RequestAsync(c => c.UpdateIndexSettingsAsync(new UpdateIndexSettingsRequest(index)))
+					.RequestAsync(c => c.UpdateIndexSettingsAsync(new UpdateIndexSettingsRequest(index)));
+			
+			await PUT($"/_all/_settings")
+					.Fluent(c => c.UpdateIndexSettings(AllIndices, s => s))
+					.Request(c => c.UpdateIndexSettings(new UpdateIndexSettingsRequest(All)))
+					.FluentAsync(c => c.UpdateIndexSettingsAsync(AllIndices, s => s))
+					.RequestAsync(c => c.UpdateIndexSettingsAsync(new UpdateIndexSettingsRequest(All)))
 				;
+			
 			await PUT($"/_settings")
-					.Fluent(c => c.UpdateIndexSettings(AllIndices, s => s))
 					.Request(c => c.UpdateIndexSettings(new UpdateIndexSettingsRequest()))
-					.FluentAsync(c => c.UpdateIndexSettingsAsync(AllIndices, s => s))
 					.RequestAsync(c => c.UpdateIndexSettingsAsync(new UpdateIndexSettingsRequest()))
 				;
 		}
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusApiTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusApiTests.cs
@@ -19,7 +19,7 @@ public RecoveryStatusApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override RecoveryStatusRequest Initializer => new RecoveryStatusRequest(Infer.AllIndices);
-		protected override string UrlPath => "/_recovery";
+		protected override string UrlPath => "/_all/_recovery";
 
 		protected override LazyResponses ClientUsage() => Calls(
 			(client, f) => client.RecoveryStatus(Infer.AllIndices, f),
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusUrlTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesRecovery/RecoveryStatusUrlTests.cs
@@ -2,6 +2,7 @@
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
+using static Nest.Indices;
 
 namespace Tests.Indices.Monitoring.IndicesRecovery
 {
@@ -10,11 +11,16 @@ public class RecoveryStatusUrlTests
 		[U] public async Task Urls()
 		{
 			await UrlTester.GET($"/_recovery")
-					.Fluent(c => c.RecoveryStatus(Nest.Indices.All))
 					.Request(c => c.RecoveryStatus(new RecoveryStatusRequest()))
-					.FluentAsync(c => c.RecoveryStatusAsync(Nest.Indices.All))
 					.RequestAsync(c => c.RecoveryStatusAsync(new RecoveryStatusRequest()))
 				;
+			
+			await UrlTester.GET($"/_all/_recovery")
+					.Fluent(c => c.RecoveryStatus(All))
+					.Request(c => c.RecoveryStatus(new RecoveryStatusRequest(All)))
+					.FluentAsync(c => c.RecoveryStatusAsync(All))
+					.RequestAsync(c => c.RecoveryStatusAsync(new RecoveryStatusRequest(All)))
+				;
 
 			var index = "index1,index2";
 			await UrlTester.GET($"/index1%2Cindex2/_recovery")
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsApiTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsApiTests.cs
@@ -22,7 +22,7 @@ public SegmentsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clu
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override SegmentsRequest Initializer => new SegmentsRequest(Infer.AllIndices);
-		protected override string UrlPath => "/_segments";
+		protected override string UrlPath => "/_all/_segments";
 
 		protected override LazyResponses ClientUsage() => Calls(
 			(client, f) => client.Segments(Infer.AllIndices, f),
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsUrlTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesSegments/SegmentsUrlTests.cs
@@ -2,6 +2,7 @@
 using Elastic.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework;
+using static Nest.Indices;
 
 namespace Tests.Indices.Monitoring.IndicesSegments
 {
@@ -10,11 +11,16 @@ public class SegmentsUrlTests
 		[U] public async Task Urls()
 		{
 			await UrlTester.GET($"/_segments")
-					.Fluent(c => c.Segments(Nest.Indices.All))
 					.Request(c => c.Segments(new SegmentsRequest()))
-					.FluentAsync(c => c.SegmentsAsync(Nest.Indices.All))
 					.RequestAsync(c => c.SegmentsAsync(new SegmentsRequest()))
 				;
+			
+			await UrlTester.GET($"/_all/_segments")
+					.Fluent(c => c.Segments(All))
+					.Request(c => c.Segments(new SegmentsRequest(All)))
+					.FluentAsync(c => c.SegmentsAsync(All))
+					.RequestAsync(c => c.SegmentsAsync(new SegmentsRequest(All)))
+				;
 
 			var index = "index1,index2";
 			await UrlTester.GET($"/index1%2Cindex2/_segments")
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsApiTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsApiTests.cs
@@ -19,7 +19,7 @@ public IndicesStatsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 
 		protected override IndicesStatsRequest Initializer => new IndicesStatsRequest(Infer.AllIndices);
-		protected override string UrlPath => "/_stats";
+		protected override string UrlPath => "/_all/_stats";
 
 		protected override LazyResponses ClientUsage() => Calls(
 			(client, f) => client.IndicesStats(Infer.AllIndices, f),
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsUrlTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsUrlTests.cs
@@ -5,6 +5,7 @@
 using Tests.Domain;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
+using static Nest.Indices;
 
 namespace Tests.Indices.Monitoring.IndicesStats
 {
@@ -13,12 +14,16 @@ public class IndicesStatsUrlTests
 		[U] public async Task Urls()
 		{
 			await GET($"/_stats")
-					.Fluent(c => c.IndicesStats(Nest.Indices.All))
 					.Request(c => c.IndicesStats(new IndicesStatsRequest()))
-					.FluentAsync(c => c.IndicesStatsAsync(Nest.Indices.All))
 					.RequestAsync(c => c.IndicesStatsAsync(new IndicesStatsRequest()))
 				;
 
+			await GET($"/_all/_stats")
+					.Fluent(c => c.IndicesStats(All))
+					.Request(c => c.IndicesStats(new IndicesStatsRequest(All)))
+					.FluentAsync(c => c.IndicesStatsAsync(All))
+					.RequestAsync(c => c.IndicesStatsAsync(new IndicesStatsRequest(All)))
+				;
 			var index = "index1,index2";
 			await GET($"/index1%2Cindex2/_stats")
 					.Fluent(c => c.IndicesStats(index))
diff --git a/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsWithShardsInformationApiTests.cs b/src/Tests/Tests/Indices/Monitoring/IndicesStats/IndicesStatsWithShardsInformationApiTests.cs
@@ -27,7 +27,7 @@ public IndicesStatsWithShardsInformationApiTests(WritableCluster cluster, Endpoi
 			Level = Level.Shards
 		};
 
-		protected override string UrlPath => "/_stats?level=shards";
+		protected override string UrlPath => "/_all/_stats?level=shards";
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{
diff --git a/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs b/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs
@@ -20,7 +20,7 @@ public ClearCacheApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(c
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
 		protected override ClearCacheRequest Initializer => new ClearCacheRequest(AllIndices) { Request = true };
-		protected override string UrlPath => "/_cache/clear?request=true";
+		protected override string UrlPath => "/_all/_cache/clear?request=true";
 
 		protected override LazyResponses ClientUsage() => Calls(
 			(client, f) => client.ClearCache(AllIndices, f),
diff --git a/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs
@@ -3,17 +3,22 @@
 using Nest;
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
+using static Nest.Indices;
 
 namespace Tests.Indices.StatusManagement.ClearCache
 {
 	public class ClearCacheUrlTests
 	{
 		[U] public async Task Urls()
 		{
+			await POST($"/_all/_cache/clear")
+					.Fluent(c => c.ClearCache(All))
+					.Request(c => c.ClearCache(new ClearCacheRequest(All)))
+					.FluentAsync(c => c.ClearCacheAsync(All))
+					.RequestAsync(c => c.ClearCacheAsync(new ClearCacheRequest(All)))
+				;
 			await POST($"/_cache/clear")
-					.Fluent(c => c.ClearCache(Nest.Indices.All))
 					.Request(c => c.ClearCache(new ClearCacheRequest()))
-					.FluentAsync(c => c.ClearCacheAsync(Nest.Indices.All))
 					.RequestAsync(c => c.ClearCacheAsync(new ClearCacheRequest()))
 				;
 
diff --git a/src/Tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs
@@ -11,10 +11,15 @@ public class FlushUrlTests
 	{
 		[U] public async Task Urls()
 		{
-			await POST($"/_flush")
+			await POST($"/_all/_flush")
 					.Fluent(c => c.Flush(All))
-					.Request(c => c.Flush(new FlushRequest()))
+					.Request(c => c.Flush(new FlushRequest(All)))
 					.FluentAsync(c => c.FlushAsync(All))
+					.RequestAsync(c => c.FlushAsync(new FlushRequest(All)))
+				;
+			
+			await POST($"/_flush")
+					.Request(c => c.Flush(new FlushRequest()))
 					.RequestAsync(c => c.FlushAsync(new FlushRequest()))
 				;
 
diff --git a/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs
@@ -11,10 +11,15 @@ public class ForceMergeUrlTests
 	{
 		[U] public async Task Urls()
 		{
-			await POST($"/_forcemerge")
+			await POST($"/_all/_forcemerge")
 					.Fluent(c => c.ForceMerge(All))
-					.Request(c => c.ForceMerge(new ForceMergeRequest()))
+					.Request(c => c.ForceMerge(new ForceMergeRequest(All)))
 					.FluentAsync(c => c.ForceMergeAsync(All))
+					.RequestAsync(c => c.ForceMergeAsync(new ForceMergeRequest(All)))
+				;
+			
+			await POST($"/_forcemerge")
+					.Request(c => c.ForceMerge(new ForceMergeRequest()))
 					.RequestAsync(c => c.ForceMergeAsync(new ForceMergeRequest()))
 				;
 
diff --git a/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs
@@ -12,11 +12,16 @@ public class RefreshUrlTests
 		[U] public async Task Urls()
 		{
 			await POST($"/_refresh")
-					.Fluent(c => c.Refresh(All))
 					.Request(c => c.Refresh(new RefreshRequest()))
-					.FluentAsync(c => c.RefreshAsync(All))
 					.RequestAsync(c => c.RefreshAsync(new RefreshRequest()))
 				;
+			
+			await POST($"/_all/_refresh")
+					.Fluent(c => c.Refresh(All))
+					.Request(c => c.Refresh(new RefreshRequest(All)))
+					.FluentAsync(c => c.RefreshAsync(All))
+					.RequestAsync(c => c.RefreshAsync(new RefreshRequest(All)))
+				;
 
 			var index = "index1,index2";
 			await POST($"/index1%2Cindex2/_refresh")
diff --git a/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFlushUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/SyncedFlush/SyncedFlushUrlTests.cs
@@ -12,11 +12,16 @@ public class SyncedFlushUrlTests
 		[U] public async Task Urls()
 		{
 			await POST($"/_flush/synced")
-					.Fluent(c => c.SyncedFlush(All))
 					.Request(c => c.SyncedFlush(new SyncedFlushRequest()))
-					.FluentAsync(c => c.SyncedFlushAsync(All))
 					.RequestAsync(c => c.SyncedFlushAsync(new SyncedFlushRequest()))
 				;
+			
+			await POST($"/_all/_flush/synced")
+					.Fluent(c => c.SyncedFlush(All))
+					.Request(c => c.SyncedFlush(new SyncedFlushRequest(All)))
+					.FluentAsync(c => c.SyncedFlushAsync(All))
+					.RequestAsync(c => c.SyncedFlushAsync(new SyncedFlushRequest(All)))
+				;
 
 			var index = "index1,index2";
 			await POST($"/index1%2Cindex2/_flush/synced")
diff --git a/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeUrlTests.cs b/src/Tests/Tests/Indices/StatusManagement/Upgrade/UpgradeUrlTests.cs
@@ -11,10 +11,15 @@ public class UpgradeUrlTests
 	{
 		[U] public async Task Urls()
 		{
-			await POST($"/_upgrade")
+			await POST($"/_all/_upgrade")
 					.Fluent(c => c.Upgrade(All))
-					.Request(c => c.Upgrade(new UpgradeRequest()))
+					.Request(c => c.Upgrade(new UpgradeRequest(All)))
 					.FluentAsync(c => c.UpgradeAsync(All))
+					.RequestAsync(c => c.UpgradeAsync(new UpgradeRequest(All)))
+				;
+			
+			await POST($"/_upgrade")
+					.Request(c => c.Upgrade(new UpgradeRequest()))
 					.RequestAsync(c => c.UpgradeAsync(new UpgradeRequest()))
 				;
 
diff --git a/src/Tests/Tests/Search/Count/CountUrlTests.cs b/src/Tests/Tests/Search/Count/CountUrlTests.cs
@@ -53,21 +53,15 @@ await GET($"/{hardcoded}/_count")
 				;
 
 			await GET("/_count")
-					.Fluent(c => c.Count<Project>(s => s.AllIndices()))
 					.Request(c => c.Count<Project>(new CountRequest()))
-					.Request(c => c.Count<Project>(new CountRequest<Project>(Nest.Indices.All)))
-					.FluentAsync(c => c.CountAsync<Project>(s => s.AllIndices()))
-					.RequestAsync(c => c.CountAsync<Project>(new CountRequest<Project>(Nest.Indices.All)))
 					.RequestAsync(c => c.CountAsync<Project>(new CountRequest()))
 				;
 
-			await POST("/_count")
+			await POST("/_all/_count")
 					.Fluent(c => c.Count<Project>(s => s.AllIndices().Query(q => q.MatchAll())))
-					.Request(c => c.Count<Project>(new CountRequest() { Query = new MatchAllQuery() }))
 					.Request(c => c.Count<Project>(new CountRequest<Project>(Nest.Indices.All) { Query = new MatchAllQuery() }))
 					.FluentAsync(c => c.CountAsync<Project>(s => s.AllIndices().Query(q => q.MatchAll())))
 					.RequestAsync(c => c.CountAsync<Project>(new CountRequest<Project>(Nest.Indices.All) { Query = new MatchAllQuery() }))
-					.RequestAsync(c => c.CountAsync<Project>(new CountRequest() { Query = new MatchAllQuery() }))
 				;
 		}
 	}
diff --git a/src/Tests/Tests/Search/Search/SearchUrlTests.cs b/src/Tests/Tests/Search/Search/SearchUrlTests.cs
diff --git a/src/Tests/Tests/Search/SearchShards/SearchShardsUrlTests.cs b/src/Tests/Tests/Search/SearchShards/SearchShardsUrlTests.cs
diff --git a/src/Tests/Tests/Search/SearchTemplate/SearchTemplateUrlTests.cs b/src/Tests/Tests/Search/SearchTemplate/SearchTemplateUrlTests.cs
diff --git a/src/Tests/Tests/Search/Validate/ValidateQueryUrlTests.cs b/src/Tests/Tests/Search/Validate/ValidateQueryUrlTests.cs
diff --git a/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsApiTests.cs b/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsApiTests.cs
diff --git a/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsUrlTests.cs b/src/Tests/Tests/XPack/Watcher/WatcherStats/WatcherStatsUrlTests.cs

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,6 @@ namespace Nest`
`6`	`6`	`{`
`7`	`7`	`public class RouteValues : Dictionary<string, IUrlParameter>`
`8`	`8`	`{`
`9`		`- // TODO Remove`
`10`		`- public string Id => throw new Exception("need to be refactored out");`
`11`		`-`
`12`	`9`	`private RouteValues Route(string name, IUrlParameter routeValue, bool required = true)`
`13`	`10`	`{`
`14`	`11`	`switch (routeValue) {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ void IProxyRequest.WriteJson(IElasticsearchSerializer sourceSerializer, Stream s`
`22`	`22`	`protected void DefaultRouting() => Self.RequestParameters.SetQueryString("routing", new Routing(() => Document));`
`23`	`23`
`24`	`24`	`internal static HttpMethod GetHttpMethod(IIndexRequest<TDocument> request) =>`
`25`		`- request.Id?.StringOrLongValue != null \|\| request.RouteValues.Id != null ? HttpMethod.PUT : HttpMethod.POST;`
	`25`	`+ request.Id?.StringOrLongValue != null \|\| request.RouteValues.ContainsKey("id") ? HttpMethod.PUT : HttpMethod.POST;`
`26`	`26`
`27`	`27`	`partial void DocumentFromPath(TDocument document) => Document = document;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,9 @@ public async Task UsingOnRequestCompletedForLogging()`
`136`	`136`	`list.Count.Should().Be(4);`
`137`	`137`	list.Should().BeEquivalentTo(new[] // <6> Assert the list contains the contents written in the delegate passed to `OnRequestCompleted`
`138`	`138`	`{`
`139`		`- @"POST http://localhost:9200/_search?typed_keys=true&scroll=2m {""sort"":[{""_doc"":{""order"":""asc""}}]}",`
	`139`	`+ @"POST http://localhost:9200/_all/_search?typed_keys=true&scroll=2m {""sort"":[{""_doc"":{""order"":""asc""}}]}",`
`140`	`140`	`@"Status: 200",`
`141`		`- @"POST http://localhost:9200/_search?typed_keys=true&scroll=10m {""sort"":[{""_doc"":{""order"":""asc""}}]}",`
	`141`	`+ @"POST http://localhost:9200/_all/_search?typed_keys=true&scroll=10m {""sort"":[{""_doc"":{""order"":""asc""}}]}",`
`142`	`142`	`@"Status: 200"`
`143`	`143`	`});`
`144`	`144`	`}`
`@@ -213,9 +213,9 @@ public async Task OnRequestCompletedPerRequest()`
`213`	`213`	`list.Count.Should().Be(4);`
`214`	`214`	`list.Should().BeEquivalentTo(new[]`
`215`	`215`	`{`
`216`		`- @"POST http://localhost:9200/_search?typed_keys=true&scroll=2m", // <3> Only the method and url for the first request is captured`
	`216`	`+ @"POST http://localhost:9200/_all/_search?typed_keys=true&scroll=2m", // <3> Only the method and url for the first request is captured`
`217`	`217`	`@"Status: 200",`
`218`		`- @"POST http://localhost:9200/_search?typed_keys=true&scroll=10m {""sort"":[{""_doc"":{""order"":""asc""}}]}", // <4> the body of the second request is captured`
	`218`	`+ @"POST http://localhost:9200/_all/_search?typed_keys=true&scroll=10m {""sort"":[{""_doc"":{""order"":""asc""}}]}", // <4> the body of the second request is captured`
`219`	`219`	`@"Status: 200"`
`220`	`220`	`});`
`221`	`221`	`}`