From b0b251d919e61443bae3efc6ec2af8f0f86b7422 Mon Sep 17 00:00:00 2001 From: mauroservienti Date: Tue, 18 Jun 2019 17:21:24 +0200 Subject: [PATCH 1/2] support for AttributeConventions and AttributeRouting --- src/NServiceBus.Shared/CommonEndpointSettings.cs | 6 ++---- src/NServiceBus.Shared/NServiceBus.Shared.csproj | 2 ++ src/Sales.Messages.Events/ProductAddedToCart.cs | 4 +++- src/Sales.Messages.Events/Sales.Messages.Events.csproj | 4 ++++ src/Sales.Messages.Events/ShoppingCartGotInactive.cs | 4 +++- src/Sales.Messages.Events/ShoppingCartGotStale.cs | 4 +++- src/Sales.Messages/CleanupFailedCartRequest.cs | 5 ++++- src/Sales.Messages/Sales.Messages.csproj | 5 +++++ .../ShoppingCartAddPostHandler.cs | 2 +- src/Shipping.Messages/CleanupFailedCartRequest.cs | 4 +++- src/Shipping.Messages/Commands/AddItemToCart.cs | 4 +++- src/Shipping.Messages/Shipping.Messages.csproj | 4 ++++ src/Warehouse.Messages/CleanupFailedCartRequest.cs | 5 ++++- src/Warehouse.Messages/Commands/AddItemToCart.cs | 5 ++++- src/Warehouse.Messages/Warehouse.Messages.csproj | 5 +++++ .../ShoppingCartAddPostHandler.cs | 4 ++-- 16 files changed, 52 insertions(+), 15 deletions(-) diff --git a/src/NServiceBus.Shared/CommonEndpointSettings.cs b/src/NServiceBus.Shared/CommonEndpointSettings.cs index 556de0a0..35de7672 100644 --- a/src/NServiceBus.Shared/CommonEndpointSettings.cs +++ b/src/NServiceBus.Shared/CommonEndpointSettings.cs @@ -18,10 +18,8 @@ public static void ApplyCommonConfiguration(this EndpointConfiguration config, b frequency: TimeSpan.FromSeconds(10), timeToLive: TimeSpan.FromSeconds(5)); - var messageConventions = config.Conventions(); - messageConventions.DefiningMessagesAs(t => t.Namespace != null && t.Namespace.EndsWith(".Messages")); - messageConventions.DefiningEventsAs(t => t.Namespace != null && t.Namespace.EndsWith(".Messages.Events")); - messageConventions.DefiningCommandsAs(t => t.Namespace != null && t.Namespace.EndsWith(".Messages.Commands")); + config.UseAttributeConventions(); + config.EnableAttributeRouting(); if (asSendOnly) { diff --git a/src/NServiceBus.Shared/NServiceBus.Shared.csproj b/src/NServiceBus.Shared/NServiceBus.Shared.csproj index d650437e..bc296956 100644 --- a/src/NServiceBus.Shared/NServiceBus.Shared.csproj +++ b/src/NServiceBus.Shared/NServiceBus.Shared.csproj @@ -6,6 +6,8 @@ + + diff --git a/src/Sales.Messages.Events/ProductAddedToCart.cs b/src/Sales.Messages.Events/ProductAddedToCart.cs index f5dca679..87e7095e 100644 --- a/src/Sales.Messages.Events/ProductAddedToCart.cs +++ b/src/Sales.Messages.Events/ProductAddedToCart.cs @@ -1,7 +1,9 @@ -using System; +using NServiceBus.AttributeConventions.Contracts; +using System; namespace Sales.Messages.Events { + [Event] public interface ProductAddedToCart { Guid CartId { get; set; } diff --git a/src/Sales.Messages.Events/Sales.Messages.Events.csproj b/src/Sales.Messages.Events/Sales.Messages.Events.csproj index 9f5c4f4a..95adc8da 100644 --- a/src/Sales.Messages.Events/Sales.Messages.Events.csproj +++ b/src/Sales.Messages.Events/Sales.Messages.Events.csproj @@ -4,4 +4,8 @@ netstandard2.0 + + + + diff --git a/src/Sales.Messages.Events/ShoppingCartGotInactive.cs b/src/Sales.Messages.Events/ShoppingCartGotInactive.cs index 019ca08b..48de97df 100644 --- a/src/Sales.Messages.Events/ShoppingCartGotInactive.cs +++ b/src/Sales.Messages.Events/ShoppingCartGotInactive.cs @@ -1,7 +1,9 @@ -using System; +using NServiceBus.AttributeConventions.Contracts; +using System; namespace Sales.Messages.Events { + [Event] public interface ShoppingCartGotInactive { Guid CartId { get; set; } diff --git a/src/Sales.Messages.Events/ShoppingCartGotStale.cs b/src/Sales.Messages.Events/ShoppingCartGotStale.cs index fc5ef25e..fde88bca 100644 --- a/src/Sales.Messages.Events/ShoppingCartGotStale.cs +++ b/src/Sales.Messages.Events/ShoppingCartGotStale.cs @@ -1,7 +1,9 @@ -using System; +using NServiceBus.AttributeConventions.Contracts; +using System; namespace Sales.Messages.Events { + [Event] public interface ShoppingCartGotStale { Guid CartId { get; set; } diff --git a/src/Sales.Messages/CleanupFailedCartRequest.cs b/src/Sales.Messages/CleanupFailedCartRequest.cs index 023b7564..d2be4e48 100644 --- a/src/Sales.Messages/CleanupFailedCartRequest.cs +++ b/src/Sales.Messages/CleanupFailedCartRequest.cs @@ -1,7 +1,10 @@ -using System; +using NServiceBus.AttributeConventions.Contracts; +using NServiceBus.AttributeRouting.Contracts; +using System; namespace Sales.Messages { + [Message, RouteTo("Sales.Service")] public class CleanupFailedCartRequest { public Guid CartId { get; set; } diff --git a/src/Sales.Messages/Sales.Messages.csproj b/src/Sales.Messages/Sales.Messages.csproj index 9f5c4f4a..3928ee67 100644 --- a/src/Sales.Messages/Sales.Messages.csproj +++ b/src/Sales.Messages/Sales.Messages.csproj @@ -4,4 +4,9 @@ netstandard2.0 + + + + + diff --git a/src/Sales.ViewModelComposition/ShoppingCartAddPostHandler.cs b/src/Sales.ViewModelComposition/ShoppingCartAddPostHandler.cs index 7153ff78..2ef65200 100644 --- a/src/Sales.ViewModelComposition/ShoppingCartAddPostHandler.cs +++ b/src/Sales.ViewModelComposition/ShoppingCartAddPostHandler.cs @@ -62,7 +62,7 @@ public async Task Handle(string requestId, dynamic vm, RouteData routeData, Http public Task OnRequestError(string requestId, Exception ex, dynamic vm, RouteData routeData, HttpRequest request) { - return messageSession.Send("Sales.Service", new CleanupFailedCartRequest() + return messageSession.Send(new CleanupFailedCartRequest() { CartId = new Guid(request.Cookies["cart-id"]), RequestId = requestId diff --git a/src/Shipping.Messages/CleanupFailedCartRequest.cs b/src/Shipping.Messages/CleanupFailedCartRequest.cs index 24d7db22..31ac8bde 100644 --- a/src/Shipping.Messages/CleanupFailedCartRequest.cs +++ b/src/Shipping.Messages/CleanupFailedCartRequest.cs @@ -1,7 +1,9 @@ -using System; +using NServiceBus.AttributeConventions.Contracts; +using System; namespace Shipping.Messages { + [Message] public class CleanupFailedCartRequest { public Guid CartId { get; set; } diff --git a/src/Shipping.Messages/Commands/AddItemToCart.cs b/src/Shipping.Messages/Commands/AddItemToCart.cs index f23ee8c6..9b1dfcf0 100644 --- a/src/Shipping.Messages/Commands/AddItemToCart.cs +++ b/src/Shipping.Messages/Commands/AddItemToCart.cs @@ -1,7 +1,9 @@ -using System; +using NServiceBus.AttributeConventions.Contracts; +using System; namespace Shipping.Messages.Commands { + [Command] public class AddItemToCart { public int ProductId { get; set; } diff --git a/src/Shipping.Messages/Shipping.Messages.csproj b/src/Shipping.Messages/Shipping.Messages.csproj index 9f5c4f4a..95adc8da 100644 --- a/src/Shipping.Messages/Shipping.Messages.csproj +++ b/src/Shipping.Messages/Shipping.Messages.csproj @@ -4,4 +4,8 @@ netstandard2.0 + + + + diff --git a/src/Warehouse.Messages/CleanupFailedCartRequest.cs b/src/Warehouse.Messages/CleanupFailedCartRequest.cs index adf737a9..1d69c732 100644 --- a/src/Warehouse.Messages/CleanupFailedCartRequest.cs +++ b/src/Warehouse.Messages/CleanupFailedCartRequest.cs @@ -1,7 +1,10 @@ -using System; +using NServiceBus.AttributeConventions.Contracts; +using NServiceBus.AttributeRouting.Contracts; +using System; namespace Warehouse.Messages { + [Message, RouteTo("Warehouse.Service")] public class CleanupFailedCartRequest { public Guid CartId { get; set; } diff --git a/src/Warehouse.Messages/Commands/AddItemToCart.cs b/src/Warehouse.Messages/Commands/AddItemToCart.cs index 5c6ee2f5..09282949 100644 --- a/src/Warehouse.Messages/Commands/AddItemToCart.cs +++ b/src/Warehouse.Messages/Commands/AddItemToCart.cs @@ -1,7 +1,10 @@ -using System; +using NServiceBus.AttributeConventions.Contracts; +using NServiceBus.AttributeRouting.Contracts; +using System; namespace Warehouse.Messages.Commands { + [Command, RouteTo("Warehouse.Service")] public class AddItemToCart { public int ProductId { get; set; } diff --git a/src/Warehouse.Messages/Warehouse.Messages.csproj b/src/Warehouse.Messages/Warehouse.Messages.csproj index 9f5c4f4a..3928ee67 100644 --- a/src/Warehouse.Messages/Warehouse.Messages.csproj +++ b/src/Warehouse.Messages/Warehouse.Messages.csproj @@ -4,4 +4,9 @@ netstandard2.0 + + + + + diff --git a/src/Warehouse.ViewModelComposition/ShoppingCartAddPostHandler.cs b/src/Warehouse.ViewModelComposition/ShoppingCartAddPostHandler.cs index ccf937e7..358c7ff5 100644 --- a/src/Warehouse.ViewModelComposition/ShoppingCartAddPostHandler.cs +++ b/src/Warehouse.ViewModelComposition/ShoppingCartAddPostHandler.cs @@ -31,7 +31,7 @@ public bool Matches(RouteData routeData, string httpVerb, HttpRequest request) public Task Handle(string requestId, dynamic vm, RouteData routeData, HttpRequest request) { - return messageSession.Send("Warehouse.Service", new AddItemToCart() + return messageSession.Send(new AddItemToCart() { ProductId = int.Parse((string)routeData.Values["id"]), Quantity = int.Parse(request.Form["quantity"][0]), @@ -42,7 +42,7 @@ public Task Handle(string requestId, dynamic vm, RouteData routeData, HttpReques public Task OnRequestError(string requestId, Exception ex, dynamic vm, RouteData routeData, HttpRequest request) { - return messageSession.Send("Warehouse.Service", new CleanupFailedCartRequest() + return messageSession.Send(new CleanupFailedCartRequest() { CartId = new Guid(request.Cookies["cart-id"]), RequestId = requestId From a913d9405098ad717d978c27753f9435673e6395 Mon Sep 17 00:00:00 2001 From: mauroservienti Date: Wed, 19 Jun 2019 15:39:55 +0200 Subject: [PATCH 2/2] update to latest nugets --- src/NServiceBus.Shared/CommonEndpointSettings.cs | 2 +- src/NServiceBus.Shared/NServiceBus.Shared.csproj | 4 ++-- src/Sales.Messages.Events/Sales.Messages.Events.csproj | 2 +- src/Sales.Messages/Sales.Messages.csproj | 2 +- src/Shipping.Messages/Shipping.Messages.csproj | 2 +- src/Warehouse.Messages/Warehouse.Messages.csproj | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/NServiceBus.Shared/CommonEndpointSettings.cs b/src/NServiceBus.Shared/CommonEndpointSettings.cs index 35de7672..0fce41c9 100644 --- a/src/NServiceBus.Shared/CommonEndpointSettings.cs +++ b/src/NServiceBus.Shared/CommonEndpointSettings.cs @@ -19,7 +19,7 @@ public static void ApplyCommonConfiguration(this EndpointConfiguration config, b timeToLive: TimeSpan.FromSeconds(5)); config.UseAttributeConventions(); - config.EnableAttributeRouting(); + config.UseAttributeRouting(); if (asSendOnly) { diff --git a/src/NServiceBus.Shared/NServiceBus.Shared.csproj b/src/NServiceBus.Shared/NServiceBus.Shared.csproj index bc296956..c0a92063 100644 --- a/src/NServiceBus.Shared/NServiceBus.Shared.csproj +++ b/src/NServiceBus.Shared/NServiceBus.Shared.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Sales.Messages.Events/Sales.Messages.Events.csproj b/src/Sales.Messages.Events/Sales.Messages.Events.csproj index 95adc8da..030aa66d 100644 --- a/src/Sales.Messages.Events/Sales.Messages.Events.csproj +++ b/src/Sales.Messages.Events/Sales.Messages.Events.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Sales.Messages/Sales.Messages.csproj b/src/Sales.Messages/Sales.Messages.csproj index 3928ee67..7f1f8d27 100644 --- a/src/Sales.Messages/Sales.Messages.csproj +++ b/src/Sales.Messages/Sales.Messages.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Shipping.Messages/Shipping.Messages.csproj b/src/Shipping.Messages/Shipping.Messages.csproj index 95adc8da..030aa66d 100644 --- a/src/Shipping.Messages/Shipping.Messages.csproj +++ b/src/Shipping.Messages/Shipping.Messages.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Warehouse.Messages/Warehouse.Messages.csproj b/src/Warehouse.Messages/Warehouse.Messages.csproj index 3928ee67..7f1f8d27 100644 --- a/src/Warehouse.Messages/Warehouse.Messages.csproj +++ b/src/Warehouse.Messages/Warehouse.Messages.csproj @@ -5,7 +5,7 @@ - +