Allow Attachment type to work with both mapper-attachment and ingest attachment plugin

Author: russcam

src/Nest/Mapping/Types/Specialized/Attachment/Attachment.cs

@@ -154,26 +154,82 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 					if (reader.TokenType == JsonToken.PropertyName)
 					{
 						var propertyName = (string)reader.Value;
-						switch (propertyName)
+						switch (propertyName.ToLowerInvariant())
 						{
 							case "_content":
+							case "content":
 								attachment.Content = reader.ReadAsString();
 								break;
 							case "_name":
+							case "name":
 								attachment.Name = reader.ReadAsString();
 								break;
+							case "author":
+								attachment.Author = reader.ReadAsString();
+								break;
+							case "keywords":
+								attachment.Keywords = reader.ReadAsString();
+								break;
+							case "date":
+								reader.Read();
+								switch (reader.TokenType)
+								{
+									case JsonToken.String:
+										var value = (string)reader.Value;
+										if (!string.IsNullOrEmpty(value))
+											attachment.Date = Convert.ToDateTime(value);
+										break;
+									case JsonToken.Date:
+										attachment.Date = (DateTime?)reader.Value;
+										break;
+								}
+								break;
 							case "_content_type":
+							case "content_type":
+							case "contenttype":
 								attachment.ContentType = reader.ReadAsString();
 								break;
+							case "_content_length":
+							case "content_length":
+							case "contentlength":
+								reader.Read();
+								switch (reader.TokenType)
+								{
+									case JsonToken.String:
+										var value = (string)reader.Value;
+										if (!string.IsNullOrEmpty(value))
+											attachment.ContentLength = Convert.ToInt64(value);
+										break;
+									case JsonToken.Integer:
+									case JsonToken.Float:
+										attachment.ContentLength = (long?)reader.Value;
+										break;
+
+								}
+								break;
 							case "_language":
+							case "language":
 								attachment.Language = reader.ReadAsString();
 								break;
 							case "_detect_language":
 								attachment.DetectLanguage = reader.ReadAsBoolean();
 								break;
 							case "_indexed_chars":
+							case "indexed_chars":
 								reader.Read();
-								attachment.IndexedCharacters = (long?)reader.Value;
+								switch (reader.TokenType)
+								{
+									case JsonToken.String:
+										var value = (string)reader.Value;
+										if (!string.IsNullOrEmpty(value))
+											attachment.IndexedCharacters = Convert.ToInt64(value);
+										break;
+									case JsonToken.Integer:
+									case JsonToken.Float:
+										attachment.IndexedCharacters = (long?)reader.Value;
+										break;
+
+								}
 								break;
 						}
 					}

src/Tests/Document/Single/Attachment/AttachmentApiTests.cs

@@ -63,18 +63,7 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 					{
 						Field = "content",
 						TargetField = "attachment"
-					},
-					// rename extracted content_type and content_length fields
-					new RenameProcessor
-					{
-						Field = "attachment.content_type",
-						TargetField = "attachment.contentType"
-					},
-					new RenameProcessor
-					{
-						Field = "attachment.content_length",
-						TargetField = "attachment.contentLength"
-					},
+					}
 				}
 			});
 		}
@@ -140,6 +129,7 @@ protected override void ExpectResponse(IIndexResponse response)
 			attachment.Author.Should().Be("Russ Cam");
 			attachment.Language.Should().Be("fr");
 			attachment.ContentLength.Should().Be(93);
+			attachment.Content.Should().Contain("mapper-attachment support");
 		}
 	}
 }

src/Tests/Document/Single/Attachment/Attachment_Test_Document.pdf

@@ -627,6 +627,7 @@
     <None Include="client-concepts.asciidoc" />
     <None Include="common-options.asciidoc" />
     <None Include="connection-pooling.asciidoc" />
+    <None Include="Document\Single\Attachment\Attachment_Test_Document.pdf" />
     <None Include="high-level.asciidoc" />
     <None Include="index.asciidoc" />
     <None Include="intro.asciidoc" />