reduce dependency of Smdn.Fundamental.Exception

Author: smdn

src/Common/Shim/System/ArgumentExceptionShim.cs

@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2025 smdn <smdn@smdn.jp>
+// SPDX-License-Identifier: MIT
+namespace System;
+
+internal static class ArgumentExceptionShim {
+  public static void ThrowIfNullOrEmpty(string? argument, string? paramName)
+  {
+#if SYSTEM_ARGUMENTEXCEPTION_THROWIFNULLOREMPTY
+    ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
+#else
+    if (argument is null)
+      throw new ArgumentNullException(paramName: paramName);
+    if (argument.Length == 0)
+      throw Smdn.ExceptionUtils.CreateArgumentMustBeNonEmptyString(paramName: paramName);
+#endif
+  }
+}

src/Common/Shim/System/ArgumentOutOfRangeExceptionShim.cs

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2025 smdn <smdn@smdn.jp>
+// SPDX-License-Identifier: MIT
+namespace System;
+
+internal static class ArgumentOutOfRangeExceptionShim {
+  public static void ThrowIfLessThanOrEqual<T>(T value, T other, string? paramName)
+    where T : IComparable<T>
+  {
+#if NET8_0_OR_GREATER
+    ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(value, other, paramName);
+#else
+    if (value.CompareTo(other) <= 0)
+      throw Smdn.ExceptionUtils.CreateArgumentMustBeGreaterThan(other, paramName: paramName, actualValue: value);
+#endif
+  }
+}

src/Smdn.Net.MuninNode/Smdn.Net.MuninNode.csproj

@@ -36,7 +36,12 @@ This library also provides abstraction APIs for implementing Munin-Plugin. By us
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
     <PackageReference Include="Smdn.Fundamental.Encoding.Buffer" Version="[3.0.0,4.0.0)" Condition="$(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('netstandard'))" />
-    <PackageReference Include="Smdn.Fundamental.Exception" Version="[3.0.0,4.0.0)" />
+    <PackageReference Include="Smdn.Fundamental.Exception" Version="[3.0.0,4.0.0)" Condition="$(TargetFramework.StartsWith('netstandard'))" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)..\Common\Shim\System\ArgumentExceptionShim.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)..\Common\Shim\System\ArgumentOutOfRangeExceptionShim.cs"/>
   </ItemGroup>
 
   <Target Name="GenerateReadmeFileContent">

src/Smdn.Net.MuninNode/Smdn.Net.MuninNode/MuninNodeOptions.cs

@@ -76,10 +76,7 @@ public int Port {
   public string HostName {
     get => hostName;
     set {
-      if (value is null)
-        throw new ArgumentNullException(nameof(HostName));
-      if (value.Length == 0)
-        throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(HostName));
+      ArgumentExceptionShim.ThrowIfNullOrEmpty(value, nameof(HostName));
 
       hostName = value;
     }

src/Smdn.Net.MuninNode/Smdn.Net.MuninPlugin/Plugin.cs

@@ -30,10 +30,7 @@ public Plugin(
     IReadOnlyCollection<IPluginField> fields
   )
   {
-    if (name is null)
-      throw new ArgumentNullException(nameof(name));
-    if (name.Length == 0)
-      throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(name));
+    ArgumentExceptionShim.ThrowIfNullOrEmpty(name, nameof(name));
 
     Name = name;
     GraphAttributes = graphAttributes ?? throw new ArgumentNullException(nameof(graphAttributes));

src/Smdn.Net.MuninNode/Smdn.Net.MuninPlugin/PluginFieldAttributes.cs

@@ -79,10 +79,7 @@ public PluginFieldAttributes(
     string? negativeFieldName
   )
   {
-    if (label is null)
-      throw new ArgumentNullException(nameof(label));
-    if (label.Length == 0)
-      throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(label));
+    ArgumentExceptionShim.ThrowIfNullOrEmpty(label, nameof(label));
 
     Label = label;
     GraphStyle = graphStyle;

src/Smdn.Net.MuninNode/Smdn.Net.MuninPlugin/PluginFieldBase.cs

@@ -54,17 +54,15 @@ protected PluginFieldBase(
     string? negativeFieldName
   )
   {
-    if (label is null)
-      throw new ArgumentNullException(nameof(label));
-    if (label.Length == 0)
-      throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(label));
+    ArgumentExceptionShim.ThrowIfNullOrEmpty(label, nameof(label));
+
     if (!RegexValidFieldLabel.IsMatch(label))
       throw new ArgumentException($"'{label}' is invalid for field name. The value of {nameof(label)} must match the following regular expression: '{RegexValidFieldLabel}'", nameof(label));
 
     name ??= GetDefaultNameFromLabel(label);
 
-    if (name.Length == 0)
-      throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(name));
+    ArgumentExceptionShim.ThrowIfNullOrEmpty(name, nameof(name));
+
     if (!RegexValidFieldName.IsMatch(name))
       throw new ArgumentException($"'{name}' is invalid for field name. The value of {nameof(name)} must match the following regular expression: '{RegexValidFieldName}'", nameof(name));
 
@@ -121,10 +119,7 @@ async ValueTask<string> IPluginField.GetFormattedValueStringAsync(CancellationTo
 
   private static string GetDefaultNameFromLabel(string label)
   {
-    if (label is null)
-      throw new ArgumentNullException(nameof(label));
-    if (label.Length == 0)
-      throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(label));
+    ArgumentExceptionShim.ThrowIfNullOrEmpty(label, nameof(label));
 
     return RegexInvalidFieldNameChars.Replace(
       RegexInvalidFieldNamePrefix.Replace(label, string.Empty),

src/Smdn.Net.MuninNode/Smdn.Net.MuninPlugin/PluginGraphAttributes.cs

@@ -91,26 +91,15 @@ public PluginGraphAttributes(
     string? totalValueLabel
   )
   {
-    if (title is null)
-      throw new ArgumentNullException(nameof(title));
-    if (title.Length == 0)
-      throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(title));
-    if (category is null)
-      throw new ArgumentNullException(nameof(category));
-    if (category.Length == 0)
-      throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(category));
-    if (arguments is null)
-      throw new ArgumentNullException(nameof(arguments));
-    if (arguments.Length == 0)
-      throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(arguments));
-    if (verticalLabel is null)
-      throw new ArgumentNullException(nameof(verticalLabel));
-    if (verticalLabel.Length == 0)
-      throw ExceptionUtils.CreateArgumentMustBeNonEmptyString(nameof(verticalLabel));
-    if (width.HasValue && width.Value <= 0)
-      throw ExceptionUtils.CreateArgumentMustBeGreaterThan(0, nameof(width), width);
-    if (height.HasValue && height.Value <= 0)
-      throw ExceptionUtils.CreateArgumentMustBeGreaterThan(0, nameof(height), height);
+    ArgumentExceptionShim.ThrowIfNullOrEmpty(title, nameof(title));
+    ArgumentExceptionShim.ThrowIfNullOrEmpty(category, nameof(category));
+    ArgumentExceptionShim.ThrowIfNullOrEmpty(verticalLabel, nameof(verticalLabel));
+    ArgumentExceptionShim.ThrowIfNullOrEmpty(arguments, nameof(arguments));
+
+    if (width.HasValue)
+      ArgumentOutOfRangeExceptionShim.ThrowIfLessThanOrEqual(width.Value, 0, nameof(width));
+    if (height.HasValue)
+      ArgumentOutOfRangeExceptionShim.ThrowIfLessThanOrEqual(height.Value, 0, nameof(height));
 
     Title = title;
     Category = category;