diff --git a/build/Clients.Common.targets b/build/Clients.Common.targets
index 4bc37013ea7..a8ad7e34695 100644
--- a/build/Clients.Common.targets
+++ b/build/Clients.Common.targets
@@ -28,6 +28,7 @@
false
$(DefineConstants);DOTNETCORE
embedded
+ full
$(BaseIntermediateOutputPath)\sl-$(MsBuildProjectName)-$(TargetFramework).json
https://raw.githubusercontent.com/elastic/elasticsearch-net
diff --git a/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj b/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj
index c7c1e65b021..684df9e0bf8 100644
--- a/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj
+++ b/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj
@@ -15,5 +15,6 @@
+
\ No newline at end of file
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Descriptors/RefreshDescriptorOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Descriptors/RefreshDescriptorOverrides.cs
new file mode 100644
index 00000000000..6ade475f9cd
--- /dev/null
+++ b/src/CodeGeneration/ApiGenerator/Overrides/Descriptors/RefreshDescriptorOverrides.cs
@@ -0,0 +1,23 @@
+using ApiGenerator.Domain;
+
+namespace ApiGenerator.Overrides.Descriptors
+{
+ public class RefreshDescriptorOverrides : DescriptorOverridesBase
+ {
+ public override CsharpMethod PatchMethod(CsharpMethod method)
+ {
+ method.Url.Params.Add("force", new NoopApiQueryParameters() { Type = "boolean" });
+ method.Url.Params.Add("operation_threading", new NoopApiQueryParameters());
+ return method;
+ }
+
+ private class NoopApiQueryParameters : ApiQueryParameters
+ {
+ public NoopApiQueryParameters()
+ {
+ this.Obsolete = "calling this is a noop";
+ this.FluentGenerator = (queryStringParamName, mm, original, setter) => $"public {queryStringParamName} {mm.ToPascalCase()}({CsharpType(mm)} {mm}) => this;";
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/exists_source.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/exists_source.json
index 3e561a21146..f14ec46891d 100644
--- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/exists_source.json
+++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/exists_source.json
@@ -1,6 +1,6 @@
{
"exists_source": {
- "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html",
+ "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/5.5/docs-get.html",
"methods": ["HEAD"],
"url": {
"path": "/{index}/{type}/{id}/_source",
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/field_caps.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/field_caps.json
index d993dc0545b..357d1571b33 100644
--- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/field_caps.json
+++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/field_caps.json
@@ -1,6 +1,6 @@
{
"field_caps": {
- "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/search-field-caps.html",
+ "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/5.5/search-field-caps.html",
"methods": ["GET", "POST"],
"url": {
"path": "/_field_caps",
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.refresh.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.refresh.json
index 2936b6f13b5..9efc272d40c 100644
--- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.refresh.json
+++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.refresh.json
@@ -25,14 +25,6 @@
"options" : ["open","closed","none","all"],
"default" : "open",
"description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both."
- },
- "force": {
- "type" : "boolean",
- "description" : "Force a refresh even if not required",
- "default": false
- },
- "operation_threading": {
- "description" : "TODO: ?"
}
}
},
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/msearch_template.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/msearch_template.json
index adbfb1a0cf2..83815136232 100644
--- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/msearch_template.json
+++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/msearch_template.json
@@ -24,6 +24,10 @@
"typed_keys": {
"type" : "boolean",
"description" : "Specify whether aggregation and suggester names should be prefixed by their respective types in the response"
+ },
+ "max_concurrent_searches" : {
+ "type" : "number",
+ "description" : "Controls the maximum number of concurrent searches the multi search api will execute"
}
}
},
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/remote.info.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/remote.info.json
index a90d4ff6984..f831fa9de6c 100644
--- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/remote.info.json
+++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/remote.info.json
@@ -1,6 +1,6 @@
{
"remote.info": {
- "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/remote-info.html",
+ "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/5.5/cluster-remote-info.html",
"methods": ["GET"],
"url": {
"path": "/_remote/info",
diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html
index 426ae45f7c0..7ead9df29d5 100644
--- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html
+++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html
@@ -8,19 +8,26 @@
+
+
+
+
+
+
+
-
-
+
+
-
+
- elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api at 5.4 · elastic/elasticsearch · GitHub
+ elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api at 5.5 · elastic/elasticsearch · GitHub
@@ -32,7 +39,7 @@
-
+
@@ -41,7 +48,7 @@
-
+
@@ -56,23 +63,23 @@
-
+
-
+
-
+
-
+
+
-
-
+
-
+
@@ -92,8 +99,9 @@
+