RemovePreconditions

BackgroundProcessing/Abstractions/JobDetails.cs

@@ -1,6 +1,4 @@
-using Odin.DesignContracts;
-
-namespace Odin.BackgroundProcessing
+namespace Odin.BackgroundProcessing
 {
     /// <summary>
     /// Represents the outcome of an attempt to schedule a job with the background jobs engine.
@@ -14,7 +12,7 @@ public sealed record JobDetails
         /// <param name="scheduledFor"></param>
         public JobDetails(string jobId, DateTimeOffset scheduledFor)
         {
-            Precondition.Requires(!string.IsNullOrWhiteSpace(jobId));
+            ArgumentException.ThrowIfNullOrWhiteSpace(jobId);
             JobId = jobId;
             ScheduledFor = scheduledFor;
         }

BackgroundProcessing/Abstractions/Odin.BackgroundProcessing.Abstractions.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-
         <ImplicitUsings>true</ImplicitUsings>
         <PackageId>Odin.BackgroundProcessing.Abstractions</PackageId>
         <RootNamespace>Odin.BackgroundProcessing</RootNamespace>
@@ -17,7 +16,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\DesignContracts\Core\Odin.DesignContracts.csproj" />
       <ProjectReference Include="..\..\System\Result\Odin.System.Result.csproj" />
       <ProjectReference Include="..\..\System\Strings\Odin.System.Strings.csproj" />
     </ItemGroup>

BackgroundProcessing/Core/BackgroundProcessingOptions.cs

@@ -1,5 +1,4 @@
-using Odin.DesignContracts;
-using Odin.System;
+using Odin.System;
 
 namespace Odin.BackgroundProcessing
 {
@@ -18,7 +17,7 @@ public string Provider
             get => _provider;
             set
             {
-                Precondition.Requires(!string.IsNullOrWhiteSpace(value));
+                ArgumentException.ThrowIfNullOrWhiteSpace(value);
                 _provider = value.Replace("BackgroundProcessor", "", StringComparison.OrdinalIgnoreCase);
             }
         }

BackgroundProcessing/Core/DependencyInjectionExtensions.cs

@@ -1,8 +1,7 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Odin.BackgroundProcessing;
-using Odin.DesignContracts;
 using Odin.System;
 
 // ReSharper disable once CheckNamespace
@@ -80,7 +79,7 @@
             this IServiceCollection serviceCollection, IConfiguration configuration,
             IConfigurationSection configurationSection, Func<IServiceProvider, string>? sqlServerConnectionStringFactory = null)
         {
-            Precondition.RequiresNotNull(configurationSection);
+            ArgumentNullException.ThrowIfNull(configurationSection);
 
             BackgroundProcessingOptions options = new BackgroundProcessingOptions();
             configurationSection.Bind(options);
@@ -97,7 +96,7 @@
 
             if (options.Provider == BackgroundProcessingProviders.Null)
             {
                 serviceCollection.AddTransient<IBackgroundProcessor, NullBackgroundProcessor>();
                 return;
             }
 
@@ -131,8 +130,8 @@
         /// <param name="app"></param>
         public static IApplicationBuilder UseBackgroundProcessing(this IApplicationBuilder app, IServiceProvider appServices)
         {
-            Precondition.RequiresNotNull(appServices);
-            Precondition.RequiresNotNull(app);
+            ArgumentNullException.ThrowIfNull(appServices);
+            ArgumentNullException.ThrowIfNull(app);
 
             BackgroundProcessingOptions options = appServices.GetRequiredService<BackgroundProcessingOptions>();
             if (options.Provider == BackgroundProcessingProviders.Null)

BackgroundProcessing/Core/Odin.BackgroundProcessing.csproj

@@ -17,7 +17,6 @@
         <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\DesignContracts\Core\Odin.DesignContracts.csproj"/>
         <ProjectReference Include="..\..\System\Activator2\Odin.System.Activator2.csproj"/>
         <ProjectReference Include="..\..\System\Result\Odin.System.Result.csproj"/>
         <ProjectReference Include="..\Abstractions\Odin.BackgroundProcessing.Abstractions.csproj"/>

BackgroundProcessing/Hangfire/HangfireBackgroundProcessor.cs

@@ -1,6 +1,5 @@
-using Hangfire;
+using Hangfire;
 using Hangfire.Annotations;
-using Odin.DesignContracts;
 using Odin.Logging;
 using Odin.System;
 using System.Linq.Expressions;
@@ -25,9 +24,9 @@ public sealed class HangfireBackgroundProcessor : IBackgroundProcessor
         /// <param name="logger"></param>
         public HangfireBackgroundProcessor(IRecurringJobManagerV2 recurringJobManager, IBackgroundJobClient jobClient, ILoggerWrapper<HangfireBackgroundProcessor> logger)
         {
-            Precondition.RequiresNotNull(recurringJobManager);
-            Precondition.RequiresNotNull(jobClient);
-            Precondition.RequiresNotNull(logger);
+            ArgumentNullException.ThrowIfNull(recurringJobManager);
+            ArgumentNullException.ThrowIfNull(jobClient);
+            ArgumentNullException.ThrowIfNull(logger);
             _recurringJobManager = recurringJobManager;
             _jobClient = jobClient;
             _logger = logger;

BackgroundProcessing/Hangfire/HangfirePolicyAuthorisationFilter.cs

@@ -3,7 +3,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Odin.DesignContracts;
 
 namespace Odin.BackgroundProcessing
 {
@@ -20,7 +19,7 @@ public sealed class HangfirePolicyAuthorisationFilter : IDashboardAuthorizationF
         /// <param name="policyName"></param>
         public HangfirePolicyAuthorisationFilter(string policyName)
         {
-            Precondition.Requires(!string.IsNullOrWhiteSpace(policyName));
+            ArgumentException.ThrowIfNullOrWhiteSpace(policyName);
             _policyName = policyName.Trim();
         }
 

BackgroundProcessing/Hangfire/HangfireServiceInjector.cs

@@ -5,7 +5,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Odin.DesignContracts;
 
 namespace Odin.BackgroundProcessing
 {
@@ -16,8 +15,8 @@ public class HangfireServiceInjector : IBackgroundProcessorServiceInjector
         public void TryAddBackgroundProcessor(IServiceCollection serviceCollection, IConfiguration configuration,
             IConfigurationSection backgroundProcessingSection, Func<IServiceProvider, string>? connectionStringFactory = null)
         {
-            Precondition.RequiresNotNull(serviceCollection);
-            Precondition.RequiresNotNull(backgroundProcessingSection);
+            ArgumentNullException.ThrowIfNull(serviceCollection);
+            ArgumentNullException.ThrowIfNull(backgroundProcessingSection);
             IConfigurationSection? providerSection =
                 backgroundProcessingSection.GetSection(BackgroundProcessingProviders.Hangfire);
             if (providerSection == null)

BackgroundProcessing/Hangfire/Odin.BackgroundProcessing.Hangfire.csproj

@@ -1,14 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-
     <ImplicitUsings>true</ImplicitUsings>
     <PackageId>Odin.BackgroundProcessing.Hangfire</PackageId>
     <RootNamespace>Odin.BackgroundProcessing</RootNamespace>
     <PackageIcon>icon.png</PackageIcon>
     <Description>Concrete implementation of IBackgroundProcessor via Hangfire.
-
-
-
     </Description>
   </PropertyGroup>
   <ItemGroup>

Configuration/Tests/PrefixedAzureKeyVaultSecretManager/PrefixedAzureKeyVaultSecretManagerTests.cs

@@ -6,7 +6,6 @@
 using Odin.Configuration;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using Xunit;
 
 namespace Tests.Odin.Configuration;
 

Data/SqlScriptsRunner/Odin.Data.SqlScriptsRunner.csproj

@@ -20,7 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\DesignContracts\Core\Odin.DesignContracts.csproj" />
     <ProjectReference Include="..\..\System\Result\Odin.System.Result.csproj" />
   </ItemGroup>
   <ItemGroup>

Data/SqlScriptsRunner/SqlScriptsRunner.cs

@@ -5,7 +5,6 @@
 using DbUp.Helpers;
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
-using Odin.DesignContracts;
 using Odin.System;
 using System.Reflection;
 
@@ -43,15 +42,15 @@ private SqlScriptsRunner(Assembly assemblyWithEmbeddedScripts)
         {
             // Contract.Requires(logger);
             // _logger = logger;
-            Precondition.Requires(assemblyWithEmbeddedScripts != null!);
-            _assemblyWithEmbeddedScripts = assemblyWithEmbeddedScripts!;
+            ArgumentNullException.ThrowIfNull(assemblyWithEmbeddedScripts);
+            _assemblyWithEmbeddedScripts = assemblyWithEmbeddedScripts;
         }
 
         public static ResultValue<SqlScriptsRunner> CreateFromConnectionStringName(string connectionStringName,
             Assembly assemblyWithEmbeddedScripts, IConfiguration configuration)
         {
-            Precondition.Requires(configuration != null!);
-            Precondition.Requires(assemblyWithEmbeddedScripts != null!);
+            ArgumentNullException.ThrowIfNull(configuration);
+            ArgumentNullException.ThrowIfNull(assemblyWithEmbeddedScripts);
             SqlScriptsRunner runner = new SqlScriptsRunner(assemblyWithEmbeddedScripts)
             {
                 ConnectionString = configuration.GetConnectionString(connectionStringName)!
@@ -76,8 +75,8 @@ public static ResultValue<SqlScriptsRunner> CreateFromConnectionStringName(strin
 
         public static ResultValue<SqlScriptsRunner> CreateFromConnectionString(string connectionString, Assembly assemblyWithEmbeddedScripts)
         {
-            Precondition.Requires(assemblyWithEmbeddedScripts != null!);
-            Precondition.Requires(!string.IsNullOrWhiteSpace(connectionString));
+            ArgumentNullException.ThrowIfNull(assemblyWithEmbeddedScripts);
+            ArgumentException.ThrowIfNullOrWhiteSpace(connectionString);
             SqlScriptsRunner runner = new SqlScriptsRunner(assemblyWithEmbeddedScripts)
             {
                 ConnectionString = connectionString

Email/Core/Attachment.cs

@@ -1,4 +1,3 @@
-using Odin.DesignContracts;
 using System.Text.Json.Serialization;
 
 namespace Odin.Email
@@ -17,9 +16,9 @@ public sealed record Attachment
         /// <param name="contentType"></param>
         public Attachment(string fileName, Stream data, string contentType)
         {
-            Precondition.Requires(!string.IsNullOrWhiteSpace(fileName));
-            Precondition.Requires(!string.IsNullOrWhiteSpace(contentType));
-            Precondition.RequiresNotNull(data);
+            ArgumentException.ThrowIfNullOrWhiteSpace(fileName);
+            ArgumentException.ThrowIfNullOrWhiteSpace(contentType);
+            ArgumentNullException.ThrowIfNull(data);
             FileName = fileName;
             Data = data;
             ContentType = contentType;

Email/Core/DependencyInjectionExtensions.cs

@@ -1,6 +1,5 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Odin.DesignContracts;
 using Odin.Email;
 using Odin.System;
 
@@ -41,7 +40,7 @@ public static void AddOdinEmailSending(
         public static void AddOdinEmailSending(
             this IServiceCollection serviceCollection, IConfigurationSection configurationSection)
         {
-            Precondition.RequiresNotNull(configurationSection);
+            ArgumentNullException.ThrowIfNull(configurationSection);
 
             EmailSendingOptions emailOptions = new EmailSendingOptions();
             configurationSection.Bind(emailOptions);

Email/Core/EmailAddress.cs

@@ -1,4 +1,3 @@
-using Odin.DesignContracts;
 
 namespace Odin.Email
 {
@@ -24,7 +23,7 @@ public sealed class EmailAddress
         /// <param name="displayName"></param>
         public EmailAddress(string emailAddress, string? displayName = null)
         {
-            Precondition.Requires<ArgumentNullException>(!string.IsNullOrWhiteSpace(emailAddress), $"{nameof(emailAddress)} is required");
+            ArgumentException.ThrowIfNullOrWhiteSpace(emailAddress);
             if (string.IsNullOrWhiteSpace(displayName))
             {
                 DisplayName = null;

Email/Core/EmailMessage.cs

@@ -1,5 +1,3 @@
-using Odin.DesignContracts;
-
 namespace Odin.Email
 {
     /// <summary>
@@ -29,10 +27,8 @@ public EmailMessage()
         public EmailMessage(string toEmailAddress, string fromEmailAddress, string? subject, string? body,
             bool isHtml = false)
         {
-            Precondition.Requires<ArgumentException>(!string.IsNullOrWhiteSpace(toEmailAddress),
-                $"{nameof(toEmailAddress)} is required");
-            Precondition.Requires<ArgumentException>(!string.IsNullOrWhiteSpace(fromEmailAddress),
-                $"{nameof(fromEmailAddress)} is required");
+            ArgumentException.ThrowIfNullOrWhiteSpace(toEmailAddress);
+            ArgumentException.ThrowIfNullOrWhiteSpace(fromEmailAddress);
             if (string.IsNullOrWhiteSpace(subject))
             {
                 Subject = "";
@@ -207,7 +203,7 @@ public Dictionary<string, string> Headers
         /// <param name="attachment"></param>
         public void Attach(Attachment attachment)
         {
-            Precondition.RequiresNotNull(attachment);
+            ArgumentNullException.ThrowIfNull(attachment);
             Attachments.Add(attachment);
         }
     }

Email/Core/EmailSendingOptions.cs

@@ -1,5 +1,4 @@
-using Odin.DesignContracts;
-using Odin.System;
+using Odin.System;
 
 
 namespace Odin.Email
@@ -52,8 +51,7 @@ public string Provider
             get => _provider;
             init
             {
-                Precondition.Requires(!string.IsNullOrWhiteSpace(value));
-                // Ensure MailgunEmailSender is changed to Mailgun for backwards compatibility
+                ArgumentException.ThrowIfNullOrWhiteSpace(value);
                 _provider = value.Replace("EmailSender", "", StringComparison.OrdinalIgnoreCase);
             }
         }

Email/Core/Odin.Email.csproj

@@ -21,7 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\DesignContracts\Core\Odin.DesignContracts.csproj" />
     <ProjectReference Include="..\..\System\Activator2\Odin.System.Activator2.csproj" />
     <ProjectReference Include="..\..\System\Strings\Odin.System.Strings.csproj" />
     <ProjectReference Include="..\..\System\Result\Odin.System.Result.csproj" />

Email/Mailgun/MailgunEmailSender.cs

@@ -1,5 +1,4 @@
-using Microsoft.Extensions.Logging;
-using Odin.DesignContracts;
+using Microsoft.Extensions.Logging;
 using Odin.Logging;
 using Odin.System;
 using Polly;
@@ -42,9 +41,9 @@ public sealed class MailgunEmailSender : IEmailSender
         public MailgunEmailSender(MailgunOptions mailgunSettings,
             EmailSendingOptions emailSettings, ILoggerWrapper<MailgunEmailSender> logger)
         {
-            Precondition.RequiresNotNull(mailgunSettings);
-            Precondition.RequiresNotNull(emailSettings);
-            Precondition.RequiresNotNull(logger);
+            ArgumentNullException.ThrowIfNull(mailgunSettings);
+            ArgumentNullException.ThrowIfNull(emailSettings);
+            ArgumentNullException.ThrowIfNull(logger);
             _mailgunSettings = mailgunSettings;
             _emailSettings = emailSettings;
             _logger = logger;
@@ -59,7 +58,10 @@ public MailgunEmailSender(MailgunOptions mailgunSettings,
                 endPoint += "/";
             }
 
-            Precondition.Requires(!string.IsNullOrWhiteSpace(_mailgunSettings.Domain), "Domain missing in MailgunOptions");
+            if (string.IsNullOrWhiteSpace(_mailgunSettings.Domain))
+            {
+                throw new ArgumentException("Domain missing in MailgunOptions", nameof(mailgunSettings));
+            }
             string subPath = $"{_mailgunSettings.Domain}/messages";
             // Leading slash will replace the /v3
             if (subPath[0] == '/')
@@ -68,7 +70,10 @@ public MailgunEmailSender(MailgunOptions mailgunSettings,
             }
             _httpClient.BaseAddress = new Uri(new Uri(endPoint), subPath);
 
-            Precondition.Requires(!string.IsNullOrWhiteSpace(_mailgunSettings.ApiKey), "ApiKey missing in MailgunOptions");
+            if (string.IsNullOrWhiteSpace(_mailgunSettings.ApiKey))
+            {
+                throw new ArgumentException("ApiKey missing in MailgunOptions", nameof(mailgunSettings));
+            }
 
             byte[] byteArray = Encoding.ASCII.GetBytes($"api:{_mailgunSettings.ApiKey}");
             _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
@@ -85,9 +90,11 @@ private static string EncodeAsHtml(string input)
 
         private static ByteArrayContent ToByteArrayContent(Stream stream)
         {
-            Precondition.RequiresNotNull(stream);
-            Precondition.Requires(stream.CanRead, "Stream.CanRead must be true");
-            Precondition.Requires(stream.CanSeek, "Stream.CanSeek must be true");
+            ArgumentNullException.ThrowIfNull(stream);
+            if (!stream.CanRead || !stream.CanSeek)
+            {
+                throw new ArgumentException("Stream.CanRead and Stream.CanSeek must be true", nameof(stream));
+            }
 
             try
             {
@@ -112,9 +119,12 @@ private static ByteArrayContent ToByteArrayContent(Stream stream)
         /// <exception cref="HttpRequestException"></exception>
         public async Task<ResultValue<string>> SendEmail(IEmailMessage email)
         {
-            Precondition.RequiresNotNull(email);
-            Precondition.Requires(email.To.Any(), "Mailgun requires one or more to addresses.");
-            Precondition.Requires(!string.IsNullOrWhiteSpace(email.Subject), "Mailgun requires an email subject");
+            ArgumentNullException.ThrowIfNull(email);
+            if (!email.To.Any())
+            {
+                throw new ArgumentException("Mailgun requires one or more to addresses.", nameof(email));
+            }
+            ArgumentException.ThrowIfNullOrWhiteSpace(email.Subject,"Mailgun requires an email subject");
 
             try
             {