Merge branch 'master' of https://github.com/elastic/elasticsearch-net

Author: gmarz

src/Benchmarking/project.lock.json

@@ -7811,7 +7811,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
+      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Elasticsearch.Net/project.lock.json

@@ -1739,7 +1739,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
+      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

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

@@ -1,4 +1,6 @@
 using System;
+using System.Globalization;
+using System.Reflection;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -25,14 +27,18 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 				return null;
 			}
+			if (reader.TokenType == JsonToken.String)
+			{
+				return TimeSpan.Parse((string) reader.Value);
+			}
+			if (reader.TokenType == JsonToken.Integer)
+			{
+				return new TimeSpan((long) reader.Value);
+			}
 
-			if (reader.TokenType != JsonToken.Integer)
-				throw new JsonSerializationException($"Cannot convert token of type {reader.TokenType} to {objectType}.");
-
-			return new TimeSpan((long)reader.Value);
+			throw new JsonSerializationException($"Cannot convert token of type {reader.TokenType} to {objectType}.");
 		}
 
-		public override bool CanConvert(Type objectType) => 
-			objectType == typeof (TimeSpan) || objectType == typeof (TimeSpan?);
+		public override bool CanConvert(Type objectType) => objectType == typeof (TimeSpan) || objectType == typeof (TimeSpan?);
 	}
 }

src/Nest/project.lock.json

@@ -2059,7 +2059,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
+      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs

@@ -295,6 +295,9 @@ public class CompanyWithAttributes
 			[String(Analyzer = "keyword", NullValue = "null", Similarity = SimilarityOption.BM25)]
 			public string Name { get; set; }
 
+			[String]
+			public TimeSpan? HeadOfficeHours { get; set; }
+
 			[Object(Path = "employees", Store = false)]
 			public List<Employee> Employees { get; set; }
 		}
@@ -383,6 +386,10 @@ public void UsingAutoMapWithAttributes()
 								null_value = "null",
 								similarity = "BM25",
 								type = "string"
+							},
+							headOfficeHours = new
+							{
+								type = "string"
 							}
 						}
 					},
@@ -531,6 +538,10 @@ public void OverridingAutoMappedAttributes()
 								null_value = "null",
 								similarity = "BM25",
 								type = "string"
+							},
+							headOfficeHours = new
+							{
+								type = "string"
 							}
 						}
 					},

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

@@ -22,7 +22,8 @@ public class IndexApiTests :
 			Name = CallIsolatedValue,
 			StartedOn = FixedDate,
 			LastActivity = FixedDate,
-			CuratedTags = new List<Tag> {new Tag {Name = "x", Added = FixedDate}}
+			CuratedTags = new List<Tag> {new Tag {Name = "x", Added = FixedDate}},
+			
 		};
 
 		public IndexApiTests(IndexingCluster cluster, EndpointUsage usage) : base(cluster, usage)
@@ -111,17 +112,17 @@ public void OpTypeCreate()
 		public void Index()
 		{
 			var indexName = this.RandomString();
-			var project = Project.Generator.Generate(1).First();
-			var indexResult = this.Client.Index(project, f => f.Index(indexName));
+			var commitActivity = CommitActivity.Generator.Generate(1).First();
+			var indexResult = this.Client.Index(commitActivity, f => f.Index(indexName));
 			indexResult.IsValid.Should().BeTrue();
 			indexResult.ApiCall.HttpStatusCode.Should().Be(201);
 			indexResult.Created.Should().BeTrue();
 			indexResult.Index.Should().Be(indexName);
-			indexResult.Type.Should().Be(this.Client.Infer.TypeName<Project>());
-			indexResult.Id.Should().Be(project.Name);
+			indexResult.Type.Should().Be(this.Client.Infer.TypeName<CommitActivity>());
+			indexResult.Id.Should().Be(commitActivity.Id);
 			indexResult.Version.Should().Be(1);
 
-			indexResult = this.Client.Index(project, f => f.Index(indexName));
+			indexResult = this.Client.Index(commitActivity, f => f.Index(indexName));
 
 			indexResult.IsValid.Should().BeTrue();
 			indexResult.Created.Should().BeFalse();

src/Tests/Framework/MockData/CommitActivity.cs

@@ -1,5 +1,8 @@
 using System;
 using Bogus;
+using Nest;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 
 namespace Tests.Framework.MockData
 {
@@ -13,6 +16,14 @@ public class CommitActivity
 		public Developer Committer { get; set; }
 		public TimeSpan? Duration { get; set; }
 
+		[String]
+		[JsonConverter(typeof(StringTimeSpanConverter))]
+		public TimeSpan? StringDuration
+		{
+			get { return Duration; }
+			set { Duration = value; }
+		}
+
 		public static Faker<CommitActivity> Generator { get; } =
 			new Faker<CommitActivity>()
 				.RuleFor(p => p.Id, p => Guid.NewGuid().ToString("N").Substring(0, 8))
@@ -25,12 +36,45 @@ public class CommitActivity
 				{
 					TimeSpan.MinValue,
 					TimeSpan.MaxValue, 
-					null,
-					TimeSpan.Zero, 
 					TimeSpan.FromMinutes(7.5),
+					TimeSpan.Zero,
+					null,
 					TimeSpan.FromHours(4.23),
 					TimeSpan.FromDays(5),
 				}))
 			;
 	}
+
+	internal class StringTimeSpanConverter : JsonConverter
+	{
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+		{
+			if (value == null)
+				writer.WriteNull();
+			else
+			{
+				var timeSpan = (TimeSpan)value;
+				writer.WriteValue(timeSpan.ToString());
+			}
+		}
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+		{
+			if (reader.TokenType == JsonToken.Null)
+			{
+				if (!objectType.IsGeneric() || objectType.GetGenericTypeDefinition() != typeof(Nullable<>))
+					throw new JsonSerializationException($"Cannot convert null value to {objectType}.");
+
+				return null;
+			}
+			if (reader.TokenType == JsonToken.String)
+			{
+				return TimeSpan.Parse((string)reader.Value);
+			}
+
+			throw new JsonSerializationException($"Cannot convert token of type {reader.TokenType} to {objectType}.");
+		}
+
+		public override bool CanConvert(Type objectType) => objectType == typeof(TimeSpan) || objectType == typeof(TimeSpan?);
+	}
 }

src/Tests/project.lock.json

@@ -6406,7 +6406,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
+      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Tests/tests.yaml

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: i
+mode: m
 # the elasticsearch version that should be started
 elasticsearch_version: 2.0.1
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running