Full serialization tests for put pipeline and some processor fixes

gmarz · gmarz · commit 54e4bd27762e · 2016-04-27T17:06:07.000-04:00
diff --git a/src/Nest/Ingest/ProcessorJsonConverter.cs b/src/Nest/Ingest/ProcessorJsonConverter.cs
@@ -0,0 +1,27 @@
+﻿using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	internal class ProcessorJsonConverter<TReadAs> : ReserializeJsonConverter<TReadAs, IProcessor>
+		where TReadAs : class, IProcessor, new()
+	{
+		protected override void SerializeJson(JsonWriter writer, object value, IProcessor castValue, JsonSerializer serializer)
+		{
+			var name = castValue.Name;
+			if (name == null) return;
+			writer.WriteStartObject();
+			{
+				writer.WritePropertyName(name);
+				{
+					this.Reserialize(writer, value, serializer);
+				}
+			}
+			writer.WriteEndObject();
+		}
+	}
+}
diff --git a/src/Nest/Ingest/Processors/AppendProcessor.cs b/src/Nest/Ingest/Processors/AppendProcessor.cs
@@ -8,40 +8,41 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<AppendProcessor>))]
 	public interface IAppendProcessor : IProcessor
 	{
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("values")]
-		IEnumerable<object> Values { get; set; }
+		[JsonProperty("value")]
+		IEnumerable<object> Value { get; set; }
 	}
 
 	public class AppendProcessor : ProcessorBase, IAppendProcessor
 	{
 		protected override string Name => "append";
 		public Field Field { get; set; }
-		public IEnumerable<object> Values { get; set; }
+		public IEnumerable<object> Value { get; set; }
 	}
 
 	public class AppendProcessorDescriptor<T> : ProcessorDescriptorBase<AppendProcessorDescriptor<T>, IAppendProcessor>, IAppendProcessor
 		where T : class
 	{
 		protected override string Name => "append";
 		Field IAppendProcessor.Field { get; set; }
-		IEnumerable<object> IAppendProcessor.Values { get; set; }
+		IEnumerable<object> IAppendProcessor.Value { get; set; }
 
 		public AppendProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
 		public AppendProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.Field = objectPath);
 
-		public AppendProcessorDescriptor<T> Values<TValue>(IEnumerable<TValue> values) => Assign(a => a.Values = values?.Cast<object>());
+		public AppendProcessorDescriptor<T> Value<TValue>(IEnumerable<TValue> values) => Assign(a => a.Value = values?.Cast<object>());
 
-		public AppendProcessorDescriptor<T> Values<TValue>(params TValue[] values) => Assign(a => {
+		public AppendProcessorDescriptor<T> Value<TValue>(params TValue[] values) => Assign(a => {
 			if(values?.Length == 1 && typeof(IEnumerable).IsAssignableFrom(typeof(TValue)) && typeof(TValue) != typeof(string))
-				a.Values = (values.First() as IEnumerable)?.Cast<object>();
-			else a.Values = values?.Cast<object>();
+				a.Value = (values.First() as IEnumerable)?.Cast<object>();
+			else a.Value = values?.Cast<object>();
 		});
 	}
 
diff --git a/src/Nest/Ingest/Processors/ConvertProcessor.cs b/src/Nest/Ingest/Processors/ConvertProcessor.cs
@@ -10,6 +10,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<ConvertProcessor>))]
 	public interface IConvertProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/DateProcessor.cs b/src/Nest/Ingest/Processors/DateProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<DateProcessor>))]
 	public interface IDateProcessor : IProcessor
 	{
 		[JsonProperty("field")]
@@ -17,8 +18,8 @@ public interface IDateProcessor : IProcessor
 		[JsonProperty("target_field")]
 		Field TargetField { get; set; }
 
-		[JsonProperty("match_formats")]
-		string MatchFormats { get; set; }
+		[JsonProperty("formats")]
+		IEnumerable<string> Formats { get; set; }
 
 		[JsonProperty("timezone")]
 		string Timezone { get; set; }
@@ -33,13 +34,13 @@ public class DateProcessor : ProcessorBase, IDateProcessor
 
 		public Field Field { get; set; }
 
-		public string Locale { get; set; }
-
-		public string MatchFormats { get; set; }
-
 		public Field TargetField { get; set; }
 
+		public IEnumerable<string> Formats { get; set; }
+
 		public string Timezone { get; set; }
+
+		public string Locale { get; set; }
 	}
 
 	public class DateProcessorDescriptor<T>
@@ -49,14 +50,10 @@ public class DateProcessorDescriptor<T>
 		protected override string Name => "date";
 
 		Field IDateProcessor.Field { get; set; }
-
-		string IDateProcessor.Locale { get; set; }
-
-		string IDateProcessor.MatchFormats { get; set; }
-
 		Field IDateProcessor.TargetField { get; set; }
-
+		IEnumerable<string> IDateProcessor.Formats { get; set; }
 		string IDateProcessor.Timezone { get; set; }
+		string IDateProcessor.Locale { get; set; }
 
 		public DateProcessorDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
@@ -68,7 +65,9 @@ public DateProcessorDescriptor<T> Field(Expression<Func<T, object>> objectPath)
 		public DateProcessorDescriptor<T> TargetField(Expression<Func<T, object>> objectPath) =>
 			Assign(a => a.TargetField = objectPath);
 
-		public DateProcessorDescriptor<T> MatchFormats(string matchFormats) => Assign(a => a.MatchFormats = matchFormats);
+		public DateProcessorDescriptor<T> Formats(IEnumerable<string> matchFormats) => Assign(a => a.Formats = matchFormats);
+
+		public DateProcessorDescriptor<T> Formats(params string[] matchFormats) => Assign(a => a.Formats = matchFormats);
 
 		public DateProcessorDescriptor<T> Timezone(string timezone) => Assign(a => a.Timezone = timezone);
 
diff --git a/src/Nest/Ingest/Processors/FailProcessor.cs b/src/Nest/Ingest/Processors/FailProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<FailProcessor>))]
 	public interface IFailProcessor : IProcessor
 	{
 		[JsonProperty("message")]
@@ -21,14 +22,13 @@ public class FailProcessor : ProcessorBase, IFailProcessor
 		public string Message { get; set; }
 	}
 
-	public class FailProcessorDescriptor<T>
-		: ProcessorDescriptorBase<FailProcessorDescriptor<T>, IFailProcessor>, IFailProcessor
-		where T : class
+	public class FailProcessorDescriptor
+		: ProcessorDescriptorBase<FailProcessorDescriptor, IFailProcessor>, IFailProcessor
 	{
 		protected override string Name => "fail";
 
 		string IFailProcessor.Message { get; set; }
 
-		public FailProcessorDescriptor<T> Message(string message) => Assign(a => a.Message = message);
+		public FailProcessorDescriptor Message(string message) => Assign(a => a.Message = message);
 	}
 }
diff --git a/src/Nest/Ingest/Processors/ForeachProcessor.cs b/src/Nest/Ingest/Processors/ForeachProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<ForeachProcessor>))]
 	public interface IForeachProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/GrokProcessor.cs b/src/Nest/Ingest/Processors/GrokProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<GrokProcessor>))]
 	public interface IGrokProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/GsubProcessor.cs b/src/Nest/Ingest/Processors/GsubProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<GsubProcessor>))]
 	public interface IGsubProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/JoinProcessor.cs b/src/Nest/Ingest/Processors/JoinProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<JoinProcessor>))]
 	public interface IJoinProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/LowercaseProcessor.cs b/src/Nest/Ingest/Processors/LowercaseProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<LowercaseProcessor>))]
 	public interface ILowercaseProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/RemoveProcessor.cs b/src/Nest/Ingest/Processors/RemoveProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<RemoveProcessor>))]
 	public interface IRemoveProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/RenameProcessor.cs b/src/Nest/Ingest/Processors/RenameProcessor.cs
@@ -10,6 +10,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<RenameProcessor>))]
 	public interface IRenameProcessor : IProcessor
 	{
 		[JsonProperty("field")]
@@ -30,7 +31,7 @@ public class RenameProcessorDescriptor<T>
 		: ProcessorDescriptorBase<RenameProcessorDescriptor<T>, IRenameProcessor>, IRenameProcessor
 		where T : class
 	{
-		protected override string Name => "convert";
+		protected override string Name => "rename";
 		Field IRenameProcessor.Field { get; set; }
 		Field IRenameProcessor.TargetField { get; set; }
 
diff --git a/src/Nest/Ingest/Processors/SetProcessor.cs b/src/Nest/Ingest/Processors/SetProcessor.cs
@@ -8,6 +8,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<SetProcessor>))]
 	public interface ISetProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/SplitProcessor.cs b/src/Nest/Ingest/Processors/SplitProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<SplitProcessor>))]
 	public interface ISplitProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/TrimProcessor.cs b/src/Nest/Ingest/Processors/TrimProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<TrimProcessor>))]
 	public interface ITrimProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/Processors/UppercaseProcessor.cs b/src/Nest/Ingest/Processors/UppercaseProcessor.cs
@@ -9,6 +9,7 @@
 namespace Nest
 {
 	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ProcessorJsonConverter<UppercaseProcessor>))]
 	public interface IUppercaseProcessor : IProcessor
 	{
 		[JsonProperty("field")]
diff --git a/src/Nest/Ingest/ProcessorsDescriptor.cs b/src/Nest/Ingest/ProcessorsDescriptor.cs
@@ -19,8 +19,8 @@ public ProcessorsDescriptor Date<T>(Func<DateProcessorDescriptor<T>, IDateProces
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new DateProcessorDescriptor<T>())));
 
 
-		public ProcessorsDescriptor Fail<T>(Func<FailProcessorDescriptor<T>, IFailProcessor> selector) where T : class  =>
-			Assign(a => a.AddIfNotNull(selector?.Invoke(new FailProcessorDescriptor<T>())));
+		public ProcessorsDescriptor Fail(Func<FailProcessorDescriptor, IFailProcessor> selector) =>
+			Assign(a => a.AddIfNotNull(selector?.Invoke(new FailProcessorDescriptor())));
 
 
 		public ProcessorsDescriptor Foreach<T>(Func<ForeachProcessorDescriptor<T>, IForeachProcessor> selector) where T : class  =>
diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj
@@ -754,6 +754,7 @@
     <Compile Include="Ingest\GetPipeline\GetPipelineResponse.cs" />
     <Compile Include="Ingest\Pipeline.cs" />
     <Compile Include="Ingest\Processor.cs" />
+    <Compile Include="Ingest\ProcessorJsonConverter.cs" />
     <Compile Include="Ingest\ProcessorsDescriptor.cs" />
     <Compile Include="Ingest\Processors\UppercaseProcessor.cs" />
     <Compile Include="Ingest\Processors\TrimProcessor.cs" />
diff --git a/src/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs b/src/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`namespace Nest`
`11`	`11`	`{`
`12`	`12`	`[JsonObject(MemberSerialization.OptIn)]`
	`13`	`+ [JsonConverter(typeof(ProcessorJsonConverter<ConvertProcessor>))]`
`13`	`14`	`public interface IConvertProcessor : IProcessor`
`14`	`15`	`{`
`15`	`16`	`[JsonProperty("field")]`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`namespace Nest`
`10`	`10`	`{`
`11`	`11`	`[JsonObject(MemberSerialization.OptIn)]`
	`12`	`+ [JsonConverter(typeof(ProcessorJsonConverter<FailProcessor>))]`
`12`	`13`	`public interface IFailProcessor : IProcessor`
`13`	`14`	`{`
`14`	`15`	`[JsonProperty("message")]`
`@@ -21,14 +22,13 @@ public class FailProcessor : ProcessorBase, IFailProcessor`
`21`	`22`	`public string Message { get; set; }`
`22`	`23`	`}`
`23`	`24`
`24`		`- public class FailProcessorDescriptor<T>`
`25`		`- : ProcessorDescriptorBase<FailProcessorDescriptor<T>, IFailProcessor>, IFailProcessor`
`26`		`- where T : class`
	`25`	`+ public class FailProcessorDescriptor`
	`26`	`+ : ProcessorDescriptorBase<FailProcessorDescriptor, IFailProcessor>, IFailProcessor`
`27`	`27`	`{`
`28`	`28`	`protected override string Name => "fail";`
`29`	`29`
`30`	`30`	`string IFailProcessor.Message { get; set; }`
`31`	`31`
`32`		`- public FailProcessorDescriptor<T> Message(string message) => Assign(a => a.Message = message);`
	`32`	`+ public FailProcessorDescriptor Message(string message) => Assign(a => a.Message = message);`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`namespace Nest`
`9`	`9`	`{`
`10`	`10`	`[JsonObject(MemberSerialization.OptIn)]`
	`11`	`+ [JsonConverter(typeof(ProcessorJsonConverter<SetProcessor>))]`
`11`	`12`	`public interface ISetProcessor : IProcessor`
`12`	`13`	`{`
`13`	`14`	`[JsonProperty("field")]`