Remove decimal support from Serialization

Muximize · Muximize · commit e85d9c48b4a0 · 2024-01-27T01:55:59.000+01:00
diff --git a/UnitsNet.Serialization.JsonNet.Tests/AbbreviatedUnitsConverterTests.cs b/UnitsNet.Serialization.JsonNet.Tests/AbbreviatedUnitsConverterTests.cs
@@ -222,50 +222,6 @@ public void DoubleZeroBaseQuantity_DeserializedFromEmptyInput()
             Assert.Equal(Mass.BaseUnit, quantity.Unit);
         }
 
-        [Fact]
-        public void DecimalZeroIQuantity_DeserializedFromAbbreviatedUnitAndNoValue()
-        {
-            var json = "{\"Unit\":\"EB\",\"Type\":\"Information\"}";
-
-            var quantity = (Information)DeserializeObject<IQuantity>(json);
-
-            Assert.Equal(0, quantity.Value);
-            Assert.Equal(InformationUnit.Exabyte, quantity.Unit);
-        }
-
-        [Fact]
-        public void DecimalZeroQuantity_DeserializedFromAbbreviatedUnitAndNoValue()
-        {
-            var json = "{\"Unit\":\"EB\"}";
-
-            var quantity = DeserializeObject<Information>(json);
-
-            Assert.Equal(0, quantity.Value);
-            Assert.Equal(InformationUnit.Exabyte, quantity.Unit);
-        }
-
-        [Fact]
-        public void DecimalZeroBaseIQuantity_DeserializedFromQuantityTypeOnly()
-        {
-            var json = "{\"Type\":\"Information\"}";
-
-            var quantity = (Information)DeserializeObject<IQuantity>(json);
-
-            Assert.Equal(0, quantity.Value);
-            Assert.Equal(Information.BaseUnit, quantity.Unit);
-        }
-
-        [Fact]
-        public void DecimalZeroBaseQuantity_DeserializedFromEmptyInput()
-        {
-            var json = "{}";
-
-            var quantity = DeserializeObject<Information>(json);
-
-            Assert.Equal(0, quantity.Value);
-            Assert.Equal(Information.BaseUnit, quantity.Unit);
-        }
-
         #endregion
 
         #region Compatibility
diff --git a/UnitsNet.Serialization.JsonNet.Tests/UnitsNetBaseJsonConverterTest.cs b/UnitsNet.Serialization.JsonNet.Tests/UnitsNetBaseJsonConverterTest.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
@@ -38,16 +37,6 @@ public void UnitsNetBaseJsonConverter_ConvertIQuantity_throws_ArgumentNullExcept
             Assert.Equal("Value cannot be null. (Parameter 'quantity')", result.Message);
         }
 
-        [Fact]
-        public void UnitsNetBaseJsonConverter_ConvertValueUnit_works_as_expected()
-        {
-            var result = _sut.Test_ConvertDecimalValueUnit("PowerUnit.Watt", 10.2365m);
-
-            Assert.NotNull(result);
-            Assert.IsType<Power>(result);
-            Assert.True(Power.FromWatts(10.2365).Equals((Power)result, 1e-5, ComparisonType.Absolute));
-        }
-
         [Fact]
         public void UnitsNetBaseJsonConverter_ConvertValueUnit_throws_UnitsNetException_when_unit_does_not_exist()
         {
@@ -58,16 +47,6 @@ public void UnitsNetBaseJsonConverter_ConvertValueUnit_throws_UnitsNetException_
             Assert.Equal("UnitsNet.Units.SomeImaginaryUnit,UnitsNet", result.Data["type"]);
         }
 
-        [Fact]
-        public void UnitsNetBaseJsonConverter_ConvertValueUnit_throws_UnitsNetException_when_unit_is_in_unexpected_format()
-        {
-            var result = Assert.Throws<UnitsNetException>(() => _sut.Test_ConvertDecimalValueUnit("PowerUnit Watt", 10.2365m));
-
-            Assert.Equal("\"PowerUnit Watt\" is not a valid unit.", result.Message);
-            Assert.True(result.Data.Contains("type"));
-            Assert.Equal("PowerUnit Watt", result.Data["type"]);
-        }
-
         [Fact]
         public void UnitsNetBaseJsonConverter_CreateLocalSerializer_works_as_expected()
         {
@@ -107,38 +86,6 @@ public void UnitsNetBaseJsonConverter_ReadValueUnit_works_with_double_quantity()
             Assert.Equal(10.2365, result?.Value);
         }
 
-        [Fact]
-        public void UnitsNetBaseJsonConverter_ReadValueUnit_works_with_decimal_quantity()
-        {
-            var token = new JObject {{"Unit", "PowerUnit.Watt"}, {"Value", 10.2365m}, {"ValueString", "10.2365"}, {"ValueType", "decimal"}};
-
-            var result = _sut.Test_ReadDecimalValueUnit(token);
-
-            Assert.NotNull(result);
-            Assert.Equal("PowerUnit.Watt", result?.Unit);
-            Assert.Equal(10.2365m, result?.Value);
-        }
-
-        [Fact]
-        public void UnitsNetBaseJsonConverter_ReadValueUnit_returns_null_when_value_is_a_string()
-        {
-            var token = new JObject {{"Unit", "PowerUnit.Watt"}, {"Value", "10.2365"}};
-
-            var result = _sut.Test_ReadDecimalValueUnit(token);
-
-            Assert.Null(result);
-        }
-
-        [Fact]
-        public void UnitsNetBaseJsonConverter_ReadValueUnit_returns_null_when_value_type_is_not_a_string()
-        {
-            var token = new JObject {{"Unit", "PowerUnit.Watt"}, {"Value", 10.2365}, {"ValueType", 123}};
-
-            var result = _sut.Test_ReadDecimalValueUnit(token);
-
-            Assert.Null(result);
-        }
-
         [Fact]
         public void UnitsNetBaseJsonConverter_ReadDoubleValueUnit_works_with_empty_token()
         {
@@ -149,55 +96,6 @@ public void UnitsNetBaseJsonConverter_ReadDoubleValueUnit_works_with_empty_token
             Assert.Null(result);
         }
 
-        [Theory]
-        [InlineData(false, true)]
-        [InlineData(true, false)]
-        public void UnitsNetBaseJsonConverter_ReadValueUnit_returns_null_when_unit_or_value_is_missing(bool withUnit, bool withValue)
-        {
-            var token = new JObject();
-
-            if (withUnit)
-            {
-                token.Add("Unit", "PowerUnit.Watt");
-            }
-
-            if (withValue)
-            {
-                token.Add("Value", 10.2365m);
-            }
-
-            var result = _sut.Test_ReadDecimalValueUnit(token);
-
-            Assert.Null(result);
-        }
-
-        [Theory]
-        [InlineData("Unit", "Value", "ValueString", "ValueType")]
-        [InlineData("unit", "Value", "ValueString", "ValueType")]
-        [InlineData("Unit", "value", "valueString", "valueType")]
-        [InlineData("unit", "value", "valueString", "valueType")]
-        [InlineData("unIT", "vAlUe", "vAlUeString", "vAlUeType")]
-        public void UnitsNetBaseJsonConverter_ReadValueUnit_works_case_insensitive(
-            string unitPropertyName,
-            string valuePropertyName,
-            string valueStringPropertyName,
-            string valueTypePropertyName)
-        {
-            var token = new JObject
-            {
-                {unitPropertyName, "PowerUnit.Watt"},
-                {valuePropertyName, 10.2365m},
-                {valueStringPropertyName, 10.2365m.ToString(CultureInfo.InvariantCulture)},
-                {valueTypePropertyName, "decimal"}
-            };
-
-            var result = _sut.Test_ReadDecimalValueUnit(token);
-
-            Assert.NotNull(result);
-            Assert.Equal("PowerUnit.Watt", result?.Unit);
-            Assert.Equal(10.2365m, result?.Value);
-        }
-
         /// <summary>
         /// Dummy converter, used to access protected methods on abstract UnitsNetBaseJsonConverter{T}
         /// </summary>
@@ -214,24 +112,8 @@ private class TestConverter : UnitsNetBaseJsonConverter<string>
                 return (result.Unit, result.Value);
             }
 
-            public (string Unit, decimal Value) Test_ConvertDecimalIQuantity(IQuantity value)
-            {
-                var result = ConvertIQuantity(value);
-                if (result is ExtendedValueUnit {ValueType: "decimal"} decimalResult)
-                {
-                    return (result.Unit, decimal.Parse(decimalResult.ValueString, CultureInfo.InvariantCulture));
-                }
-
-                throw new ArgumentException("The quantity does not have a decimal value", nameof(value));
-            }
-
             public IQuantity Test_ConvertDoubleValueUnit(string unit, double value) => Test_ConvertValueUnit(new ValueUnit {Unit = unit, Value = value});
 
-            public IQuantity Test_ConvertDecimalValueUnit(string unit, decimal value) => Test_ConvertValueUnit(new ExtendedValueUnit
-            {
-                Unit = unit, Value = (double) value, ValueString = value.ToString(CultureInfo.InvariantCulture), ValueType = "decimal"
-            });
-
             private IQuantity Test_ConvertValueUnit(ValueUnit valueUnit) => ConvertValueUnit(valueUnit);
 
             public JsonSerializer Test_CreateLocalSerializer(JsonSerializer serializer) => CreateLocalSerializer(serializer, this);
@@ -246,19 +128,6 @@ public IQuantity Test_ConvertDecimalValueUnit(string unit, decimal value) => Tes
 
                 return (result.Unit, result.Value);
             }
-
-            public (string Unit, decimal Value)? Test_ReadDecimalValueUnit(JToken jsonToken)
-            {
-                var result = ReadValueUnit(jsonToken);
-
-                if (result is ExtendedValueUnit {ValueType: "decimal"} decimalResult)
-                {
-                    return (result.Unit, decimal.Parse(decimalResult.ValueString, CultureInfo.InvariantCulture));
-                }
-
-                return null;
-            }
-
         }
     }
 }
diff --git a/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs b/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs
@@ -57,38 +57,20 @@ public void RegisterCustomType(Type quantity, Type unit)
 
             var unit = jsonObject.GetValue(nameof(ValueUnit.Unit), StringComparison.OrdinalIgnoreCase);
             var value = jsonObject.GetValue(nameof(ValueUnit.Value), StringComparison.OrdinalIgnoreCase);
-            var valueType = jsonObject.GetValue(nameof(ExtendedValueUnit.ValueType), StringComparison.OrdinalIgnoreCase);
-            var valueString = jsonObject.GetValue(nameof(ExtendedValueUnit.ValueString), StringComparison.OrdinalIgnoreCase);
 
             if (unit == null || value == null)
             {
                 return null;
             }
 
-            if (valueType == null)
-            {
-                if (value.Type != JTokenType.Float && value.Type != JTokenType.Integer)
-                {
-                    return null;
-                }
-
-                return new ValueUnit {
-                    Unit = unit.Value<string>() ?? throw new InvalidOperationException("Unit was not a string."),
-                    Value = value.Value<double>()
-                };
-            }
-
-            if (valueType.Type != JTokenType.String)
+            if (value.Type != JTokenType.Float && value.Type != JTokenType.Integer)
             {
                 return null;
             }
 
-            return new ExtendedValueUnit
-            {
+            return new ValueUnit {
                 Unit = unit.Value<string>() ?? throw new InvalidOperationException("Unit was not a string."),
-                Value = value.Value<double>(),
-                ValueType = valueType.Value<string>(),
-                ValueString = valueString?.Value<string>()
+                Value = value.Value<double>()
             };
         }
 
@@ -247,27 +229,5 @@ protected class ValueUnit
             [JsonProperty(Order = 2)]
             public double Value { get; set; }
         }
-
-        /// <summary>
-        ///     A structure used to serialize/deserialize non-double Units.NET unit instances.
-        /// </summary>
-        /// <remarks>
-        ///     This type was added for lossless serialization of quantities with <see cref="decimal"/> values.
-        ///     The <see cref="decimal"/> type distinguishes between 100 and 100.00 but Json.NET does not, therefore we serialize decimal values as string.
-        /// </remarks>
-        protected sealed class ExtendedValueUnit : ValueUnit
-        {
-            /// <summary>
-            ///     The value as a string.
-            /// </summary>
-            [JsonProperty(Order = 3)]
-            public string? ValueString { get; set; }
-
-            /// <summary>
-            ///     The type of the value, e.g. "decimal".
-            /// </summary>
-            [JsonProperty(Order = 4)]
-            public string? ValueType { get; set; }
-        }
     }
 }
