added field resolving precedence documentation tests

Author: Mpdreamz

src/CodeGeneration/Nest.Litterateur/Documentation/CSharpDocumentationFile.cs

@@ -38,9 +38,15 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Documentation\DocumentationBlocks.cs" />
-    <Compile Include="Documentation\CSharpDocumentationFile.cs" />
+    <Compile Include="Documentation\Blocks\CodeBlock.cs" />
+    <Compile Include="Documentation\Blocks\CombinedBlock.cs" />
+    <Compile Include="Documentation\Blocks\IDocumentationBlock.cs" />
+    <Compile Include="Documentation\Blocks\TextBlock.cs" />
+    <Compile Include="Documentation\Files\CSharpDocumentationFile.cs" />
+    <Compile Include="Documentation\Files\DocumentationFile.cs" />
+    <Compile Include="Documentation\Files\RawDocumentationFile.cs" />
     <Compile Include="EnumerableExtensions.cs" />
+    <Compile Include="Linker\Linker.cs" />
     <Compile Include="Walkers\CodeWithDocumentationWalker.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/CodeGeneration/Nest.Litterateur/Documentation/DocumentationBlocks.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Nest.Litterateur.Documentation.Files;
 
 namespace Nest.Litterateur
 {
@@ -23,13 +24,11 @@ from f in Directory.GetFiles(TestFolder, $"*.{extension}", SearchOption.AllDirec
 
 			public static void Go()
 			{
-				var files = FindAll("cs").Concat(FindAll("asciidoc")).Concat(FindAll("png")).Concat(FindAll("gif"));
+				var files = FindAll("doc.cs").Concat(FindAll("asciidoc")).Concat(FindAll("png")).Concat(FindAll("gif"));
 				foreach (var file in files)
 					file.SaveToDocumentationFolder();
 
 			}
-
-
 		}
 	}
 }

src/CodeGeneration/Nest.Litterateur/Nest.Litterateur.csproj

@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using Nest.Litterateur.Documentation.Blocks;
 
 namespace Nest.Litterateur.Walkers
 {

src/CodeGeneration/Nest.Litterateur/Program.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Nest.Litterateur.Documentation.Blocks;
 
 namespace Nest.Litterateur.Walkers
 {

src/CodeGeneration/Nest.Litterateur/Walkers/CodeWithDocumentationWalker.cs

@@ -71,6 +71,7 @@ private bool ApplyExactContractJsonAttribute(Type objectType, JsonContract contr
 			contract.Converter = attribute.Converter;
 			return true;
 		}
+
 		private bool ApplyContractJsonAttribute(Type objectType, JsonContract contract)
 		{
 			foreach (var t in this.TypeWithInterfaces(objectType))
@@ -168,11 +169,16 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
 				var jsonIgnoreAttribute = member.GetCustomAttributes(typeof(JsonIgnoreAttribute), true);
 				if (jsonIgnoreAttribute.HasAny())
 					property.Ignored = true;
+
+				var propertyName = this.ConnectionSettings.Serializer?.CreatePropertyName(member);
+				if (!propertyName.IsNullOrEmpty())
+					property.PropertyName = propertyName;
 				return property;
 			}
 
 			if (!propertyMapping.Name.IsNullOrEmpty())
 				property.PropertyName = propertyMapping.Name;
+
 			property.Ignored = propertyMapping.Ignore;
 
 			return property;

src/CodeGeneration/Nest.Litterateur/Walkers/DocumentationFileWalker.cs

@@ -46,7 +46,7 @@ internal JsonNetSerializer(IConnectionSettingsValues settings, JsonConverter sta
 			};
 		}
 
-		public void Serialize(object data, Stream writableStream, SerializationFormatting formatting = SerializationFormatting.Indented)
+		public virtual void Serialize(object data, Stream writableStream, SerializationFormatting formatting = SerializationFormatting.Indented)
 		{
 			var serializer = _defaultSerializers[formatting];
 			using (var writer = new StreamWriter(writableStream, ExpectedEncoding, 8096, leaveOpen: true))
@@ -58,7 +58,7 @@ public void Serialize(object data, Stream writableStream, SerializationFormattin
 			}
 		}
 
-		public string CreatePropertyName(MemberInfo memberInfo)
+		public virtual string CreatePropertyName(MemberInfo memberInfo)
 		{
 			var jsonProperty = memberInfo.GetCustomAttribute<JsonPropertyAttribute>(true);
 			return jsonProperty?.PropertyName;
@@ -75,7 +75,7 @@ public virtual T Deserialize<T>(Stream stream)
 			}
 		}
 
-		public Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default(CancellationToken))
+		public virtual Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			//Json.NET does not support reading a stream asynchronously :(
 			var result = this.Deserialize<T>(stream);

src/Nest/CommonAbstractions/SerializationBehavior/ElasticContractResolver.cs

@@ -67,12 +67,14 @@ public abstract class BulkOperationDescriptorBase<TDescriptor, TInterface>
 		/// Manually set the index, default to the default index or the fixed index set on the bulk operation
 		/// </summary>
 		public TDescriptor Index(IndexName index) => Assign(a => a.Index = index);
+		public TDescriptor Index<T>() => Assign(a => a.Index = typeof(T));
 
 		/// <summary>
 		/// Manualy set the type to get the object from, default to whatever
 		/// T will be inferred to if not passed or the fixed type set on the parent bulk operation
 		/// </summary>
 		public TDescriptor Type(TypeName type) => Assign(a => a.Type = type);
+		public TDescriptor Type<T>() => Assign(a => a.Type = typeof(T));
 
 		/// <summary>
 		/// Manually set the id for the newly created object