Remove IValueQuantity

Author: Muximize

CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

@@ -1068,15 +1068,6 @@ double IQuantity.As(Enum unit)
             return (double)As(typedUnit);
         }}
 
-        /// <inheritdoc />
-        {_quantity.ValueType} IValueQuantity<{_quantity.ValueType}>.As(Enum unit)
-        {{
-            if (!(unit is {_unitEnumName} typedUnit))
-                throw new ArgumentException($""The given unit is of type {{unit.GetType()}}. Only {{typeof({_unitEnumName})}} is supported."", nameof(unit));
-
-            return As(typedUnit);
-        }}
-
         /// <summary>
         ///     Converts this {_quantity.Name} to another {_quantity.Name} with the unit representation <paramref name=""unit"" />.
         /// </summary>
@@ -1206,18 +1197,6 @@ IQuantity IQuantity.ToUnit(Enum unit)
         /// <inheritdoc />
         IQuantity<{_unitEnumName}> IQuantity<{_unitEnumName}>.ToUnit(UnitSystem unitSystem) => ToUnit(unitSystem);
 
-        /// <inheritdoc />
-        IValueQuantity<{_quantity.ValueType}> IValueQuantity<{_quantity.ValueType}>.ToUnit(Enum unit)
-        {{
-            if (unit is not {_unitEnumName} typedUnit)
-                throw new ArgumentException($""The given unit is of type {{unit.GetType()}}. Only {{typeof({_unitEnumName})}} is supported."", nameof(unit));
-
-            return ToUnit(typedUnit);
-        }}
-
-        /// <inheritdoc />
-        IValueQuantity<{_quantity.ValueType}> IValueQuantity<{_quantity.ValueType}>.ToUnit(UnitSystem unitSystem) => ToUnit(unitSystem);
-
         #endregion
 ");
         }

CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs

@@ -162,10 +162,7 @@ public abstract partial class {_quantity.Name}TestsBase : QuantityTestsBase
         public void DefaultCtor_ReturnsQuantityWithZeroValueAndBaseUnit()
         {{
             var quantity = new {_quantity.Name}();
-            Assert.Equal(0, quantity.Value);");
-            if (_quantity.ValueType == "decimal") Writer.WL(@"
-            Assert.Equal(0m, ((IValueQuantity<decimal>)quantity).Value);");
-            Writer.WL($@"
+            Assert.Equal(0, quantity.Value);
             Assert.Equal({_baseUnitFullName}, quantity.Unit);
         }}
 ");

UnitsNet.Serialization.JsonNet/AbbreviatedUnitsConverter.cs

@@ -79,15 +79,7 @@ public override void WriteJson(JsonWriter writer, IQuantity? quantity, JsonSeria
 
             // write the 'Value' using the actual type
             writer.WritePropertyName(ValueProperty);
-            if (quantity is IValueQuantity<decimal> decimalQuantity)
-            {
-                // cannot use `writer.WriteValue(decimalQuantity.Value)`: there is a hidden EnsureDecimalPlace(..) method call inside it that converts '123' to '123.0'
-                writer.WriteRawValue(decimalQuantity.Value.ToString(CultureInfo.InvariantCulture));
-            }
-            else
-            {
-                writer.WriteValue((double)quantity.Value);
-            }
+            writer.WriteValue((double)quantity.Value);
 
             //  write the 'Unit' abbreviation
             writer.WritePropertyName(UnitProperty);

UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs

@@ -178,18 +178,6 @@ protected ValueUnit ConvertIQuantity(IQuantity quantity)
         {
             quantity = quantity ?? throw new ArgumentNullException(nameof(quantity));
 
-            if (quantity is IValueQuantity<decimal> d)
-            {
-                return new ExtendedValueUnit
-                {
-                    Unit = $"{quantity.QuantityInfo.UnitType.Name}.{quantity.Unit}",
-                    // The type of "Value" is still double
-                    Value = (double)quantity.Value,
-                    ValueString = d.Value.ToString(CultureInfo.InvariantCulture),
-                    ValueType = "decimal"
-                };
-            }
-
             return new ValueUnit {Value = (double)quantity.Value, Unit = $"{quantity.QuantityInfo.UnitType.Name}.{quantity.Unit}"};
         }
 

UnitsNet.Tests/IValueQuantityTests.cs

@@ -148,7 +148,7 @@ public interface IQuantity<TUnitType> : IQuantity
     /// </summary>
     /// <typeparam name="TUnitType">The unit type of the quantity.</typeparam>
     /// <typeparam name="TValueType">The value type of the quantity.</typeparam>
-    public interface IQuantity<TUnitType, out TValueType> : IQuantity<TUnitType>, IValueQuantity<TValueType>
+    public interface IQuantity<TUnitType, out TValueType> : IQuantity<TUnitType>
         where TUnitType : Enum
 #if NET7_0_OR_GREATER
         where TValueType : INumber<TValueType>