Skip to content

Commit

Permalink
deprecated inline in various script/template API's as per elastic/ela…
Browse files Browse the repository at this point in the history
…sticsearch#25127, Source is now renamed to SourceQueryString
  • Loading branch information
Mpdreamz committed Nov 16, 2017
1 parent 9c691bb commit 6c2b1b1
Show file tree
Hide file tree
Showing 23 changed files with 5,799 additions and 5,674 deletions.
2 changes: 1 addition & 1 deletion build/scripts/Testing.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module Tests =
let p = ["xunit"; "-parallel"; "all"; "-xml"; "../.." @@ Paths.Output("TestResults-Desktop-Clr.xml")]
match (target, buildingOnTravis) with
| (_, true)
| (Commandline.MultiTarget.One, _) -> ["-framework"; "netcoreapp1.1"] |> List.append p
| (Commandline.MultiTarget.One, _) -> ["-framework"; "net46"] |> List.append p
| _ -> p

let dotnet = Tooling.BuildTooling("dotnet")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace Nest
var tMethod = t == "Time" ? ".ToTimeSpan()" : "";
var tSuffix = (t == "bool") ? " = true" : "";
var m = kv.Key.ToPascalCase();
var mm = (m != "Type" && m != "Index" && m != "Script") ? m : m + "QueryString";
var mm = (m != "Type" && m != "Index" && m != "Source" && m != "Script") ? m : m + "QueryString";
var typed = !method.DescriptorTypeGeneric.IsNullOrEmpty();
var g = typed ? method.DescriptorTypeGeneric.Replace("<", "").Replace(">", "") : "T";
var mml = mm.ToLowerInvariant();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace Nest
}
var original = kv.Value.OriginalQueryStringParamName;
var cased = kv.Key.ToPascalCase();
var mm = (cased != "Type" && cased != "Index" && cased != "Script") ? cased : cased + "QueryString";
var mm = (cased != "Type" && cased != "Index" && cased != "Source" && cased != "Script") ? cased : cased + "QueryString";
var fieldType = kv.Value.HighLevelType(kv.Key).Replace("params", "");
var isFields = (original.Contains("fields") || original.Contains("source_include") || original.Contains("source_exclude"));
if (isFields && fieldType.Contains("string"))
Expand Down
Loading

0 comments on commit 6c2b1b1

Please sign in to comment.