Fix bug with Time Equality comparison

Author: russcam

src/Nest/CommonOptions/TimeUnit/Time.cs

@@ -79,10 +79,9 @@ public int CompareTo(Time other)
 		public static bool operator >=(Time left, Time right) => left.CompareTo(right) > 0 || left.Equals(right);
 
 		public static bool operator ==(Time left, Time right) =>
-			object.ReferenceEquals(left, null) ? object.ReferenceEquals(right, null) : left.Equals(right);
+			ReferenceEquals(left, null) ? ReferenceEquals(right, null) : left.Equals(right);
 
-		public static bool operator !=(Time left, Time right) =>
-			!object.ReferenceEquals(left, null) && !object.ReferenceEquals(right, null) && !left.Equals(right);
+	    public static bool operator !=(Time left, Time right) => !(left == right);
 
 		public TimeSpan ToTimeSpan() => TimeSpan.FromMilliseconds(this.Milliseconds);
 
@@ -96,7 +95,7 @@ public bool Equals(Time other)
 		{
 			if (ReferenceEquals(null, other)) return false;
 			if (ReferenceEquals(this, other)) return true;
-			return (this.ApproximateMilliseconds == other.ApproximateMilliseconds);
+			return this.ApproximateMilliseconds == other.ApproximateMilliseconds;
 		}
 
 		public override bool Equals(object obj)

src/Nest/CommonOptions/TimeUnit/TimeJsonConverter.cs

@@ -7,7 +7,7 @@ internal class TimeJsonConverter : JsonConverter
 	{
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
-			var v = value as Time;
+			var v = (Time)value;
 			if (v.Factor.HasValue && v.Interval.HasValue)
 				writer.WriteValue(v.ToString());
 			else writer.WriteValue((long)v.Milliseconds); 
@@ -16,7 +16,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
 			if (reader.TokenType == JsonToken.String)
-				return new Time(reader.Value as string);
+				return new Time((string)reader.Value);
 
 			if (reader.TokenType == JsonToken.Integer || reader.TokenType == JsonToken.Float)
 			{

src/Tests/CommonOptions/TimeUnit/TimeUnits.doc.cs

@@ -91,7 +91,9 @@ public void EqualityAndComparable()
 			oneAndHalfYear.Should().BeGreaterThan(twoWeeks);
 			(oneAndHalfYear > twoWeeks).Should().BeTrue();
 			(oneAndHalfYear >= twoWeeks).Should().BeTrue();
-			(twoDays >= new Time("2d")).Should().BeTrue();
+
+            (twoDays != null).Should().BeTrue();
+            (twoDays >= new Time("2d")).Should().BeTrue();
 
 			twoDays.Should().BeLessThan(twoWeeks);
 			(twoDays < twoWeeks).Should().BeTrue();
@@ -101,9 +103,10 @@ public void EqualityAndComparable()
 			/**
 			* And assert equality
 			*/
-			twoDays.Should().Be(new Time("2d"));
-			(twoDays == new Time("2d")).Should().BeTrue();
+			twoDays.Should().Be(new Time("2d"));        
+            (twoDays == new Time("2d")).Should().BeTrue();
 			(twoDays != new Time("2.1d")).Should().BeTrue();
+		    
 			(new Time("2.1d") == new Time(TimeSpan.FromDays(2.1))).Should().BeTrue();
 			(new Time("1") == new Time(1)).Should().BeTrue();
 			(new Time("-1") == new Time(-1)).Should().BeTrue();