Better conversion handling.

Added missing decimal handling.

Author: Oren (electricessence)

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

@@ -14,7 +14,9 @@ public JsonDoubleRoundingConverter(int maximum)
 		}
 
 		public override double ReadJson(JsonReader reader, Type objectType, double existingValue, bool hasExistingValue, JsonSerializer serializer)
-			=> Math.Round((double)reader.Value, Maximum);
+			=> reader.Value is decimal d
+				? Convert.ToDouble(Math.Round(d, Maximum))
+				: Math.Round(Convert.ToDouble(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

@@ -18,10 +18,10 @@ public static readonly JsonNullableDecimalConverter Instance
 			{
 				JsonToken.Null => default,
 				JsonToken.Float => Convert.ToDecimal(reader.Value),
-				_ => throw new JsonException("Unexpected token type."),
+				_ => throw new JsonException($"Unexpected token type: {reader.TokenType}, Actual: {reader.Value.GetType()}")
 			};
 
-		public override void WriteJson(JsonWriter writer, decimal? value, JsonSerializer serializer)
-			=> writer.WriteRawValue(JsonDecimalConverter.Normalize(value));
+	public override void WriteJson(JsonWriter writer, decimal? value, JsonSerializer serializer)
+		=> writer.WriteRawValue(JsonDecimalConverter.Normalize(value));
 	}
 }

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

@@ -18,8 +18,8 @@ public static readonly JsonNullableDoubleConverter Instance
 			=> reader.TokenType switch
 			{
 				JsonToken.Null => default,
-				JsonToken.Float => (double)reader.Value,
-				_ => throw new JsonException("Unexpected token type."),
+				JsonToken.Float => Convert.ToDouble(reader.Value),
+				_ => throw new JsonException($"Unexpected token type: {reader.TokenType}, Actual: {reader.Value.GetType()}")
 			};
 
 		public override void WriteJson(JsonWriter writer, double? value, JsonSerializer serializer)

Open.Serialization.Json.Newtonsoft/RelaxedJson.cs

@@ -11,6 +11,7 @@ internal static JsonSerializerSettings Options(
 			=> new JsonSerializerSettings()
 			{
 				Formatting = indent ? Formatting.Indented : Formatting.None,
+				FloatParseHandling = FloatParseHandling.Decimal,
 				ContractResolver = new DefaultContractResolver()
 				{
 					NamingStrategy = new DefaultNamingStrategy() { ProcessDictionaryKeys = false }

Open.Serialization.Tests/Newtonsoft/JsonExtensionTests.cs

@@ -2,6 +2,7 @@
 using Newtonsoft.Json;
 using Xunit;
 using System.Diagnostics;
+using System;
 
 namespace Open.Serialization.Tests.Newtonsoft
 {
@@ -52,28 +53,58 @@ public static void ValidateJsonExtensions()
 		public static void ValidateDecimals()
 		{
 			const decimal sample = 0.234567890123456789012345m;
-			var basic = new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore, FloatParseHandling = FloatParseHandling.Decimal };
-			var serializer = basic
-				.NormalizeDecimals()
-				.GetSerializer();
-
 			{
-				var model = new SampleModel
+				var serializer = CamelCaseJson
+					.Default()
+					.NormalizeDecimals()
+					.GetSerializer();
+
 				{
-					DecimalValue1 = sample
-				};
-				var json = serializer.Serialize(model);
-				Assert.Equal(sample, serializer.Deserialize<SampleModel>(json).DecimalValue1);
+					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);
+				}
 			}
 
 			{
-				var model = new SampleModel
+				var serializer = CamelCaseJson
+					.Default()
+					.RoundDecimals(2)
+					.GetSerializer();
+
+				var sample2 = Math.Round(sample, 2);
+
 				{
-					NullableDecimalValue = sample
-				};
-				var json = serializer.Serialize(model);
-				Assert.Equal(sample, serializer.Deserialize<SampleModel>(json).NullableDecimalValue);
+					var model = new SampleModel
+					{
+						DecimalValue1 = sample
+					};
+					var json = serializer.Serialize(model);
+					Assert.Equal(sample2, serializer.Deserialize<SampleModel>(json).DecimalValue1);
+				}
+
+				{
+					var model = new SampleModel
+					{
+						NullableDecimalValue = sample
+					};
+					var json = serializer.Serialize(model);
+					Assert.Equal(sample2, serializer.Deserialize<SampleModel>(json).NullableDecimalValue);
+				}
 			}
+
 		}
 
 	}