Fixed decimal and double handling. Expanded tests.

Author: Oren (electricessence)

Open.Serialization.Json.Newtonsoft/Converters/JsonDecimalRoundingConverter.cs

@@ -14,7 +14,7 @@ public JsonDecimalRoundingConverter(int maximum)
 		}
 
 		public override decimal ReadJson(JsonReader reader, Type objectType, decimal existingValue, bool hasExistingValue, JsonSerializer serializer)
-			=> Math.Round(hasExistingValue ? existingValue : (decimal)reader.Value, Maximum);
+			=> Math.Round(Convert.ToDecimal(reader.Value), Maximum);
 
 		public override void WriteJson(JsonWriter writer, decimal value, JsonSerializer serializer)
 			=> base.WriteJson(writer, Math.Round(value, Maximum), serializer);

Open.Serialization.Json.Newtonsoft/Converters/JsonDoubleRoundingConverter.cs

@@ -14,7 +14,7 @@ public JsonDoubleRoundingConverter(int maximum)
 		}
 
 		public override double ReadJson(JsonReader reader, Type objectType, double existingValue, bool hasExistingValue, JsonSerializer serializer)
-			=> Math.Round(hasExistingValue ? existingValue : (double)reader.Value, Maximum);
+			=> Math.Round((double)reader.Value, Maximum);
 
 		public override void WriteJson(JsonWriter writer, double value, JsonSerializer serializer)
 			=> writer.WriteValue(Math.Round(value, Maximum));

Open.Serialization.Json.Newtonsoft/Converters/JsonNullableDecimalConverter.cs

@@ -14,7 +14,7 @@ public static readonly JsonNullableDecimalConverter Instance
 			= new JsonNullableDecimalConverter();
 
 		public override decimal? ReadJson(JsonReader reader, Type objectType, decimal? existingValue, bool hasExistingValue, JsonSerializer serializer)
-			=> hasExistingValue ? existingValue : reader.TokenType switch
+			=> reader.TokenType switch
 			{
 				JsonToken.Null => default,
 				JsonToken.Float => (decimal)reader.Value,

Open.Serialization.Json.Newtonsoft/Converters/JsonNullableDoubleConverter.cs

@@ -15,7 +15,7 @@ public static readonly JsonNullableDoubleConverter Instance
 
 
 		public override double? ReadJson(JsonReader reader, Type objectType, double? existingValue, bool hasExistingValue, JsonSerializer serializer)
-			=> hasExistingValue ? existingValue : reader.TokenType switch
+			=> reader.TokenType switch
 			{
 				JsonToken.Null => default,
 				JsonToken.Float => (double)reader.Value,

Open.Serialization.Json.Newtonsoft/Converters/JsonValueConverterBase.cs

@@ -9,7 +9,7 @@ public abstract class JsonValueConverterBase<T> : JsonConverter<T>
 		private static readonly JsonSerializer Deserializer = JsonSerializer.Create();
 
 		public override T ReadJson(JsonReader reader, Type objectType, T existingValue, bool hasExistingValue, JsonSerializer serializer)
-			=> hasExistingValue ? existingValue : Deserializer.Deserialize<T>(reader);
+			=> Deserializer.Deserialize<T>(reader);
 
 		public override void WriteJson(JsonWriter writer, T value, JsonSerializer serializer)
 			=> writer.WriteRawValue(value?.ToString());

Open.Serialization.Json.Newtonsoft/Open.Serialization.Json.Newtonsoft.csproj

@@ -17,7 +17,7 @@ Part of the "Open" set of libraries.
 		<RepositoryUrl>https://github.com/electricessence/Open.Serialization</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>serialization json newtonsoft</PackageTags>
-		<Version>1.2.3</Version>
+		<Version>1.2.4</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Open.Serialization.Tests/Newtonsoft/JsonExtensionTests.cs

@@ -1,6 +1,7 @@
 using Open.Serialization.Json.Newtonsoft;
 using Newtonsoft.Json;
 using Xunit;
+using System.Diagnostics;
 
 namespace Open.Serialization.Tests.Newtonsoft
 {
@@ -9,17 +10,71 @@ public static class JsonExtensionTests
 		[Fact]
 		public static void ValidateJsonExtensions()
 		{
-			var basic = new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore };
+			{
+				var basic = new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore };
+				var serializer = basic
+					.NormalizeDecimals()
+					.RoundDoubles(2)
+					.RoundDecimals(2)
+					.GetSerializer();
 
-			basic
+				var json = serializer.Serialize(SampleModel.Instance);
+				var obj = serializer.Deserialize<SampleModel>(json);
+				Assert.NotNull(obj);
+			}
+
+			{
+				var basic = new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore };
+				var serializer = basic
+					.RoundDoubles(2)
+					.RoundDecimals(2)
+					.GetSerializer();
+
+				var json = serializer.Serialize(SampleModel.Instance);
+				var obj = serializer.Deserialize<SampleModel>(json);
+				Assert.NotNull(obj);
+			}
+
+			{
+				var basic = new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore };
+				var serializer = basic
+					.RoundDecimals(2)
+					.RoundDoubles(2)
+					.GetSerializer();
+
+				var json = serializer.Serialize(SampleModel.Instance);
+				var obj = serializer.Deserialize<SampleModel>(json);
+				Assert.NotNull(obj);
+			}
+		}
+
+		[Fact]
+		public static void ValidateDecimals()
+		{
+			const decimal sample = 0.234567890123456789012345m;
+			var basic = new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore, FloatParseHandling = FloatParseHandling.Decimal };
+			var serializer = basic
 				.NormalizeDecimals()
-				.RoundDoubles(2)
-				.RoundDecimals(2);
+				.GetSerializer();
 
-			var serializer = basic.GetSerializer();
-			var json = serializer.Serialize(SampleModel.Instance);
-			var obj = serializer.Deserialize<SampleModel>(json);
-			Assert.NotNull(obj);
+			{
+				var model = new SampleModel
+				{
+					DecimalValue1 = sample
+				};
+				var json = serializer.Serialize(model);
+				Assert.Equal(sample, serializer.Deserialize<SampleModel>(json).DecimalValue1);
+			}
+
+			{
+				var model = new SampleModel
+				{
+					NullableDecimalValue = sample
+				};
+				var json = serializer.Serialize(model);
+				Assert.Equal(sample, serializer.Deserialize<SampleModel>(json).NullableDecimalValue);
+			}
 		}
+
 	}
 }

Open.Serialization.Tests/System/JsonExtensionTests.cs

@@ -35,5 +35,33 @@ public static void ValidateJsonExtensions()
 			var obj = serializer.Deserialize<SampleModel>(json);
 			Assert.NotNull(obj);
 		}
+
+		[Fact]
+		public static void ValidateDecimals()
+		{
+			const decimal sample = 1.234567890123456789012345m;
+			var basic = new JsonSerializerOptions() { IgnoreNullValues = true };
+			var serializer = basic
+				.NormalizeDecimals()
+				.GetSerializer();
+
+			{
+				var model = new SampleModel
+				{
+					DecimalValue1 = sample
+				};
+				var json = serializer.Serialize(model);
+				Assert.Equal(sample, serializer.Deserialize<SampleModel>(json).DecimalValue1);
+			}
+
+			{
+				var model = new SampleModel
+				{
+					NullableDecimalValue = sample
+				};
+				var json = serializer.Serialize(model);
+				Assert.Equal(sample, serializer.Deserialize<SampleModel>(json).NullableDecimalValue);
+			}
+		}
 	}
 }