Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/NServiceBus.Shared/CommonEndpointSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.UseAttributeRouting();

if (asSendOnly)
{
Expand Down
2 changes: 2 additions & 0 deletions src/NServiceBus.Shared/NServiceBus.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

<ItemGroup>
<PackageReference Include="NServiceBus" Version="7.1.9" />
<PackageReference Include="NServiceBus.AttributeConventions" Version="0.0.2" />
<PackageReference Include="NServiceBus.AttributeRouting" Version="0.0.5" />
<PackageReference Include="NServiceBus.Heartbeat" Version="3.0.1" />
<PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="3.0.2" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.2.0" />
Expand Down
4 changes: 3 additions & 1 deletion src/Sales.Messages.Events/ProductAddedToCart.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using System;
using NServiceBus.AttributeConventions.Contracts;
using System;

namespace Sales.Messages.Events
{
[Event]
public interface ProductAddedToCart
{
Guid CartId { get; set; }
Expand Down
4 changes: 4 additions & 0 deletions src/Sales.Messages.Events/Sales.Messages.Events.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NServiceBus.AttributeConventions.Contracts" Version="0.0.2" />
</ItemGroup>

</Project>
4 changes: 3 additions & 1 deletion src/Sales.Messages.Events/ShoppingCartGotInactive.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using System;
using NServiceBus.AttributeConventions.Contracts;
using System;

namespace Sales.Messages.Events
{
[Event]
public interface ShoppingCartGotInactive
{
Guid CartId { get; set; }
Expand Down
4 changes: 3 additions & 1 deletion src/Sales.Messages.Events/ShoppingCartGotStale.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using System;
using NServiceBus.AttributeConventions.Contracts;
using System;

namespace Sales.Messages.Events
{
[Event]
public interface ShoppingCartGotStale
{
Guid CartId { get; set; }
Expand Down
5 changes: 4 additions & 1 deletion src/Sales.Messages/CleanupFailedCartRequest.cs
Original file line number Diff line number Diff line change
@@ -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; }
Expand Down
5 changes: 5 additions & 0 deletions src/Sales.Messages/Sales.Messages.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NServiceBus.AttributeConventions.Contracts" Version="0.0.2" />
<PackageReference Include="NServiceBus.AttributeRouting.Contracts" Version="0.0.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/Shipping.Messages/CleanupFailedCartRequest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using System;
using NServiceBus.AttributeConventions.Contracts;
using System;

namespace Shipping.Messages
{
[Message]
public class CleanupFailedCartRequest
{
public Guid CartId { get; set; }
Expand Down
4 changes: 3 additions & 1 deletion src/Shipping.Messages/Commands/AddItemToCart.cs
Original file line number Diff line number Diff line change
@@ -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; }
Expand Down
4 changes: 4 additions & 0 deletions src/Shipping.Messages/Shipping.Messages.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NServiceBus.AttributeConventions.Contracts" Version="0.0.2" />
</ItemGroup>

</Project>
5 changes: 4 additions & 1 deletion src/Warehouse.Messages/CleanupFailedCartRequest.cs
Original file line number Diff line number Diff line change
@@ -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; }
Expand Down
5 changes: 4 additions & 1 deletion src/Warehouse.Messages/Commands/AddItemToCart.cs
Original file line number Diff line number Diff line change
@@ -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; }
Expand Down
5 changes: 5 additions & 0 deletions src/Warehouse.Messages/Warehouse.Messages.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NServiceBus.AttributeConventions.Contracts" Version="0.0.2" />
<PackageReference Include="NServiceBus.AttributeRouting.Contracts" Version="0.0.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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]),
Expand All @@ -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
Expand Down