remove script file related API's and obsoleted Indexed on descriptors in favor of Id

Mpdreamz · russcam · commit 106ce73e9742 · 2017-12-14T16:27:35.000+11:00
diff --git a/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregationJsonConverter.cs b/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregationJsonConverter.cs
@@ -42,8 +42,6 @@ protected void ReadMetricProperties(IMetricAggregation metric, Dictionary<string
 				var scriptProps = JObject.FromObject(properties["script"]).Properties().ToDictionary(p => p.Name, p => p.Value);
 				if (scriptProps.ContainsKey("source") || scriptProps.ContainsKey("inline"))
 					metric.Script = properties["script"].ToObject<InlineScript>();
-				else if (scriptProps.ContainsKey("file"))
-					metric.Script = properties["script"].ToObject<FileScript>();
 				else if (scriptProps.ContainsKey("id"))
 					metric.Script = properties["id"].ToObject<IndexedScript>();
 			}
diff --git a/src/Nest/CommonOptions/Scripting/FileScript.cs b/src/Nest/CommonOptions/Scripting/FileScript.cs
diff --git a/src/Nest/CommonOptions/Scripting/ScriptBase.cs b/src/Nest/CommonOptions/Scripting/ScriptBase.cs
@@ -42,8 +42,9 @@ public TDescriptor Params(Func<FluentDictionary<string, object>, FluentDictionar
 
 	public class ScriptDescriptor : DescriptorBase<ScriptDescriptor, IDescriptor>
 	{
-		public FileScriptDescriptor File(string file) => new FileScriptDescriptor(file);
+		public IndexedScriptDescriptor Id(string id) => new IndexedScriptDescriptor(id);
 
+		[Obsolete("Indexed() sets a property named id, this is confusing and thats why we intent to remove this in NEST 7.x please use Id()")]
 		public IndexedScriptDescriptor Indexed(string id) => new IndexedScriptDescriptor(id);
 
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
diff --git a/src/Nest/CommonOptions/Scripting/ScriptJsonConverter.cs b/src/Nest/CommonOptions/Scripting/ScriptJsonConverter.cs
@@ -29,11 +29,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				var inline = dict["source"].ToString();
 				script = new InlineScript(inline);
 			}
-			if (dict.ContainsKey("file"))
-			{
-				var file = dict["file"].ToString();
-				script = new FileScript(file);
-			}
 			if (dict.ContainsKey("id"))
 			{
 				var id = dict["id"].ToString();
diff --git a/src/Nest/Ingest/Processors/ScriptProcessor.cs b/src/Nest/Ingest/Processors/ScriptProcessor.cs
@@ -20,12 +20,6 @@ public interface IScriptProcessor : IProcessor
 		[JsonProperty("lang")]
 		string Lang { get; set; }
 
-		/// <summary>
-		/// The script file to refer to
-		/// </summary>
-		[JsonProperty("file")]
-		string File { get; set; }
-
 		/// <summary>
 		/// The stored script id to refer to
 		/// </summary>
@@ -62,11 +56,6 @@ public class ScriptProcessor : ProcessorBase, IScriptProcessor
 		/// </summary>
 		public string Lang { get; set; }
 
-		/// <summary>
-		/// The script file to refer to
-		/// </summary>
-		public string File { get; set; }
-
 		/// <summary>
 		/// The stored script id to refer to
 		/// </summary>
@@ -93,7 +82,6 @@ public class ScriptProcessorDescriptor
 		protected override string Name => "script";
 
 		string IScriptProcessor.Lang { get; set; }
-		string IScriptProcessor.File{ get; set; }
 		string IScriptProcessor.Id{ get; set; }
 		string IScriptProcessor.Inline { get => Self.Source; set => Self.Source = value; }
 		string IScriptProcessor.Source { get; set; }
@@ -104,11 +92,6 @@ public class ScriptProcessorDescriptor
 		/// </summary>
 		public ScriptProcessorDescriptor Lang(string lang) => Assign(a => a.Lang = lang);
 
-		/// <summary>
-		/// The script file to refer to
-		/// </summary>
-		public ScriptProcessorDescriptor File(string file) => Assign(a => a.File = file);
-
 		/// <summary>
 		/// The stored script id to refer to
 		/// </summary>
diff --git a/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs b/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs
@@ -20,9 +20,6 @@ public interface IScriptQuery : IQuery
 		[JsonProperty("id")]
 		Id Id { get; set; }
 
-		[JsonProperty("file")]
-		string File { get; set; }
-
 		[JsonProperty("params")]
 		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<string, object>))]
 		Dictionary<string, object> Params { get; set; }
@@ -38,13 +35,12 @@ public class ScriptQuery : QueryBase, IScriptQuery
 		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		public string Inline { get => this.Source; set => this.Source = value; }
 		public Id Id { get; set; }
-		public string File { get; set; }
 		public Dictionary<string, object> Params { get; set; }
 		public string Lang { get; set; }
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.Script = this;
 		internal static bool IsConditionless(IScriptQuery q) =>
-			q.Source.IsNullOrEmpty() && q.Id == null && q.File.IsNullOrEmpty();
+			q.Source.IsNullOrEmpty() && q.Id == null;
 
 	}
 
@@ -56,7 +52,6 @@ public class ScriptQueryDescriptor<T>
 		string IScriptQuery.Inline { get => Self.Source; set => Self.Source = value; }
 		string IScriptQuery.Source { get; set; }
 		Id IScriptQuery.Id { get; set; }
-		string IScriptQuery.File { get; set; }
 		string IScriptQuery.Lang { get; set; }
 		Dictionary<string, object> IScriptQuery.Params { get; set; }
 
@@ -70,11 +65,6 @@ public class ScriptQueryDescriptor<T>
 		/// <summary> Id of an indexed script to execute </summary>
 		public ScriptQueryDescriptor<T> Id(string scriptId) => Assign(a => a.Id = scriptId);
 
-		/// <summary>
-		/// File name of a script to execute
-		/// </summary>
-		public ScriptQueryDescriptor<T> File(string scriptFile) => Assign(a => a.File = scriptFile);
-
 		/// <summary>
 		/// Scripts are compiled and cached for faster execution.
 		/// If the same script can be used, just with different parameters provided,
diff --git a/src/Nest/QueryDsl/Specialized/Script/ScriptQueryConverter.cs b/src/Nest/QueryDsl/Specialized/Script/ScriptQueryConverter.cs
@@ -24,7 +24,6 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			writer.WriteStartObject();
 			{
 				if (v.Id != null) writer.WriteProperty(serializer, "id", v.Id);
-				if (v.File != null) writer.WriteProperty(serializer, "file", v.File);
 				if (v.Source != null) writer.WriteProperty(serializer, "source", v.Source);
 				if (v.Lang != null) writer.WriteProperty(serializer, "lang", v.Lang);
 				if (v.Params != null) writer.WriteProperty(serializer, "params", v.Params);
@@ -55,9 +54,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 					case "id":
 						r.Id = p.Value.Value<string>();
 						break;
-					case "file":
-						r.File = p.Value.Value<string>();
-						break;
 					case "inline":
 					case "source":
 						r.Source = p.Value.Value<string>();
diff --git a/src/Nest/XPack/Watcher/Condition/FileScriptCondition.cs b/src/Nest/XPack/Watcher/Condition/FileScriptCondition.cs
diff --git a/src/Nest/XPack/Watcher/Condition/ScriptConditionBase.cs b/src/Nest/XPack/Watcher/Condition/ScriptConditionBase.cs
@@ -27,11 +27,14 @@ public abstract class ScriptConditionBase : ConditionBase, IScriptCondition
 
 	public class ScriptConditionDescriptor : DescriptorBase<ScriptConditionDescriptor, IDescriptor>
 	{
-		public FileScriptConditionDescriptor File(string file) => new FileScriptConditionDescriptor(file);
-
+		public IndexedScriptConditionDescriptor Id(string id) => new IndexedScriptConditionDescriptor(id);
+		[Obsolete("Indexed() sets a property named id, this is confusing and thats why we intent to remove this in NEST 7.x please use Id()")]
 		public IndexedScriptConditionDescriptor Indexed(string id) => new IndexedScriptConditionDescriptor(id);
 
+		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		public InlineScriptConditionDescriptor Inline(string script) => new InlineScriptConditionDescriptor(script);
+
+		public InlineScriptConditionDescriptor Source(string source) => new InlineScriptConditionDescriptor(source);
 	}
 
 	public abstract class ScriptConditionDescriptorBase<TDescriptor, TInterface>
@@ -77,11 +80,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				var inline = dict["source"].ToString();
 				scriptCondition = new InlineScriptCondition(inline);
 			}
-			if (dict.ContainsKey("file"))
-			{
-				var file = dict["file"].ToString();
-				scriptCondition = new FileScriptCondition(file);
-			}
 			if (dict.ContainsKey("id"))
 			{
 				var id = dict["id"].ToString();
diff --git a/src/Nest/XPack/Watcher/Transform/FileScriptTransform.cs b/src/Nest/XPack/Watcher/Transform/FileScriptTransform.cs
diff --git a/src/Nest/XPack/Watcher/Transform/ScriptTransformBase.cs b/src/Nest/XPack/Watcher/Transform/ScriptTransformBase.cs
@@ -44,11 +44,15 @@ public TDescriptor Params(Func<FluentDictionary<string, object>, FluentDictionar
 
 	public class ScriptTransformDescriptor : DescriptorBase<ScriptTransformDescriptor, IDescriptor>
 	{
-		public FileScriptTransformDescriptor File(string file) => new FileScriptTransformDescriptor(file);
+		public IndexedScriptTransformDescriptor Id(string id) => new IndexedScriptTransformDescriptor(id);
 
+		[Obsolete("Indexed() sets a property named id, this is confusing and thats why we intent to remove this in NEST 7.x please use Id()")]
 		public IndexedScriptTransformDescriptor Indexed(string id) => new IndexedScriptTransformDescriptor(id);
 
+		[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]
 		public InlineScriptTransformDescriptor Inline(string script) => new InlineScriptTransformDescriptor(script);
+
+		public InlineScriptTransformDescriptor Source(string source) => new InlineScriptTransformDescriptor(source);
 	}
 
 	internal class ScriptTransformJsonConverter : JsonConverter
@@ -77,11 +81,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				var inline = dict["source"].ToString();
 				scriptTransform = new InlineScriptTransform(inline);
 			}
-			if (dict.ContainsKey("file"))
-			{
-				var file = dict["file"].ToString();
-				scriptTransform = new FileScriptTransform(file);
-			}
 			if (dict.ContainsKey("id"))
 			{
 				var id = dict["id"].ToString();
diff --git a/src/Tests/QueryDsl/Compound/FunctionScore/FunctionScoreQueryUsageTests.cs b/src/Tests/QueryDsl/Compound/FunctionScore/FunctionScoreQueryUsageTests.cs
@@ -73,7 +73,7 @@ public FunctionScoreQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 					new {
 						script_score = new {
 							script = new {
-								file = "x"
+								id = "x"
 							}
 						}
 					}
@@ -109,7 +109,7 @@ public FunctionScoreQueryUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba
 				new RandomScoreFunction { Seed = 1337, Field = "_seq_no" },
 				new RandomScoreFunction { Seed = "randomstring", Field = "_seq_no" },
 				new WeightFunction { Weight = 1.0},
-				new ScriptScoreFunction { Script = new ScriptQuery { File = "x" } }
+				new ScriptScoreFunction { Script = new ScriptQuery { Id = "x" } }
 			}
 		};
 
@@ -130,7 +130,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 					.RandomScore(r=>r.Seed(1337).Field("_seq_no"))
 					.RandomScore(r=>r.Seed("randomstring").Field("_seq_no"))
 					.Weight(1.0)
-					.ScriptScore(ss => ss.Script(s => s.File("x")))
+					.ScriptScore(ss => ss.Script(s => s.Id("x")))
 				)
 			);
 
diff --git a/src/Tests/QueryDsl/Specialized/Script/ScriptQueryUsageTests.cs b/src/Tests/QueryDsl/Specialized/Script/ScriptQueryUsageTests.cs
@@ -61,12 +61,10 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 			q => {
 				q.Source = "";
 				q.Id = null;
-				q.File = "";
 			},
 			q => {
 				q.Source = null;
 				q.Id = null;
-				q.File = null;
 			}
 		};
 	}
diff --git a/src/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchApiTests.cs b/src/Tests/XPack/Watcher/ExecuteWatch/ExecuteWatchApiTests.cs
@@ -45,7 +45,7 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 					)
 					.Condition(c => c
 						.Script(ss => ss
-							.Inline("ctx.payload.hits.total > 1")
+							.Source("ctx.payload.hits.total > 1")
 						)
 					)
 					.Trigger(t => t
@@ -316,7 +316,7 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 					)
 					.Condition(c => c
 						.Script(ss => ss
-							.Inline("ctx.payload.hits.total > 1")
+							.Source("ctx.payload.hits.total > 1")
 						)
 					)
 					.Trigger(t => t
@@ -518,7 +518,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				)
 				.Condition(c => c
 					.Script(ss => ss
-						.Inline("ctx.payload.hits.total > 1")
+						.Source("ctx.payload.hits.total > 1")
 					)
 				)
 				.Trigger(t => t
diff --git a/src/Tests/XPack/Watcher/GetWatch/GetWatchApiTests.cs b/src/Tests/XPack/Watcher/GetWatch/GetWatchApiTests.cs
@@ -55,7 +55,7 @@ public static void PutWatch(IElasticClient client, CallUniqueValues values)
 							)
 							.Transform(ctt => ctt
 								.Script(st => st
-									.Inline("return [ 'time' : ctx.trigger.scheduled_time ]")
+									.Source("return [ 'time' : ctx.trigger.scheduled_time ]")
 								)
 							)
 						)
diff --git a/src/Tests/XPack/Watcher/PutWatch/PutWatchApiTests.cs b/src/Tests/XPack/Watcher/PutWatch/PutWatchApiTests.cs
@@ -403,7 +403,7 @@ protected override LazyResponses ClientUsage() => Calls(
 					)
 					.Transform(ctt => ctt
 						.Script(st => st
-							.Inline("return [ 'time' : ctx.trigger.scheduled_time ]")
+							.Source("return [ 'time' : ctx.trigger.scheduled_time ]")
 						)
 					)
 				)

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@ protected void ReadMetricProperties(IMetricAggregation metric, Dictionary<string`
`42`	`42`	`var scriptProps = JObject.FromObject(properties["script"]).Properties().ToDictionary(p => p.Name, p => p.Value);`
`43`	`43`	`if (scriptProps.ContainsKey("source") \|\| scriptProps.ContainsKey("inline"))`
`44`	`44`	`metric.Script = properties["script"].ToObject<InlineScript>();`
`45`		`- else if (scriptProps.ContainsKey("file"))`
`46`		`- metric.Script = properties["script"].ToObject<FileScript>();`
`47`	`45`	`else if (scriptProps.ContainsKey("id"))`
`48`	`46`	`metric.Script = properties["id"].ToObject<IndexedScript>();`
`49`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,9 @@ public TDescriptor Params(Func<FluentDictionary<string, object>, FluentDictionar`
`42`	`42`
`43`	`43`	`public class ScriptDescriptor : DescriptorBase<ScriptDescriptor, IDescriptor>`
`44`	`44`	`{`
`45`		`- public FileScriptDescriptor File(string file) => new FileScriptDescriptor(file);`
	`45`	`+ public IndexedScriptDescriptor Id(string id) => new IndexedScriptDescriptor(id);`
`46`	`46`
	`47`	`+ [Obsolete("Indexed() sets a property named id, this is confusing and thats why we intent to remove this in NEST 7.x please use Id()")]`
`47`	`48`	`public IndexedScriptDescriptor Indexed(string id) => new IndexedScriptDescriptor(id);`
`48`	`49`
`49`	`50`	`[Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")]`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`29`	`29`	`var inline = dict["source"].ToString();`
`30`	`30`	`script = new InlineScript(inline);`
`31`	`31`	`}`
`32`		`- if (dict.ContainsKey("file"))`
`33`		`- {`
`34`		`- var file = dict["file"].ToString();`
`35`		`- script = new FileScript(file);`
`36`		`- }`
`37`	`32`	`if (dict.ContainsKey("id"))`
`38`	`33`	`{`
`39`	`34`	`var id = dict["id"].ToString();`