Convey 1.0 release

Convey.sln

@@ -95,12 +95,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{68F8CF41-5FD
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Convey.MessageBrokers.RabbitMQ", "src\Convey.MessageBrokers.RabbitMQ\src\Convey.MessageBrokers.RabbitMQ\Convey.MessageBrokers.RabbitMQ.csproj", "{4E2BD6D7-F251-4210-82EB-DE883B553F3B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Convey.MessageBrokers.RawRabbit", "Convey.MessageBrokers.RawRabbit", "{82A1532E-D904-4428-A438-F7D4EF17698D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BCC488C5-BC7C-4A2A-8979-C17BDD4523AF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Convey.MessageBrokers.RawRabbit", "src\Convey.MessageBrokers.RawRabbit\src\Convey.MessageBrokers.RawRabbit\Convey.MessageBrokers.RawRabbit.csproj", "{59BAF389-90B8-4C44-8EA6-34460F4AAB56}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Convey.MessageBrokers", "Convey.MessageBrokers", "{8588A586-469A-4BA5-8DA6-CF43E561C0A6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D24035F1-5E38-4868-A511-8F991D653BC4}"
@@ -401,18 +395,6 @@ Global
 		{4E2BD6D7-F251-4210-82EB-DE883B553F3B}.Release|x64.Build.0 = Release|Any CPU
 		{4E2BD6D7-F251-4210-82EB-DE883B553F3B}.Release|x86.ActiveCfg = Release|Any CPU
 		{4E2BD6D7-F251-4210-82EB-DE883B553F3B}.Release|x86.Build.0 = Release|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Debug|x64.Build.0 = Debug|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Debug|x86.Build.0 = Debug|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Release|x64.ActiveCfg = Release|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Release|x64.Build.0 = Release|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Release|x86.ActiveCfg = Release|Any CPU
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56}.Release|x86.Build.0 = Release|Any CPU
 		{30FBEEF0-40DF-45AE-BC93-229C36249975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{30FBEEF0-40DF-45AE-BC93-229C36249975}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{30FBEEF0-40DF-45AE-BC93-229C36249975}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -703,9 +685,6 @@ Global
 		{166090FF-C865-4EEC-A7A8-088BE47C8C1C} = {C6B61C07-E175-48F3-A689-5BF7E741AA9F}
 		{68F8CF41-5FDD-4C5E-938D-CD3C157319FF} = {166090FF-C865-4EEC-A7A8-088BE47C8C1C}
 		{4E2BD6D7-F251-4210-82EB-DE883B553F3B} = {68F8CF41-5FDD-4C5E-938D-CD3C157319FF}
-		{82A1532E-D904-4428-A438-F7D4EF17698D} = {C6B61C07-E175-48F3-A689-5BF7E741AA9F}
-		{BCC488C5-BC7C-4A2A-8979-C17BDD4523AF} = {82A1532E-D904-4428-A438-F7D4EF17698D}
-		{59BAF389-90B8-4C44-8EA6-34460F4AAB56} = {BCC488C5-BC7C-4A2A-8979-C17BDD4523AF}
 		{8588A586-469A-4BA5-8DA6-CF43E561C0A6} = {C6B61C07-E175-48F3-A689-5BF7E741AA9F}
 		{D24035F1-5E38-4868-A511-8F991D653BC4} = {8588A586-469A-4BA5-8DA6-CF43E561C0A6}
 		{30FBEEF0-40DF-45AE-BC93-229C36249975} = {D24035F1-5E38-4868-A511-8F991D653BC4}

samples/Conveyor.Services.Deliveries/Events/External/Handlers/OrderCreatedHandler.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Convey.CQRS.Events;
 using Convey.MessageBrokers;
@@ -29,7 +30,7 @@ public OrderCreatedHandler(IBusPublisher publisher, IMessagePropertiesAccessor m
             : rabbitMqOptions.SpanContextHeader;
     }
 
-    public Task HandleAsync(OrderCreated @event)
+    public Task HandleAsync(OrderCreated @event, CancellationToken cancellationToken = default)
     {
         _logger.LogInformation($"Received 'order created' event with order id: {@event.OrderId}");
         var deliveryId = Guid.NewGuid();

samples/Conveyor.Services.Orders/Commands/Handlers/CreateOrderHandler.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Convey.CQRS.Commands;
 using Convey.MessageBrokers;
@@ -33,7 +34,7 @@ public CreateOrderHandler(IMongoRepository<Order, Guid> repository, IBusPublishe
         _logger = logger;
     }
 
-    public async Task HandleAsync(CreateOrder command)
+    public async Task HandleAsync(CreateOrder command, CancellationToken cancellationToken = default)
     {
         var exists = await _repository.ExistsAsync(o => o.Id == command.OrderId);
         if (exists)

samples/Conveyor.Services.Orders/Events/External/Handlers/DeliveryStartedHandler.cs

@@ -1,3 +1,4 @@
+using System.Threading;
 using System.Threading.Tasks;
 using Convey.CQRS.Events;
 using Microsoft.Extensions.Logging;
@@ -13,7 +14,7 @@ public DeliveryStartedHandler(ILogger<DeliveryStartedHandler> logger)
         _logger = logger;
     }
 
-    public Task HandleAsync(DeliveryStarted @event)
+    public Task HandleAsync(DeliveryStarted @event, CancellationToken cancellationToken = default)
     {
         _logger.LogInformation($"Received 'delivery started' event with delivery id: {@event.DeliveryId}");
         return Task.CompletedTask;

samples/Conveyor.Services.Orders/Queries/Handlers/GetOrderHandler.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Convey.CQRS.Queries;
 using Convey.Persistence.MongoDB;
@@ -16,7 +17,7 @@ public GetOrderHandler(IMongoRepository<Order, Guid> repository)
         _repository = repository;
     }
 
-    public async Task<OrderDto> HandleAsync(GetOrder query)
+    public async Task<OrderDto> HandleAsync(GetOrder query, CancellationToken cancellationToken = default)
     {
         var order = await _repository.GetAsync(query.OrderId);
 

src/Convey.Auth.Distributed/scripts/dotnet-pack.sh

@@ -3,7 +3,7 @@ echo Executing after success scripts on branch $TRAVIS_BRANCH
 echo Triggering Nuget package build
 
 cd src/Convey.Auth.Distributed/src/Convey.Auth.Distributed
-dotnet pack -c release /p:PackageVersion=0.6.$TRAVIS_BUILD_NUMBER --no-restore -o .
+dotnet pack -c release /p:PackageVersion=1.0.$TRAVIS_BUILD_NUMBER --no-restore -o .
 
 echo Uploading Convey.Auth.Distributed package to Nuget using branch $TRAVIS_BRANCH
 

src/Convey.Auth/scripts/dotnet-pack.sh

@@ -3,7 +3,7 @@ echo Executing after success scripts on branch $TRAVIS_BRANCH
 echo Triggering Nuget package build
 
 cd src/Convey.Auth/src/Convey.Auth
-dotnet pack -c release /p:PackageVersion=0.6.$TRAVIS_BUILD_NUMBER --no-restore -o .
+dotnet pack -c release /p:PackageVersion=1.0.$TRAVIS_BUILD_NUMBER --no-restore -o .
 
 echo Uploading Convey.Auth package to Nuget using branch $TRAVIS_BRANCH
 

src/Convey.CQRS.Commands/scripts/dotnet-pack.sh

@@ -3,7 +3,7 @@ echo Executing after success scripts on branch $TRAVIS_BRANCH
 echo Triggering Nuget package build
 
 cd src/Convey.CQRS.Commands/src/Convey.CQRS.Commands
-dotnet pack -c release /p:PackageVersion=0.6.$TRAVIS_BUILD_NUMBER --no-restore -o .
+dotnet pack -c release /p:PackageVersion=1.0.$TRAVIS_BUILD_NUMBER --no-restore -o .
 
 echo Uploading Convey.CQRS.Commands package to Nuget using branch $TRAVIS_BRANCH
 

src/Convey.CQRS.Commands/src/Convey.CQRS.Commands/Dispatchers/CommandDispatcher.cs

@@ -1,21 +1,23 @@
+using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Convey.CQRS.Commands.Dispatchers;
 
 internal sealed class CommandDispatcher : ICommandDispatcher
 {
-    private readonly IServiceScopeFactory _serviceFactory;
+    private readonly IServiceProvider _serviceProvider;
 
-    public CommandDispatcher(IServiceScopeFactory serviceFactory)
+    public CommandDispatcher(IServiceProvider serviceProvider)
     {
-        _serviceFactory = serviceFactory;
+        _serviceProvider = serviceProvider;
     }
 
-    public async Task SendAsync<T>(T command) where T : class, ICommand
+    public async Task SendAsync<T>(T command, CancellationToken cancellationToken = default) where T : class, ICommand
     {
-        using var scope = _serviceFactory.CreateScope();
+        using var scope = _serviceProvider.CreateScope();
         var handler = scope.ServiceProvider.GetRequiredService<ICommandHandler<T>>();
-        await handler.HandleAsync(command);
+        await handler.HandleAsync(command, cancellationToken);
     }
 }

src/Convey.CQRS.Commands/src/Convey.CQRS.Commands/ICommandDispatcher.cs

@@ -1,8 +1,9 @@
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Convey.CQRS.Commands;
 
 public interface ICommandDispatcher
 {
-    Task SendAsync<T>(T command) where T : class, ICommand;
+    Task SendAsync<T>(T command, CancellationToken cancellationToken = default) where T : class, ICommand;
 }

src/Convey.CQRS.Commands/src/Convey.CQRS.Commands/ICommandHandler.cs

@@ -1,8 +1,9 @@
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Convey.CQRS.Commands;
 
 public interface ICommandHandler<in TCommand> where TCommand : class, ICommand
 {
-    Task HandleAsync(TCommand command);
+    Task HandleAsync(TCommand command, CancellationToken cancellationToken = default);
 }

src/Convey.CQRS.Events/scripts/dotnet-pack.sh

@@ -3,7 +3,7 @@ echo Executing after success scripts on branch $TRAVIS_BRANCH
 echo Triggering Nuget package build
 
 cd src/Convey.CQRS.Events/src/Convey.CQRS.Events
-dotnet pack -c release /p:PackageVersion=0.6.$TRAVIS_BUILD_NUMBER --no-restore -o .
+dotnet pack -c release /p:PackageVersion=1.0.$TRAVIS_BUILD_NUMBER --no-restore -o .
 
 echo Uploading Convey.CQRS.Events package to Nuget using branch $TRAVIS_BRANCH
 

src/Convey.CQRS.Events/src/Convey.CQRS.Events/Dispatchers/EventDispatcher.cs

@@ -1,24 +1,26 @@
+using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Convey.CQRS.Events.Dispatchers;
 
 internal sealed class EventDispatcher : IEventDispatcher
 {
-    private readonly IServiceScopeFactory _serviceFactory;
+    private readonly IServiceProvider _serviceProvider;
 
-    public EventDispatcher(IServiceScopeFactory serviceFactory)
+    public EventDispatcher(IServiceProvider serviceProvider)
     {
-        _serviceFactory = serviceFactory;
+        _serviceProvider = serviceProvider;
     }
 
-    public async Task PublishAsync<T>(T @event) where T : class, IEvent
+    public async Task PublishAsync<T>(T @event, CancellationToken cancellationToken = default) where T : class, IEvent
     {
-        using var scope = _serviceFactory.CreateScope();
+        using var scope = _serviceProvider.CreateScope();
         var handlers = scope.ServiceProvider.GetServices<IEventHandler<T>>();
         foreach (var handler in handlers)
         {
-            await handler.HandleAsync(@event);
+            await handler.HandleAsync(@event, cancellationToken);
         }
     }
 }

src/Convey.CQRS.Events/src/Convey.CQRS.Events/IEventDispatcher.cs

@@ -1,8 +1,9 @@
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Convey.CQRS.Events;
 
 public interface IEventDispatcher
 {
-    Task PublishAsync<T>(T @event) where T : class, IEvent;
+    Task PublishAsync<T>(T @event, CancellationToken cancellationToken = default) where T : class, IEvent;
 }

src/Convey.CQRS.Events/src/Convey.CQRS.Events/IEventHandler.cs

@@ -1,8 +1,9 @@
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Convey.CQRS.Events;
 
 public interface IEventHandler<in TEvent> where TEvent : class, IEvent
 {
-    Task HandleAsync(TEvent @event);
+    Task HandleAsync(TEvent @event, CancellationToken cancellationToken = default);
 }

src/Convey.CQRS.Queries/scripts/dotnet-pack.sh

@@ -3,7 +3,7 @@ echo Executing after success scripts on branch $TRAVIS_BRANCH
 echo Triggering Nuget package build
 
 cd src/Convey.CQRS.Queries/src/Convey.CQRS.Queries
-dotnet pack -c release /p:PackageVersion=0.6.$TRAVIS_BUILD_NUMBER --no-restore -o .
+dotnet pack -c release /p:PackageVersion=1.0.$TRAVIS_BUILD_NUMBER --no-restore -o .
 
 echo Uploading Convey.CQRS.Queries package to Nuget using branch $TRAVIS_BRANCH
 

src/Convey.CQRS.Queries/src/Convey.CQRS.Queries/Dispatchers/QueryDispatcher.cs

@@ -1,32 +1,35 @@
+using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Convey.CQRS.Queries.Dispatchers;
 
 internal sealed class QueryDispatcher : IQueryDispatcher
 {
-    private readonly IServiceScopeFactory _serviceFactory;
+    private readonly IServiceProvider _serviceProvider;
 
-    public QueryDispatcher(IServiceScopeFactory serviceFactory)
+    public QueryDispatcher(IServiceProvider serviceProvider)
     {
-        _serviceFactory = serviceFactory;
+        _serviceProvider = serviceProvider;
     }
 
-    public async Task<TResult> QueryAsync<TResult>(IQuery<TResult> query)
+    public async Task<TResult> QueryAsync<TResult>(IQuery<TResult> query, CancellationToken cancellationToken = default)
     {
-        using var scope = _serviceFactory.CreateScope();
+        using var scope = _serviceProvider.CreateScope();
         var handlerType = typeof(IQueryHandler<,>).MakeGenericType(query.GetType(), typeof(TResult));
         var handler = scope.ServiceProvider.GetRequiredService(handlerType);
         // ReSharper disable once PossibleNullReferenceException
         return await (Task<TResult>) handlerType
             .GetMethod(nameof(IQueryHandler<IQuery<TResult>, TResult>.HandleAsync))?
-            .Invoke(handler, new object[] {query});
+            .Invoke(handler, new object[] {query, cancellationToken});
     }
 
-    public async Task<TResult> QueryAsync<TQuery, TResult>(TQuery query) where TQuery : class, IQuery<TResult>
+    public async Task<TResult> QueryAsync<TQuery, TResult>(TQuery query, CancellationToken cancellationToken = default)
+        where TQuery : class, IQuery<TResult>
     {
-        using var scope = _serviceFactory.CreateScope();
+        using var scope = _serviceProvider.CreateScope();
         var handler = scope.ServiceProvider.GetRequiredService<IQueryHandler<TQuery, TResult>>();
-        return await handler.HandleAsync(query);
+        return await handler.HandleAsync(query, cancellationToken);
     }
 }

src/Convey.CQRS.Queries/src/Convey.CQRS.Queries/IQueryDispatcher.cs

@@ -1,9 +1,12 @@
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Convey.CQRS.Queries;
 
 public interface IQueryDispatcher
 {
-    Task<TResult> QueryAsync<TResult>(IQuery<TResult> query);
-    Task<TResult> QueryAsync<TQuery, TResult>(TQuery query) where TQuery : class, IQuery<TResult>;
+    Task<TResult> QueryAsync<TResult>(IQuery<TResult> query, CancellationToken cancellationToken = default);
+
+    Task<TResult> QueryAsync<TQuery, TResult>(TQuery query, CancellationToken cancellationToken = default)
+        where TQuery : class, IQuery<TResult>;
 }

src/Convey.CQRS.Queries/src/Convey.CQRS.Queries/IQueryHandler.cs

@@ -1,8 +1,9 @@
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Convey.CQRS.Queries;
 
 public interface IQueryHandler<in TQuery,TResult> where TQuery : class, IQuery<TResult>
 {
-    Task<TResult> HandleAsync(TQuery query);
+    Task<TResult> HandleAsync(TQuery query, CancellationToken cancellationToken = default);
 }

src/Convey.Discovery.Consul/scripts/dotnet-pack.sh

@@ -3,7 +3,7 @@ echo Executing after success scripts on branch $TRAVIS_BRANCH
 echo Triggering Nuget package build
 
 cd src/Convey.Discovery.Consul/src/Convey.Discovery.Consul
-dotnet pack -c release /p:PackageVersion=0.6.$TRAVIS_BUILD_NUMBER --no-restore -o .
+dotnet pack -c release /p:PackageVersion=1.0.$TRAVIS_BUILD_NUMBER --no-restore -o .
 
 echo Uploading Convey.Discovery.Consul package to Nuget using branch $TRAVIS_BRANCH
 

src/Convey.Discovery.Consul/src/Convey.Discovery.Consul/Services/ConsulHostedService.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Convey.Discovery.Consul.Models;
@@ -9,18 +10,18 @@ namespace Convey.Discovery.Consul.Services;
 
 internal sealed class ConsulHostedService : IHostedService
 {
-    private readonly IServiceScopeFactory _serviceScopeFactory;
+    private readonly IServiceProvider _serviceProvider;
     private readonly ILogger<ConsulHostedService> _logger;
 
-    public ConsulHostedService(IServiceScopeFactory serviceScopeFactory, ILogger<ConsulHostedService> logger)
+    public ConsulHostedService(IServiceProvider serviceProvider, ILogger<ConsulHostedService> logger)
     {
-        _serviceScopeFactory = serviceScopeFactory;
+        _serviceProvider = serviceProvider;
         _logger = logger;
     }
 
     public async Task StartAsync(CancellationToken cancellationToken)
     {
-        using var scope = _serviceScopeFactory.CreateScope();
+        using var scope = _serviceProvider.CreateScope();
         var consulService = scope.ServiceProvider.GetRequiredService<IConsulService>();
         var registration = scope.ServiceProvider.GetRequiredService<ServiceRegistration>();
         _logger.LogInformation($"Registering a service [id: {registration.Id}] in Consul...");
@@ -36,7 +37,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
 
     public async Task StopAsync(CancellationToken cancellationToken)
     {
-        using var scope = _serviceScopeFactory.CreateScope();
+        using var scope = _serviceProvider.CreateScope();
         var consulService = scope.ServiceProvider.GetRequiredService<IConsulService>();
         var registration = scope.ServiceProvider.GetRequiredService<ServiceRegistration>();
         _logger.LogInformation($"Deregistering a service [id: {registration.Id}] from Consul...");

src/Convey.Docs.Swagger/scripts/dotnet-pack.sh

@@ -3,7 +3,7 @@ echo Executing after success scripts on branch $TRAVIS_BRANCH
 echo Triggering Nuget package build
 
 cd src/Convey.Docs.Swagger/src/Convey.Docs.Swagger
-dotnet pack -c release /p:PackageVersion=0.6.$TRAVIS_BUILD_NUMBER --no-restore -o .
+dotnet pack -c release /p:PackageVersion=1.0.$TRAVIS_BUILD_NUMBER --no-restore -o .
 
 echo Uploading Convey.Docs.Swagger package to Nuget using branch $TRAVIS_BRANCH
 

src/Convey.HTTP.RestEase/scripts/dotnet-pack.sh

@@ -3,7 +3,7 @@ echo Executing after success scripts on branch $TRAVIS_BRANCH
 echo Triggering Nuget package build
 
 cd src/Convey.HTTP.RestEase/src/Convey.HTTP.RestEase
-dotnet pack -c release /p:PackageVersion=0.6.$TRAVIS_BUILD_NUMBER --no-restore -o .
+dotnet pack -c release /p:PackageVersion=1.0.$TRAVIS_BUILD_NUMBER --no-restore -o .
 
 echo Uploading Convey.HTTP.RestEase package to Nuget using branch $TRAVIS_BRANCH