diff --git a/src/StevanFreeborn.Results/Result.cs b/src/StevanFreeborn.Results/Result.cs index b1ee909..65529ea 100644 --- a/src/StevanFreeborn.Results/Result.cs +++ b/src/StevanFreeborn.Results/Result.cs @@ -53,23 +53,23 @@ namespace StevanFreeborn.Results /// Thrown when func or errorHandler is null. public static Result Try(Func func, Func errorHandler) where TError : IError { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(func); - #else - if (func is null) - { - throw new ArgumentNullException(nameof(func)); - } - #endif +#else + if (func is null) + { + throw new ArgumentNullException(nameof(func)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(errorHandler); - #else - if (errorHandler is null) - { - throw new ArgumentNullException(nameof(errorHandler)); - } - #endif +#else + if (errorHandler is null) + { + throw new ArgumentNullException(nameof(errorHandler)); + } +#endif try { @@ -150,14 +150,14 @@ namespace StevanFreeborn.Results /// Thrown when mapper is null. public Result Map(Func mapper) { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(mapper); - #else - if (mapper is null) - { - throw new ArgumentNullException(nameof(mapper)); - } - #endif +#else + if (mapper is null) + { + throw new ArgumentNullException(nameof(mapper)); + } +#endif return IsSuccess ? Result.Ok(mapper(Value)) : Result.Fail(Error); } @@ -170,14 +170,14 @@ namespace StevanFreeborn.Results /// Thrown when mapper is null. public Result MapError(Func mapper) where TNewError : IError { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(mapper); - #else - if (mapper is null) - { - throw new ArgumentNullException(nameof(mapper)); - } - #endif +#else + if (mapper is null) + { + throw new ArgumentNullException(nameof(mapper)); + } +#endif return IsFailure ? Result.Fail(mapper(Error)) : Result.Ok(Value); } @@ -191,14 +191,14 @@ namespace StevanFreeborn.Results /// Thrown when binder is null. public Result Bind(Func> binder) { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(binder); - #else - if (binder is null) - { - throw new ArgumentNullException(nameof(binder)); - } - #endif +#else + if (binder is null) + { + throw new ArgumentNullException(nameof(binder)); + } +#endif return IsSuccess ? binder(Value) : Result.Fail(Error); } @@ -213,23 +213,23 @@ namespace StevanFreeborn.Results /// Thrown when onSuccess or onFailure is null. public TResult Match(Func onSuccess, Func onFailure) { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onSuccess); - #else - if (onSuccess is null) - { - throw new ArgumentNullException(nameof(onSuccess)); - } - #endif +#else + if (onSuccess is null) + { + throw new ArgumentNullException(nameof(onSuccess)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onFailure); - #else - if (onFailure is null) - { - throw new ArgumentNullException(nameof(onFailure)); - } - #endif +#else + if (onFailure is null) + { + throw new ArgumentNullException(nameof(onFailure)); + } +#endif return IsSuccess ? onSuccess(Value) : onFailure(Error); } @@ -242,23 +242,23 @@ namespace StevanFreeborn.Results /// Thrown when onSuccess or onFailure is null. public void Match(Action onSuccess, Action onFailure) { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onSuccess); - #else - if (onSuccess is null) - { - throw new ArgumentNullException(nameof(onSuccess)); - } - #endif +#else + if (onSuccess is null) + { + throw new ArgumentNullException(nameof(onSuccess)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onFailure); - #else - if (onFailure is null) - { - throw new ArgumentNullException(nameof(onFailure)); - } - #endif +#else + if (onFailure is null) + { + throw new ArgumentNullException(nameof(onFailure)); + } +#endif if (IsSuccess) { @@ -278,14 +278,14 @@ namespace StevanFreeborn.Results /// Thrown when action is null. public Result Map(Action action) { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(action); - #else - if (action is null) - { - throw new ArgumentNullException(nameof(action)); - } - #endif +#else + if (action is null) + { + throw new ArgumentNullException(nameof(action)); + } +#endif if (IsSuccess) { @@ -302,14 +302,14 @@ namespace StevanFreeborn.Results /// Thrown when action is null. public Result Map(Action action) { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(action); - #else - if (action is null) - { - throw new ArgumentNullException(nameof(action)); - } - #endif +#else + if (action is null) + { + throw new ArgumentNullException(nameof(action)); + } +#endif if (IsSuccess) { diff --git a/src/StevanFreeborn.Results/ResultAsyncExtensions.cs b/src/StevanFreeborn.Results/ResultAsyncExtensions.cs index a081816..eeff219 100644 --- a/src/StevanFreeborn.Results/ResultAsyncExtensions.cs +++ b/src/StevanFreeborn.Results/ResultAsyncExtensions.cs @@ -19,23 +19,23 @@ namespace StevanFreeborn.Results public static async Task> MapAsync(this Result result, Func> mapper) where TError : IError { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(result); - #else - if (result is null) - { - throw new ArgumentNullException(nameof(result)); - } - #endif +#else + if (result is null) + { + throw new ArgumentNullException(nameof(result)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(mapper); - #else - if (mapper is null) - { - throw new ArgumentNullException(nameof(mapper)); - } - #endif +#else + if (mapper is null) + { + throw new ArgumentNullException(nameof(mapper)); + } +#endif return result.IsSuccess ? await mapper(result.Value).ConfigureAwait(false) : result.Error; } @@ -54,23 +54,23 @@ namespace StevanFreeborn.Results where TError : IError where TNewError : IError { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(result); - #else - if (result is null) - { - throw new ArgumentNullException(nameof(result)); - } - #endif +#else + if (result is null) + { + throw new ArgumentNullException(nameof(result)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(mapper); - #else - if (mapper is null) - { - throw new ArgumentNullException(nameof(mapper)); - } - #endif +#else + if (mapper is null) + { + throw new ArgumentNullException(nameof(mapper)); + } +#endif return result.IsFailure ? await mapper(result.Error).ConfigureAwait(false) : Result.Ok(result.Value); } @@ -86,23 +86,23 @@ namespace StevanFreeborn.Results public static async Task> MapAsync(this Result result, Func onSuccess) where TError : IError { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(result); - #else - if (result is null) - { - throw new ArgumentNullException(nameof(result)); - } - #endif +#else + if (result is null) + { + throw new ArgumentNullException(nameof(result)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onSuccess); - #else - if (onSuccess is null) - { - throw new ArgumentNullException(nameof(onSuccess)); - } - #endif +#else + if (onSuccess is null) + { + throw new ArgumentNullException(nameof(onSuccess)); + } +#endif if (result.IsSuccess) { @@ -123,23 +123,23 @@ namespace StevanFreeborn.Results public static async Task> BindAsync(this Result result, Func>> onSuccess) where TError : IError { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(result); - #else - if (result is null) - { - throw new ArgumentNullException(nameof(result)); - } - #endif +#else + if (result is null) + { + throw new ArgumentNullException(nameof(result)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onSuccess); - #else - if (onSuccess is null) - { - throw new ArgumentNullException(nameof(onSuccess)); - } - #endif +#else + if (onSuccess is null) + { + throw new ArgumentNullException(nameof(onSuccess)); + } +#endif return result.IsSuccess ? await onSuccess(result.Value).ConfigureAwait(false) : result; } @@ -157,32 +157,32 @@ namespace StevanFreeborn.Results public static async Task MatchAsync(this Result result, Func> onSuccess, Func> onFailure) where TError : IError { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(result); - #else - if (result is null) - { - throw new ArgumentNullException(nameof(result)); - } - #endif +#else + if (result is null) + { + throw new ArgumentNullException(nameof(result)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onSuccess); - #else - if (onSuccess is null) - { - throw new ArgumentNullException(nameof(onSuccess)); - } - #endif +#else + if (onSuccess is null) + { + throw new ArgumentNullException(nameof(onSuccess)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onFailure); - #else - if (onFailure is null) - { - throw new ArgumentNullException(nameof(onFailure)); - } - #endif +#else + if (onFailure is null) + { + throw new ArgumentNullException(nameof(onFailure)); + } +#endif return result.IsSuccess ? await onSuccess(result.Value).ConfigureAwait(false) @@ -208,23 +208,23 @@ namespace StevanFreeborn.Results /// Thrown when action or errorHandler is null. public static async Task> TryAsync(Func action, Func errorHandler) { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(action); - #else - if (action is null) - { - throw new ArgumentNullException(nameof(action)); - } - #endif +#else + if (action is null) + { + throw new ArgumentNullException(nameof(action)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(errorHandler); - #else - if (errorHandler is null) - { - throw new ArgumentNullException(nameof(errorHandler)); - } - #endif +#else + if (errorHandler is null) + { + throw new ArgumentNullException(nameof(errorHandler)); + } +#endif try { @@ -250,23 +250,23 @@ namespace StevanFreeborn.Results public static async Task> BindAsync(this Result result, Func>> binder) where TError : IError { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(result); - #else - if (result is null) - { - throw new ArgumentNullException(nameof(result)); - } - #endif +#else + if (result is null) + { + throw new ArgumentNullException(nameof(result)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(binder); - #else - if (binder is null) - { - throw new ArgumentNullException(nameof(binder)); - } - #endif +#else + if (binder is null) + { + throw new ArgumentNullException(nameof(binder)); + } +#endif return result.IsSuccess ? await binder(result.Value).ConfigureAwait(false) : Result.Fail(result.Error); } @@ -285,32 +285,32 @@ namespace StevanFreeborn.Results public static async Task MatchAsync(this Result result, Func> onSuccess, Func> onFailure) where TError : IError { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(result); - #else - if (result is null) - { - throw new ArgumentNullException(nameof(result)); - } - #endif +#else + if (result is null) + { + throw new ArgumentNullException(nameof(result)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onSuccess); - #else - if (onSuccess is null) - { - throw new ArgumentNullException(nameof(onSuccess)); - } - #endif +#else + if (onSuccess is null) + { + throw new ArgumentNullException(nameof(onSuccess)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(onFailure); - #else - if (onFailure is null) - { - throw new ArgumentNullException(nameof(onFailure)); - } - #endif +#else + if (onFailure is null) + { + throw new ArgumentNullException(nameof(onFailure)); + } +#endif return result.IsSuccess ? await onSuccess(result.Value).ConfigureAwait(false) @@ -338,23 +338,23 @@ namespace StevanFreeborn.Results /// Thrown when func or errorHandler is null. public static async Task> TryAsync(Func> func, Func errorHandler) { - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(func); - #else - if (func is null) - { - throw new ArgumentNullException(nameof(func)); - } - #endif +#else + if (func is null) + { + throw new ArgumentNullException(nameof(func)); + } +#endif - #if NET6_0_OR_GREATER +#if NET6_0_OR_GREATER ArgumentNullException.ThrowIfNull(errorHandler); - #else - if (errorHandler is null) - { - throw new ArgumentNullException(nameof(errorHandler)); - } - #endif +#else + if (errorHandler is null) + { + throw new ArgumentNullException(nameof(errorHandler)); + } +#endif try { diff --git a/tests/StevanFreeborn.Results.Tests/ErrorTests.cs b/tests/StevanFreeborn.Results.Tests/ErrorTests.cs index 132d790..1242fca 100644 --- a/tests/StevanFreeborn.Results.Tests/ErrorTests.cs +++ b/tests/StevanFreeborn.Results.Tests/ErrorTests.cs @@ -61,4 +61,4 @@ public class ErrorTests await Assert.That(error).IsAssignableTo(); } -} +} \ No newline at end of file diff --git a/tests/StevanFreeborn.Results.Tests/ResultAsyncExtensionsTests.cs b/tests/StevanFreeborn.Results.Tests/ResultAsyncExtensionsTests.cs index 91621b9..cdf5762 100644 --- a/tests/StevanFreeborn.Results.Tests/ResultAsyncExtensionsTests.cs +++ b/tests/StevanFreeborn.Results.Tests/ResultAsyncExtensionsTests.cs @@ -196,4 +196,4 @@ public class ResultAsyncExtensionsTests await Assert.That(result.IsFailure).IsTrue(); await Assert.That(result.Error.Code).IsEqualTo("custom"); } -} +} \ No newline at end of file diff --git a/tests/StevanFreeborn.Results.Tests/ResultTTests.cs b/tests/StevanFreeborn.Results.Tests/ResultTTests.cs index b3b5ec9..0415972 100644 --- a/tests/StevanFreeborn.Results.Tests/ResultTTests.cs +++ b/tests/StevanFreeborn.Results.Tests/ResultTTests.cs @@ -200,4 +200,4 @@ public class ResultTTests await Assert.That(result.IsFailure).IsTrue(); await Assert.That(result.Error.Code).IsEqualTo("custom"); } -} +} \ No newline at end of file diff --git a/tests/StevanFreeborn.Results.Tests/ResultTests.cs b/tests/StevanFreeborn.Results.Tests/ResultTests.cs index 93a2396..ef7e42c 100644 --- a/tests/StevanFreeborn.Results.Tests/ResultTests.cs +++ b/tests/StevanFreeborn.Results.Tests/ResultTests.cs @@ -16,7 +16,7 @@ public class ResultTests { var error = new Error("code", "message"); var result = Result.Fail(error); - + await Assert.That(result.IsSuccess).IsFalse(); await Assert.That(result.IsFailure).IsTrue(); await Assert.That(result.Error).IsEqualTo(error); @@ -163,4 +163,4 @@ public class ResultTests await Assert.That(result.IsFailure).IsTrue(); await Assert.That(result.Error.Code).IsEqualTo("custom"); } -} +} \ No newline at end of file