Revert PR #161, Make ValidationErrors immutable from external manipul…

…ation
ardalis · Mar 9, 2024 · 6cf9d14 · 6cf9d14
1 parent f88024b
commit 6cf9d14
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/sample/Ardalis.Result.Sample.UnitTests/ServiceTests/PersonServiceCreate.cs b/sample/Ardalis.Result.Sample.UnitTests/ServiceTests/PersonServiceCreate.cs
@@ -15,7 +15,7 @@ public void ReturnsInvalidResultGivenEmptyNames()
         var result = service.Create("", "");
 
         result.Status.Should().Be(ResultStatus.Invalid);
-        result.ValidationErrors.Count.Should().Be(2);
+        result.ValidationErrors.Should().HaveCount(2);
     }
 
     [Fact]
@@ -26,7 +26,7 @@ public void ReturnsInvalidResultWith2ErrorsGivenSomeLongNameSurname()
         var result = service.Create("Steve", "SomeLongName");
 
         result.Status.Should().Be(ResultStatus.Invalid);
-        result.ValidationErrors.Count.Should().Be(2);
+        result.ValidationErrors.Should().HaveCount(2);
     }
 
     [Fact]

diff --git a/src/Ardalis.Result/IResult.cs b/src/Ardalis.Result/IResult.cs
@@ -7,8 +7,8 @@ public interface IResult
     {
         ResultStatus Status { get; }
         IEnumerable<string> Errors { get; }
-        List<ValidationError> ValidationErrors { get; }
+        IEnumerable<ValidationError> ValidationErrors { get; }
         Type ValueType { get; }
-        Object GetValue();
+        object GetValue();
     }
 }
diff --git a/src/Ardalis.Result/Result.Void.cs b/src/Ardalis.Result/Result.Void.cs
@@ -84,7 +84,7 @@ public static Result ErrorWithCorrelationId(string correlationId, params string[
         /// <returns>A Result</returns>
         public new static Result Invalid(ValidationError validationError)
         {
-            return new Result(ResultStatus.Invalid) { ValidationErrors = { validationError } };
+            return new Result(ResultStatus.Invalid) { ValidationErrors = [validationError] };
         }
 
         /// <summary>
@@ -102,7 +102,7 @@ public static Result ErrorWithCorrelationId(string correlationId, params string[
         /// </summary>
         /// <param name="validationErrors">A list of validation errors encountered</param>
         /// <returns>A Result</returns>
-        public new static Result Invalid(List<ValidationError> validationErrors)
+        public new static Result Invalid(IEnumerable<ValidationError> validationErrors)
         {
             return new Result(ResultStatus.Invalid) { ValidationErrors = validationErrors };
         }

diff --git a/src/Ardalis.Result/Result.cs b/src/Ardalis.Result/Result.cs
@@ -48,9 +48,9 @@ protected Result(ResultStatus status)
         [JsonInclude] 
         public string CorrelationId { get; protected set; } = string.Empty;
         [JsonInclude] 
-        public IEnumerable<string> Errors { get; protected set; } = new List<string>();
+        public IEnumerable<string> Errors { get; protected set; } = [];
         [JsonInclude] 
-        public List<ValidationError> ValidationErrors { get; protected set; } = new List<ValidationError>();
+        public IEnumerable<ValidationError> ValidationErrors { get; protected set; } = [];
 
         /// <summary>
         /// Returns the current value.
@@ -120,7 +120,7 @@ public static Result<T> Error(params string[] errorMessages)
         /// <returns>A Result<typeparamref name="T"/></returns>
         public static Result<T> Invalid(ValidationError validationError)
         {
-            return new Result<T>(ResultStatus.Invalid) { ValidationErrors = { validationError } };
+            return new Result<T>(ResultStatus.Invalid) { ValidationErrors = [validationError] };
         }
 
         /// <summary>
@@ -138,7 +138,7 @@ public static Result<T> Invalid(params ValidationError[] validationErrors)
         /// </summary>
         /// <param name="validationErrors">A list of validation errors encountered</param>
         /// <returns>A Result<typeparamref name="T"/></returns>
-        public static Result<T> Invalid(List<ValidationError> validationErrors)
+        public static Result<T> Invalid(IEnumerable<ValidationError> validationErrors)
         {
             return new Result<T>(ResultStatus.Invalid) { ValidationErrors = validationErrors };
         }

diff --git a/tests/Ardalis.Result.UnitTests/ResultVoidMap.cs b/tests/Ardalis.Result.UnitTests/ResultVoidMap.cs
@@ -1,5 +1,6 @@
 using FluentAssertions;
 using System.Collections.Generic;
+using System.Linq;
 using Xunit;
 
 namespace Ardalis.Result.UnitTests