Implement Expression method (#201)

Co-authored-by: Steve Smith <[email protected]>
ardalis · Sep 11, 2024 · def29eb · def29eb
1 parent 194d23c
commit def29eb
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 279 deletions.
diff --git a/src/Ardalis.Result.AspNetCore/ActionResultExtensions.cs b/src/Ardalis.Result.AspNetCore/ActionResultExtensions.cs
@@ -17,9 +17,7 @@ public static partial class ResultExtensions
         /// <param name="result">The Result to convert to an ActionResult</param>
         /// <returns></returns>
         public static ActionResult<T> ToActionResult<T>(this Result<T> result, ControllerBase controller)
-        {
-            return controller.ToActionResult((IResult)result);
-        }
+            => controller.ToActionResult((IResult)result);
 
         /// <summary>
         /// Convert a <see cref="Result"/> to a <see cref="ActionResult"/>
@@ -28,9 +26,7 @@ public static ActionResult<T> ToActionResult<T>(this Result<T> result, Controlle
         /// <param name="result">The Result to convert to an ActionResult</param>
         /// <returns></returns>
         public static ActionResult ToActionResult(this Result result, ControllerBase controller)
-        {
-            return controller.ToActionResult((IResult)result);
-        }
+            => controller.ToActionResult((IResult)result);
 
         /// <summary>
         /// Convert a <see cref="Result{T}"/> to a <see cref="ActionResult"/>
@@ -39,30 +35,24 @@ public static ActionResult ToActionResult(this Result result, ControllerBase con
         /// <param name="controller">The controller this is called from</param>
         /// <param name="result">The Result to convert to an ActionResult</param>
         /// <returns></returns>
-        public static ActionResult<T> ToActionResult<T>(this ControllerBase controller,
-            Result<T> result)
-        {
-            return controller.ToActionResult((IResult)result);
-        }
+        public static ActionResult<T> ToActionResult<T>(this ControllerBase controller, Result<T> result)
+            => controller.ToActionResult((IResult)result);
 
         /// <summary>
         /// Convert a <see cref="Result"/> to a <see cref="ActionResult"/>
         /// </summary>
         /// <param name="controller">The controller this is called from</param>
         /// <param name="result">The Result to convert to an ActionResult</param>
         /// <returns></returns>
-        public static ActionResult ToActionResult(this ControllerBase controller,
-            Result result)
-        {
-            return controller.ToActionResult((IResult)result);
-        }
+        public static ActionResult ToActionResult(this ControllerBase controller, Result result)
+            => controller.ToActionResult((IResult)result);
 
         internal static ActionResult ToActionResult(this ControllerBase controller, IResult result)
         {
             var actionProps = controller.ControllerContext.ActionDescriptor.Properties;
 
-            var resultStatusMap = actionProps.ContainsKey(ResultConvention.RESULT_STATUS_MAP_PROP) 
-                ?(actionProps[ResultConvention.RESULT_STATUS_MAP_PROP] as ResultStatusMap)
+            var resultStatusMap = actionProps.ContainsKey(ResultConvention.RESULT_STATUS_MAP_PROP)
+                ? (actionProps[ResultConvention.RESULT_STATUS_MAP_PROP] as ResultStatusMap)
                 : new ResultStatusMap().AddDefaultMap();
 
             var resultStatusOptions = resultStatusMap[result.Status];

diff --git a/src/Ardalis.Result.AspNetCore/Exceptions/UnexpectedFailureResultException.cs b/src/Ardalis.Result.AspNetCore/Exceptions/UnexpectedFailureResultException.cs
@@ -3,18 +3,11 @@
 
 namespace Ardalis.Result.AspNetCore.Exceptions
 {
-    internal class UnexpectedFailureResultsException : Exception
+    internal class UnexpectedFailureResultsException(IEnumerable<ResultStatus> statuses) : Exception
     {
-        public UnexpectedFailureResultsException(IEnumerable<ResultStatus> statuses)
-        {
-            UnexpectedStatuses = statuses;
-        }
-
-        public IEnumerable<ResultStatus> UnexpectedStatuses { get; }
+        public IEnumerable<ResultStatus> UnexpectedStatuses { get; } = statuses;
 
         public override string ToString()
-        {
-            return $"ActionModel has [{nameof(ExpectedFailuresAttribute)}] with result statuses which are not configured in ResultConvention.";
-        }
+            => $"ActionModel has [{nameof(ExpectedFailuresAttribute)}] with result statuses which are not configured in ResultConvention.";
     }
 }
diff --git a/src/Ardalis.Result.AspNetCore/ExpectedFailuresAttribute.cs b/src/Ardalis.Result.AspNetCore/ExpectedFailuresAttribute.cs
@@ -4,13 +4,8 @@
 namespace Ardalis.Result.AspNetCore
 {
     [AttributeUsage(AttributeTargets.Method)]
-    public class ExpectedFailuresAttribute : Attribute
+    public class ExpectedFailuresAttribute(params ResultStatus[] resultStatuses) : Attribute
     {
-        public ExpectedFailuresAttribute(params ResultStatus[] resultStatuses)
-        {
-            ResultStatuses = resultStatuses;
-        }
-
-        public IEnumerable<ResultStatus> ResultStatuses { get; }
+        public IEnumerable<ResultStatus> ResultStatuses { get; } = resultStatuses;
     }
 }
diff --git a/src/Ardalis.Result.AspNetCore/MinimalApiResultExtensions.cs b/src/Ardalis.Result.AspNetCore/MinimalApiResultExtensions.cs
@@ -16,20 +16,14 @@ public static partial class ResultExtensions
     /// <typeparam name="T">The value being returned</typeparam>
     /// <param name="result">The Ardalis.Result to convert to an Microsoft.AspNetCore.Http.IResult</param>
     /// <returns></returns>
-    public static Microsoft.AspNetCore.Http.IResult ToMinimalApiResult<T>(this Result<T> result)
-    {
-        return ToMinimalApiResult((IResult)result);
-    }
+    public static Microsoft.AspNetCore.Http.IResult ToMinimalApiResult<T>(this Result<T> result) => ToMinimalApiResult((IResult)result);
 
     /// <summary>
     /// Convert a <see cref="Result"/> to an instance of <see cref="Microsoft.AspNetCore.Http.IResult"/>
     /// </summary>
     /// <param name="result">The Ardalis.Result to convert to an Microsoft.AspNetCore.Http.IResult</param>
     /// <returns></returns>
-    public static Microsoft.AspNetCore.Http.IResult ToMinimalApiResult(this Result result)
-    {
-        return ToMinimalApiResult((IResult)result);
-    }
+    public static Microsoft.AspNetCore.Http.IResult ToMinimalApiResult(this Result result) => ToMinimalApiResult((IResult)result);
 
     internal static Microsoft.AspNetCore.Http.IResult ToMinimalApiResult(this IResult result) =>
         result.Status switch

diff --git a/src/Ardalis.Result.AspNetCore/ResultConvention.cs b/src/Ardalis.Result.AspNetCore/ResultConvention.cs
@@ -20,10 +20,7 @@ internal class ResultConvention : IActionModelConvention
 
         private readonly ResultStatusMap _map;
 
-        internal ResultConvention(ResultStatusMap map)
-        {
-            _map = map;
-        }
+        internal ResultConvention(ResultStatusMap map) => _map = map;
 
         public void Apply(ActionModel action)
         {

diff --git a/src/Ardalis.Result.AspNetCore/ResultStatusMap.cs b/src/Ardalis.Result.AspNetCore/ResultStatusMap.cs
@@ -24,8 +24,8 @@ internal ResultStatusMap()
         /// Adds default mapping for all known <see cref="ResultStatus"/>es to <see cref="HttpStatusCode"/>s
         /// </summary>
         public ResultStatusMap AddDefaultMap()
-        {
-            return For(ResultStatus.Ok, HttpStatusCode.OK)
+
+            => For(ResultStatus.Ok, HttpStatusCode.OK)
                 .For(ResultStatus.Created, HttpStatusCode.Created)
                 .For(ResultStatus.Error, (HttpStatusCode)422, resultStatusOptions => resultStatusOptions
                     .With(UnprocessableEntity))
@@ -44,7 +44,6 @@ public ResultStatusMap AddDefaultMap()
                     resultStatusOptions
                         .With(UnavailableEntity))
                 .For(ResultStatus.NoContent, HttpStatusCode.NoContent);
-        }
 
         /// <summary>
         /// Maps <paramref name="status"/> to <paramref name="defaultStatusCode"/>.
@@ -88,10 +87,7 @@ public ResultStatusMap Remove(ResultStatus status)
         /// </summary>
         /// <param name="status"></param>
         /// <returns></returns>
-        public bool ContainsKey(ResultStatus status)
-        {
-            return _map.ContainsKey(status);
-        }
+        public bool ContainsKey(ResultStatus status) => _map.ContainsKey(status);
 
         internal ResultStatusOptions this[ResultStatus status]
         {
@@ -138,7 +134,7 @@ private static ProblemDetails NotFoundEntity(ControllerBase controller, IResult
                 Detail = result.Errors.Any() ? details.ToString() : null
             };
         }
-        
+
         private static ProblemDetails ConflictEntity(ControllerBase controller, IResult result)
         {
             var details = new StringBuilder("Next error(s) occurred:");

diff --git a/src/Ardalis.Result/PagedInfo.cs b/src/Ardalis.Result/PagedInfo.cs
@@ -2,25 +2,16 @@
 
 namespace Ardalis.Result
 {
-    public class PagedInfo
+    public class PagedInfo(long pageNumber, long pageSize, long totalPages, long totalRecords)
     {
-
-        public PagedInfo(long pageNumber, long pageSize, long totalPages, long totalRecords)
-        {
-            PageNumber = pageNumber;
-            PageSize = pageSize;
-            TotalPages = totalPages;
-            TotalRecords = totalRecords;
-        }
-
-        [JsonInclude] 
-        public long PageNumber { get; private set; }
-        [JsonInclude] 
-        public long PageSize { get; private set; }
-        [JsonInclude] 
-        public long TotalPages { get; private set; }
-        [JsonInclude] 
-        public long TotalRecords { get; private set; }
+        [JsonInclude]
+        public long PageNumber { get; private set; } = pageNumber;
+        [JsonInclude]
+        public long PageSize { get; private set; } = pageSize;
+        [JsonInclude]
+        public long TotalPages { get; private set; } = totalPages;
+        [JsonInclude]
+        public long TotalRecords { get; private set; } = totalRecords;
 
         public PagedInfo SetPageNumber(long pageNumber)
         {

diff --git a/src/Ardalis.Result/PagedResult.cs b/src/Ardalis.Result/PagedResult.cs
@@ -2,14 +2,9 @@
 
 namespace Ardalis.Result
 {
-    public class PagedResult<T> : Result<T>
+    public class PagedResult<T>(PagedInfo pagedInfo, T value) : Result<T>(value)
     {
-        public PagedResult(PagedInfo pagedInfo, T value) : base(value)
-        {
-            PagedInfo = pagedInfo;
-        }
-
-        [JsonInclude] 
-        public PagedInfo PagedInfo { get; init; }
+        [JsonInclude]
+        public PagedInfo PagedInfo { get; init; } = pagedInfo;
     }
 }