[Host.FluentValidation] Duplicated error messages zarusz#192

Signed-off-by: Tomasz Maruszak <[email protected]>
locmxse60602 · Aug 28, 2023 · edf66f2 · edf66f2
1 parent 12b92bc
commit edf66f2
Show file tree

Hide file tree

Showing 39 changed files with 204 additions and 121 deletions.
diff --git a/src/Host.Serialization.Properties.xml b/src/Host.Serialization.Properties.xml
@@ -5,6 +5,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>2.0.1</Version>
+    <Version>2.0.2</Version>
   </PropertyGroup>
 </Project>
diff --git a/src/Host.Transport.Properties.xml b/src/Host.Transport.Properties.xml
@@ -4,7 +4,7 @@
 	<Import Project="Common.NuGet.Properties.xml" />
 
 	<PropertyGroup>
-    <Version>2.1.9</Version>
+    <Version>2.1.10</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Samples/Sample.AsyncApi.Service/Sample.AsyncApi.Service.csproj b/src/Samples/Sample.AsyncApi.Service/Sample.AsyncApi.Service.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-    <PackageReference Include="NSwag.AspNetCore" Version="13.18.2" />
+    <PackageReference Include="NSwag.AspNetCore" Version="13.20.0" />
     <ProjectReference Include="..\..\SlimMessageBus.Host.AsyncApi\SlimMessageBus.Host.AsyncApi.csproj" />
     <ProjectReference Include="..\..\SlimMessageBus.Host.AzureServiceBus\SlimMessageBus.Host.AzureServiceBus.csproj" />
     <ProjectReference Include="..\..\SlimMessageBus.Host.Kafka\SlimMessageBus.Host.Kafka.csproj" />

diff --git a/src/Samples/Sample.ValidatingWebApi/Sample.ValidatingWebApi.csproj b/src/Samples/Sample.ValidatingWebApi/Sample.ValidatingWebApi.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.5.1" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.7.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 

diff --git a/src/SlimMessageBus.Host.AsyncApi/SlimMessageBus.Host.AsyncApi.csproj b/src/SlimMessageBus.Host.AsyncApi/SlimMessageBus.Host.AsyncApi.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Namotion.Reflection" Version="2.1.1" />
-    <PackageReference Include="Saunter" Version="0.11.0" />
+    <PackageReference Include="Namotion.Reflection" Version="3.0.0" />
+    <PackageReference Include="Saunter" Version="0.12.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SlimMessageBus.Host.AzureEventHub/SlimMessageBus.Host.AzureEventHub.csproj b/src/SlimMessageBus.Host.AzureEventHub/SlimMessageBus.Host.AzureEventHub.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.7.5" />
+    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.9.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SlimMessageBus.Host.AzureServiceBus/SlimMessageBus.Host.AzureServiceBus.csproj b/src/SlimMessageBus.Host.AzureServiceBus/SlimMessageBus.Host.AzureServiceBus.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.12.0" />
+    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.16.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SlimMessageBus.Host.FluentValidation/AbstractValidationInterceptor.cs b/src/SlimMessageBus.Host.FluentValidation/AbstractValidationInterceptor.cs
@@ -13,17 +13,16 @@ protected AbstractValidationInterceptor(IEnumerable<IValidator<T>> validators, I
         _errorsHandler = errorsHandler;
     }
 
-    protected async Task OnValidate(T message, CancellationToken cancellationToken)
+    internal protected async Task OnValidate(T message, CancellationToken cancellationToken)
     {
         var context = new ValidationContext<T>(message);
 
         var validationTasks = _validators
             .Select(x => x.ValidateAsync(context, cancellationToken));
 
-        await Task.WhenAll(validationTasks);
+        var results = await Task.WhenAll(validationTasks);
 
-        var failures = validationTasks
-            .SelectMany(x => x.Result.Errors);
+        var failures = results.SelectMany(x => x.Errors);
 
         if (failures.Any())
         {

diff --git a/src/SlimMessageBus.Host.FluentValidation/SlimMessageBus.Host.FluentValidation.csproj b/src/SlimMessageBus.Host.FluentValidation/SlimMessageBus.Host.FluentValidation.csproj
@@ -10,12 +10,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.5.1" />
+    <PackageReference Include="FluentValidation" Version="11.7.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\SlimMessageBus.Host.Configuration\SlimMessageBus.Host.Configuration.csproj" />
     <ProjectReference Include="..\SlimMessageBus.Host.Interceptor\SlimMessageBus.Host.Interceptor.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>SlimMessageBus.Host.FluentValidation.Test</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+
 </Project>
diff --git a/src/SlimMessageBus.Host.Kafka/SlimMessageBus.Host.Kafka.csproj b/src/SlimMessageBus.Host.Kafka/SlimMessageBus.Host.Kafka.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Confluent.Kafka" Version="2.0.2" />
+    <PackageReference Include="Confluent.Kafka" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SlimMessageBus.Host.Mqtt/SlimMessageBus.Host.Mqtt.csproj b/src/SlimMessageBus.Host.Mqtt/SlimMessageBus.Host.Mqtt.csproj
@@ -11,11 +11,15 @@
 
   <ItemGroup>
     <PackageReference Include="MQTTnet " Version="4.1.4.563" />
-    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.1.4.563" />
+    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.2.1.781" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\SlimMessageBus.Host\SlimMessageBus.Host.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="MQTTnet" Version="4.2.1.781" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SlimMessageBus.Host.Redis/SlimMessageBus.Host.Redis.csproj b/src/SlimMessageBus.Host.Redis/SlimMessageBus.Host.Redis.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.6.96" />
+    <PackageReference Include="StackExchange.Redis" Version="2.6.122" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SlimMessageBus.Host.Serialization.Avro/SlimMessageBus.Host.Serialization.Avro.csproj b/src/SlimMessageBus.Host.Serialization.Avro/SlimMessageBus.Host.Serialization.Avro.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Apache.Avro" Version="1.11.1" />
+    <PackageReference Include="Apache.Avro" Version="1.11.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
   </ItemGroup>
 

diff --git a/...Host.Serialization.GoogleProtobuf/SlimMessageBus.Host.Serialization.GoogleProtobuf.csproj b/...Host.Serialization.GoogleProtobuf/SlimMessageBus.Host.Serialization.GoogleProtobuf.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.22.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.24.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
   </ItemGroup>
 

diff --git a/src/Tests/SlimMessageBus.Host.AsyncApi.Test/SlimMessageBus.Host.AsyncApi.Test.csproj b/src/Tests/SlimMessageBus.Host.AsyncApi.Test/SlimMessageBus.Host.AsyncApi.Test.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/...ests/SlimMessageBus.Host.AzureEventHub.Test/SlimMessageBus.Host.AzureEventHub.Test.csproj b/...ests/SlimMessageBus.Host.AzureEventHub.Test/SlimMessageBus.Host.AzureEventHub.Test.csproj
@@ -4,9 +4,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FluentAssertions" Version="6.10.0" />
-    <PackageReference Update="Moq" Version="4.18.4" />
+    <PackageReference Update="FluentAssertions" Version="6.12.0" />
+    <PackageReference Update="Moq" Version="4.20.69" />
   </ItemGroup>
 
 </Project>
diff --git a/.../SlimMessageBus.Host.AzureServiceBus.Test/SlimMessageBus.Host.AzureServiceBus.Test.csproj b/.../SlimMessageBus.Host.AzureServiceBus.Test/SlimMessageBus.Host.AzureServiceBus.Test.csproj
@@ -4,9 +4,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -30,8 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FluentAssertions" Version="6.10.0" />
-    <PackageReference Update="Moq" Version="4.18.4" />
+    <PackageReference Update="FluentAssertions" Version="6.12.0" />
+    <PackageReference Update="Moq" Version="4.20.69" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Tests/SlimMessageBus.Host.Benchmark/SlimMessageBus.Host.Benchmark.csproj b/src/Tests/SlimMessageBus.Host.Benchmark/SlimMessageBus.Host.Benchmark.csproj
@@ -7,16 +7,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.7" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\SlimMessageBus.Host\SlimMessageBus.Host.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FluentAssertions" Version="6.10.0" />
-    <PackageReference Update="Moq" Version="4.18.4" />
+    <PackageReference Update="FluentAssertions" Version="6.12.0" />
+    <PackageReference Update="Moq" Version="4.20.69" />
   </ItemGroup>
 
 </Project>
diff --git a/...ests/SlimMessageBus.Host.Configuration.Test/SlimMessageBus.Host.Configuration.Test.csproj b/...ests/SlimMessageBus.Host.Configuration.Test/SlimMessageBus.Host.Configuration.Test.csproj
@@ -3,9 +3,9 @@
   <Import Project="../Host.Test.Properties.xml" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FluentAssertions" Version="6.10.0" />
-    <PackageReference Update="Moq" Version="4.18.4" />
+    <PackageReference Update="FluentAssertions" Version="6.12.0" />
+    <PackageReference Update="Moq" Version="4.20.69" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Tests/SlimMessageBus.Host.FluentValidation.Test/AbstractValidationInterceptorTests.cs b/src/Tests/SlimMessageBus.Host.FluentValidation.Test/AbstractValidationInterceptorTests.cs
@@ -0,0 +1,56 @@
+namespace SlimMessageBus.Host.FluentValidation.Test;
+
+using global::FluentValidation;
+using global::FluentValidation.Results;
+
+public class AbstractValidationInterceptorTests
+{
+    private readonly Message _message;
+    private readonly Mock<IValidator<Message>> _validatorMock;
+    private readonly CancellationToken _cancellationToken;
+    private readonly AbstractValidationInterceptor<Message> _subject;
+
+    public AbstractValidationInterceptorTests()
+    {
+        _message = new Message();
+        _validatorMock = new Mock<IValidator<Message>>();
+        _cancellationToken = new CancellationToken();
+        _subject = new Mock<AbstractValidationInterceptor<Message>>(new[] { _validatorMock.Object }, null) { CallBase = true }.Object;
+    }
+
+    public record Message;
+
+    [Fact]
+    public async Task When_OnValidate_Given_ValidationFails_Then_RaisesException()
+    {
+        // arrange
+        _validatorMock
+            .Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken))
+            .ReturnsAsync(new ValidationResult { Errors = new List<ValidationFailure> { new() { ErrorMessage = "Something is Wrong" } } });
+
+        // act
+        Func<Task> act = () => _subject.OnValidate(_message, _cancellationToken);
+
+        // asset
+        await act.Should().ThrowAsync<ValidationException>();
+
+        _validatorMock
+            .Verify(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken), Times.Once);
+    }
+
+    [Fact]
+    public async Task When_OnValidate_Given_ValidationSucceeds_Then_CallsNext()
+    {
+        // arrange
+        _validatorMock
+            .Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken))
+            .ReturnsAsync(new ValidationResult());
+
+        // act
+        await _subject.OnValidate(_message, _cancellationToken);
+
+        // asset
+        _validatorMock
+            .Verify(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken), Times.Once);
+    }
+}
diff --git a/src/Tests/SlimMessageBus.Host.FluentValidation.Test/ConsumerValidationInterceptorTests.cs b/src/Tests/SlimMessageBus.Host.FluentValidation.Test/ConsumerValidationInterceptorTests.cs
@@ -28,7 +28,9 @@ public record Message;
     public async Task Given_Validator_When_ValidationFails_Then_RaisesException()
     {
         // arrange
-        _validatorMock.Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken)).ThrowsAsync(new ValidationException("Bad message"));
+        _validatorMock
+            .Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken))
+            .ThrowsAsync(new ValidationException("Bad message"));
 
         // act
         Func<Task> act = () => _subject.OnHandle(_message, _nextMock.Object, _consumerContextMock.Object);
@@ -41,7 +43,9 @@ public async Task Given_Validator_When_ValidationFails_Then_RaisesException()
     public async Task Given_Validator_When_ValidationSucceeds_Then_CallsNext()
     {
         // arrange
-        _validatorMock.Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken)).ReturnsAsync(new ValidationResult());
+        _validatorMock
+            .Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken))
+            .ReturnsAsync(new ValidationResult());
 
         // act
         await _subject.OnHandle(_message, _nextMock.Object, _consumerContextMock.Object);

diff --git a/src/Tests/SlimMessageBus.Host.FluentValidation.Test/HandlerValidationInterceptorTests.cs b/src/Tests/SlimMessageBus.Host.FluentValidation.Test/HandlerValidationInterceptorTests.cs
@@ -29,7 +29,9 @@ public record ResponseMessage;
     public async Task Given_Validator_When_ValidationFails_Then_RaisesException()
     {
         // arrange
-        _validatorMock.Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken)).ThrowsAsync(new ValidationException("Bad message"));
+        _validatorMock
+            .Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken))
+            .ThrowsAsync(new ValidationException("Bad message"));
 
         // act
         Func<Task> act = () => _subject.OnHandle(_message, _nextMock.Object, _consumerContextMock.Object);
@@ -42,7 +44,9 @@ public async Task Given_Validator_When_ValidationFails_Then_RaisesException()
     public async Task Given_Validator_When_ValidationSucceeds_Then_CallsNext()
     {
         // arrange
-        _validatorMock.Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken)).ReturnsAsync(new ValidationResult());
+        _validatorMock
+            .Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken))
+            .ReturnsAsync(new ValidationResult());
 
         // act
         await _subject.OnHandle(_message, _nextMock.Object, _consumerContextMock.Object);

diff --git a/src/Tests/SlimMessageBus.Host.FluentValidation.Test/ProducerValidationInterceptorTests.cs b/src/Tests/SlimMessageBus.Host.FluentValidation.Test/ProducerValidationInterceptorTests.cs
@@ -28,7 +28,9 @@ public record Message;
     public async Task Given_Validator_When_ValidationFails_Then_RaisesException()
     {
         // arrange
-        _validatorMock.Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken)).ThrowsAsync(new ValidationException("Bad message"));
+        _validatorMock
+            .Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken))
+            .ThrowsAsync(new ValidationException("Bad message"));
 
         // act
         Func<Task<object>> act = () => _subject.OnHandle(_message, _nextMock.Object, _producerContextMock.Object);
@@ -41,7 +43,9 @@ public async Task Given_Validator_When_ValidationFails_Then_RaisesException()
     public async Task Given_Validator_When_ValidationSucceeds_Then_CallsNext()
     {
         // arrange
-        _validatorMock.Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken)).ReturnsAsync(new ValidationResult());
+        _validatorMock
+            .Setup(x => x.ValidateAsync(It.IsAny<ValidationContext<Message>>(), _cancellationToken))
+            .ReturnsAsync(new ValidationResult());
 
         // act
         await _subject.OnHandle(_message, _nextMock.Object, _producerContextMock.Object);