Reverted mappings of ingest back to alpha1

CRUD/PUT tests are succeeding, fixed the Processor deserialization so we
can read IProcessors being returned. Added a test for adding a pipeline
to an Index() call

Author: Mpdreamz

src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/ReserializeJsonConverter.cs

@@ -58,4 +58,4 @@ protected void Reserialize(JsonWriter writer, object value, JsonSerializer seria
 			writer.WriteEndObject();
 		}
 	}
-}
+}

src/Nest/Ingest/ProcessorJsonConverter.cs

@@ -23,5 +23,14 @@ protected override void SerializeJson(JsonWriter writer, object value, IProcesso
 			}
 			writer.WriteEndObject();
 		}
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+		{
+			if (reader.TokenType != JsonToken.StartObject) return null;
+			reader.Read(); //property name of processor type
+			if (reader.TokenType != JsonToken.PropertyName) return null;
+			reader.Read();
+			return base.ReadJson(reader, objectType, existingValue, serializer);
+		}
 	}
 }

src/Nest/Ingest/Processors/DateProcessor.cs

@@ -12,13 +12,13 @@ namespace Nest
 	[JsonConverter(typeof(ProcessorJsonConverter<DateProcessor>))]
 	public interface IDateProcessor : IProcessor
 	{
-		[JsonProperty("field")]
+		[JsonProperty("match_field")]
 		Field Field { get; set; }
 
 		[JsonProperty("target_field")]
 		Field TargetField { get; set; }
 
-		[JsonProperty("formats")]
+		[JsonProperty("match_formats")]
 		IEnumerable<string> Formats { get; set; }
 
 		[JsonProperty("timezone")]

src/Nest/Ingest/Processors/RenameProcessor.cs

@@ -16,7 +16,7 @@ public interface IRenameProcessor : IProcessor
 		[JsonProperty("field")]
 		Field Field { get; set; }
 
-		[JsonProperty("target_field")]
+		[JsonProperty("to")]
 		Field TargetField { get; set; }
 	}
 

src/Nest/Ingest/Processors/UppercaseProcessor.cs

@@ -19,6 +19,7 @@ public interface IUppercaseProcessor : IProcessor
 	public class UppercaseProcessor : ProcessorBase, IUppercaseProcessor
 	{
 		protected override string Name => "uppercase";
+		[JsonProperty("field")]
 		public Field Field { get; set; }
 	}
 

src/Tests/Document/Single/Index/IndexIngestApiTests.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Elasticsearch.Net;
+using FluentAssertions;
+using Nest;
+using Newtonsoft.Json.Linq;
+using Tests.Framework;
+using Tests.Framework.Integration;
+using Tests.Framework.MockData;
+using Xunit;
+
+namespace Tests.Document.Single.Index
+{
+	[Collection(IntegrationContext.Indexing)]
+	public class IndexIngestApiTests :
+		ApiIntegrationTestBase<IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
+	{
+		private string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			client.PutPipeline(new PutPipelineRequest(this.PipelineId)
+			{
+				Description = "Index pipeline test",
+				Processors = new List<IProcessor>
+				{
+					new RenameProcessor
+					{
+						TargetField = "lastSeen",
+						Field = "lastActivity"
+					}
+				}
+			});
+
+
+
+		}
+
+		private Project Document => new Project
+		{
+			State = StateOfBeing.Stable,
+			Name = CallIsolatedValue,
+			StartedOn = FixedDate,
+			LastActivity = FixedDate,
+			CuratedTags = new List<Tag> {new Tag {Name = "x", Added = FixedDate}},
+		};
+
+		public IndexIngestApiTests(IndexingCluster cluster, EndpointUsage usage) : base(cluster, usage)
+		{
+		}
+
+		protected override LazyResponses ClientUsage() => Calls(
+			fluent: (client, f) => client.Index<Project>(this.Document, f),
+			fluentAsync: (client, f) => client.IndexAsync<Project>(this.Document, f),
+			request: (client, r) => client.Index(r),
+			requestAsync: (client, r) => client.IndexAsync(r)
+			);
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => 201;
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+
+		protected override string UrlPath
+			=> $"/project/project/{CallIsolatedValue}?consistency=quorum&op_type=index&refresh=true&routing=route";
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override object ExpectJson =>
+			new
+			{
+				name = CallIsolatedValue,
+				state = "Stable",
+				startedOn = FixedDate,
+				lastActivity = FixedDate,
+				curatedTags = new[] {new {name = "x", added = FixedDate}},
+			};
+
+		protected override IndexDescriptor<Project> NewDescriptor() => new IndexDescriptor<Project>(this.Document);
+
+		protected override Func<IndexDescriptor<Project>, IIndexRequest<Project>> Fluent => s => s
+			.Consistency(Consistency.Quorum)
+			.OpType(OpType.Index)
+			.Refresh()
+			.Pipeline(this.PipelineId)
+			.Routing("route");
+
+		protected override IndexRequest<Project> Initializer =>
+			new IndexRequest<Project>(this.Document)
+			{
+				Refresh = true,
+				OpType = OpType.Index,
+				Consistency = Consistency.Quorum,
+				Routing = "route",
+				Pipeline = this.PipelineId
+			};
+
+	}
+
+}

src/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs

@@ -56,9 +56,9 @@ protected override LazyResponses ClientUsage() => Calls(
 				{
 					date = new
 					{
-						field = "startedOn",
+						match_field = "startedOn",
 						target_field = "timestamp",
-						formats = new [] { "dd/MM/yyyy hh:mm:ss" },
+						match_formats = new [] { "dd/MM/yyyy hh:mm:ss" },
 						timezone = "Europe/Amsterdam"
 					}
 				},
@@ -135,7 +135,7 @@ protected override LazyResponses ClientUsage() => Calls(
 					rename = new
 					{
 						field = "leadDeveloper",
-						target_field = "projectLead"
+						to = "projectLead"
 					}
 				},
 				new

src/Tests/Tests.csproj

@@ -321,6 +321,7 @@
     <Compile Include=".\Mapping\Types\Core\Number\NumberMappingTests.cs" />
     <Compile Include="Aggregations\AggregationVisitorTests.cs" />
     <Compile Include="CodeStandards\Serialization\Converters.doc.cs" />
+    <Compile Include="Document\Single\Index\IndexIngestApiTests.cs" />
     <Compile Include="Framework\MockData\Tag.cs" />
     <Compile Include="Framework\MockResponses\SniffingResponse.cs" />
     <Compile Include="Indices\IndexManagement\OpenCloseIndex\OpenIndex\OpenIndexApiTests.cs" />

src/Tests/tests.yaml

@@ -1,7 +1,7 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
 mode: m
 # the elasticsearch version that should be started
-elasticsearch_version: 5.0.0-alpha2-SNAPSHOT
+elasticsearch_version: 5.0.0-alpha1
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
 force_reseed: true
 # do not spawn nodes as part of the test setup but rely on a manually started es node being up