- update ModResult dependency

modabas · modabas · commit 5e7d8aab53cc · 2024-12-27T17:56:40.000+03:00
- modify code to compansate for breaking changes in ModResult
- bump version
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,6 +15,6 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
-    <Version>0.1.3</Version>
+    <Version>0.2.0</Version>
   </PropertyGroup>
 </Project>
diff --git a/samples/Client/Client.csproj b/samples/Client/Client.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ModResults" Version="0.1.3" />
+    <PackageReference Include="ModResults" Version="0.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Client/HttpResponseMessageExtensions.cs b/samples/Client/HttpResponseMessageExtensions.cs
@@ -25,6 +25,7 @@ public static class HttpResponseMessageExtensions
   public static async Task<Result<T>> DeserializeResultAsync<T>(
     this HttpResponseMessage response,
     CancellationToken ct)
+    where T : notnull
   {
     if (!response.IsSuccessStatusCode)
     {
diff --git a/src/ModEndpoints/ModEndpoints.csproj b/src/ModEndpoints/ModEndpoints.csproj
@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="assets\README.md" Pack="true" PackagePath="\"/>
+    <None Include="assets\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ModResults.FluentValidation" Version="0.1.3" />
-    <PackageReference Include="ModResults.MinimalApis" Version="0.1.3" />
+    <PackageReference Include="ModResults.FluentValidation" Version="0.2.0" />
+    <PackageReference Include="ModResults.MinimalApis" Version="0.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ModEndpoints/[ServiceResultEndpoint]/ServiceResultEndpoint.cs b/src/ModEndpoints/[ServiceResultEndpoint]/ServiceResultEndpoint.cs
@@ -8,6 +8,7 @@ namespace ModEndpoints;
 public abstract class ServiceResultEndpoint<TRequest, TResultValue>
   : BaseServiceResultEndpoint<TRequest, Result<TResultValue>>
   where TRequest : notnull
+  where TResultValue : notnull
 {
   protected override ValueTask<Result<TResultValue>> HandleInvalidValidationResultAsync(
     ValidationResult validationResult,
diff --git a/src/ModEndpoints/[ServiceResultEndpoint]/ServiceResultEndpointWithEmptyRequest.cs b/src/ModEndpoints/[ServiceResultEndpoint]/ServiceResultEndpointWithEmptyRequest.cs
@@ -4,6 +4,7 @@
 namespace ModEndpoints;
 public abstract class ServiceResultEndpointWithEmptyRequest<TResultValue>
   : BaseServiceResultEndpoint<Result<TResultValue>>
+  where TResultValue : notnull
 {
 }
 
diff --git a/src/ModEndpoints/[WebResultEndpoint]/DefaultResultToResponseMapper.cs b/src/ModEndpoints/[WebResultEndpoint]/DefaultResultToResponseMapper.cs
@@ -94,6 +94,7 @@ public async ValueTask<IResult> ToResponseAsync<TValue>(
     Result<TValue> result,
     HttpContext context,
     CancellationToken ct)
+    where TValue : notnull
   {
     if (result.IsFailed)
     {
diff --git a/src/ModEndpoints/[WebResultEndpoint]/IResultToResponseMapper.cs b/src/ModEndpoints/[WebResultEndpoint]/IResultToResponseMapper.cs
@@ -11,5 +11,6 @@ ValueTask<IResult> ToResponseAsync(
   ValueTask<IResult> ToResponseAsync<TValue>(
     Result<TValue> result,
     HttpContext context,
-    CancellationToken ct);
+    CancellationToken ct)
+    where TValue : notnull;
 }
diff --git a/src/ModEndpoints/[WebResultEndpoint]/WebResultEndpoint.cs b/src/ModEndpoints/[WebResultEndpoint]/WebResultEndpoint.cs
@@ -10,6 +10,7 @@ namespace ModEndpoints;
 public abstract class WebResultEndpoint<TRequest, TResponse>
   : BaseWebResultEndpoint<TRequest, Result<TResponse>>
   where TRequest : notnull
+  where TResponse : notnull
 {
   protected override async ValueTask<IResult> ConvertResultToResponseAsync(
     Result<TResponse> result,
diff --git a/src/ModEndpoints/[WebResultEndpoint]/WebResultEndpointWithEmptyRequest.cs b/src/ModEndpoints/[WebResultEndpoint]/WebResultEndpointWithEmptyRequest.cs
@@ -7,6 +7,7 @@ namespace ModEndpoints;
 
 public abstract class WebResultEndpointWithEmptyRequest<TResponse>
   : BaseWebResultEndpoint<Result<TResponse>>
+  where TResponse : notnull
 {
   protected override async ValueTask<IResult> ConvertResultToResponseAsync(
     Result<TResponse> result,

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public static class HttpResponseMessageExtensions`
`25`	`25`	`public static async Task<Result<T>> DeserializeResultAsync<T>(`
`26`	`26`	`this HttpResponseMessage response,`
`27`	`27`	`CancellationToken ct)`
	`28`	`+ where T : notnull`
`28`	`29`	`{`
`29`	`30`	`if (!response.IsSuccessStatusCode)`
`30`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace ModEndpoints;`
`8`	`8`	`public abstract class ServiceResultEndpoint<TRequest, TResultValue>`
`9`	`9`	`: BaseServiceResultEndpoint<TRequest, Result<TResultValue>>`
`10`	`10`	`where TRequest : notnull`
	`11`	`+ where TResultValue : notnull`
`11`	`12`	`{`
`12`	`13`	`protected override ValueTask<Result<TResultValue>> HandleInvalidValidationResultAsync(`
`13`	`14`	`ValidationResult validationResult,`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`namespace ModEndpoints;`
`5`	`5`	`public abstract class ServiceResultEndpointWithEmptyRequest<TResultValue>`
`6`	`6`	`: BaseServiceResultEndpoint<Result<TResultValue>>`
	`7`	`+ where TResultValue : notnull`
`7`	`8`	`{`
`8`	`9`	`}`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ public async ValueTask<IResult> ToResponseAsync<TValue>(`
`94`	`94`	`Result<TValue> result,`
`95`	`95`	`HttpContext context,`
`96`	`96`	`CancellationToken ct)`
	`97`	`+ where TValue : notnull`
`97`	`98`	`{`
`98`	`99`	`if (result.IsFailed)`
`99`	`100`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,6 @@ ValueTask<IResult> ToResponseAsync(`
`11`	`11`	`ValueTask<IResult> ToResponseAsync<TValue>(`
`12`	`12`	`Result<TValue> result,`
`13`	`13`	`HttpContext context,`
`14`		`- CancellationToken ct);`
	`14`	`+ CancellationToken ct)`
	`15`	`+ where TValue : notnull;`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ namespace ModEndpoints;`
`10`	`10`	`public abstract class WebResultEndpoint<TRequest, TResponse>`
`11`	`11`	`: BaseWebResultEndpoint<TRequest, Result<TResponse>>`
`12`	`12`	`where TRequest : notnull`
	`13`	`+ where TResponse : notnull`
`13`	`14`	`{`
`14`	`15`	`protected override async ValueTask<IResult> ConvertResultToResponseAsync(`
`15`	`16`	`Result<TResponse> result,`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ namespace ModEndpoints;`
`7`	`7`
`8`	`8`	`public abstract class WebResultEndpointWithEmptyRequest<TResponse>`
`9`	`9`	`: BaseWebResultEndpoint<Result<TResponse>>`
	`10`	`+ where TResponse : notnull`
`10`	`11`	`{`
`11`	`12`	`protected override async ValueTask<IResult> ConvertResultToResponseAsync(`
`12`	`13`	`Result<TResponse> result,`