Skip to content

Commit d21e526

Browse files
authored
refactor: rename to Quantity.DefaultProvider.Quantities (#1576)
Fixup of #1555
1 parent 77ada0e commit d21e526

File tree

5 files changed

+19
-21
lines changed

5 files changed

+19
-21
lines changed

CodeGen/Generators/UnitsNetGen/StaticQuantityGenerator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ public partial class Quantity
2828
/// <summary>
2929
/// Serves as a repository for predefined quantity conversion mappings, facilitating the automatic generation and retrieval of unit conversions in the UnitsNet library.
3030
/// </summary>
31-
internal static class Provider
31+
internal static class DefaultProvider
3232
{
3333
/// <summary>
3434
/// All QuantityInfo instances that are present in UnitsNet by default.
3535
/// </summary>
36-
internal static IReadOnlyList<QuantityInfo> DefaultQuantities => new QuantityInfo[]
37-
{");
36+
internal static IReadOnlyList<QuantityInfo> Quantities { get; } =
37+
[");
3838
foreach (var quantity in _quantities)
3939
Writer.WL($@"
4040
{quantity.Name}.Info,");
4141
Writer.WL(@"
42-
};
42+
];
4343
}
4444
}");
4545
return Writer.ToString();

UnitsNet/CustomCode/UnitsNetSetup.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public sealed class UnitsNetSetup
2121
{
2222
static UnitsNetSetup()
2323
{
24-
IReadOnlyCollection<QuantityInfo> quantityInfos = Quantity.Provider.DefaultQuantities;
24+
IReadOnlyCollection<QuantityInfo> quantityInfos = Quantity.DefaultProvider.Quantities;
25+
2526
// note: in order to support the ConvertByAbbreviation, the unit converter should require a UnitParser in the constructor
2627
var unitConverter = UnitConverter.CreateDefault();
2728

@@ -37,7 +38,7 @@ public UnitsNetSetup(IEnumerable<QuantityInfo> quantityInfos, UnitConverter unit
3738
{
3839
var quantityInfoLookup = new QuantityInfoLookup(quantityInfos);
3940
var unitAbbreviations = new UnitAbbreviationsCache(quantityInfoLookup);
40-
41+
4142
UnitConverter = unitConverter;
4243
UnitAbbreviations = unitAbbreviations;
4344
Formatter = new QuantityFormatter(unitAbbreviations);
@@ -68,7 +69,7 @@ public UnitsNetSetup(IEnumerable<QuantityInfo> quantityInfos, UnitConverter unit
6869
/// quantities.
6970
/// </summary>
7071
public UnitAbbreviationsCache UnitAbbreviations { get; }
71-
72+
7273
/// <summary>
7374
/// Converts a quantity to string using the specified format strings and culture-specific format providers.
7475
/// </summary>

UnitsNet/GeneratedCode/Quantity.g.cs

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet/QuantityInfoLookup.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Diagnostics.CodeAnalysis;
4-
using System.Linq;
1+
using System.Linq;
52
#if NET8_0_OR_GREATER
63
using System.Collections.Frozen;
74
using QuantityByTypeLookupDictionary = System.Collections.Frozen.FrozenDictionary<System.Type, UnitsNet.QuantityInfo>;
@@ -80,7 +77,7 @@ private UnitByKeyLookupDictionary GroupUnitsByKey()
8077
/// </remarks>
8178
public QuantityInfoLookup(IEnumerable<QuantityInfo> quantityInfos)
8279
{
83-
_quantities = quantityInfos.ToArray();
80+
_quantities = quantityInfos as QuantityInfo[] ?? quantityInfos.ToArray();
8481
_quantitiesByName = new Lazy<QuantityByNameLookupDictionary>(GroupQuantitiesByName);
8582
_quantitiesByType = new Lazy<QuantityByTypeLookupDictionary>(GroupQuantitiesByType);
8683
_quantitiesByUnitType = new Lazy<QuantityByTypeLookupDictionary>(GroupQuantitiesByUnitType);
@@ -174,7 +171,7 @@ public IQuantity From(double value, UnitKey unit)
174171
{
175172
return GetUnitInfo(unit).From(value);
176173
}
177-
174+
178175
/// <summary>
179176
/// Attempts to create a quantity from the specified value and unit.
180177
/// </summary>
@@ -194,7 +191,7 @@ public bool TryFrom(double value, [NotNullWhen(true)] Enum? unit, [NotNullWhen(t
194191
quantity = null;
195192
return false;
196193
}
197-
194+
198195
if (!TryGetUnitInfo(unit, out UnitInfo? unitInfo))
199196
{
200197
quantity = null;
@@ -270,7 +267,7 @@ public UnitInfo GetUnitByName(string quantityName, string unitName)
270267
Data = { ["quantityName"] = quantityName, ["unitName"] = unitName }
271268
};
272269
}
273-
270+
274271
/// <summary>
275272
/// Attempts to parse unit information based on its quantity and unit names.
276273
/// </summary>

UnitsNet/UnitConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static void RegisterDefaultConversions(UnitConverter unitConverter)
8585
if (unitConverter is null)
8686
throw new ArgumentNullException(nameof(unitConverter));
8787

88-
foreach(var quantity in Quantity.Provider.DefaultQuantities)
88+
foreach (var quantity in Quantity.DefaultProvider.Quantities)
8989
{
9090
var registerMethod = quantity.QuantityType.GetMethod(nameof(Length.RegisterDefaultConversions), BindingFlags.NonPublic | BindingFlags.Static);
9191
registerMethod?.Invoke(null, new object[]{unitConverter});
@@ -369,7 +369,7 @@ public static bool TryConvertByName(double inputValue, string quantityName, stri
369369
result = quantity.As(toUnitInfo.Value);
370370
return true;
371371
}
372-
372+
373373
result = 0d;
374374
return false;
375375
}

0 commit comments

Comments
 (0)