Merge pull request #87 from Particular/storage-session-bug

Make container information non-mandatory for handlers that don't require storage access

Author: boblangley

src/NServiceBus.Persistence.CosmosDB/SynchronizedStorage/StorageSession.cs

@@ -46,6 +46,12 @@ public void AddOperation(Operation operation)
 
         public async Task Commit()
         {
+            // in case there is nothing to do don't even bother checking the rest
+            if (operations.Count == 0)
+            {
+                return;
+            }
+
             if (ContainerHolder == null)
             {
                 throw new Exception("Unable to retrieve the container name and the partition key during processing. Make sure that either `persistence.Container()` is used or the relevant container information is available on the message handling pipeline.");

src/SharedAcceptanceTests.All/When_regular_handler_with_no_container_information.cs

@@ -0,0 +1,80 @@
+namespace NServiceBus.AcceptanceTests
+{
+    using System.Threading.Tasks;
+    using System;
+    using Persistence.CosmosDB;
+    using Pipeline;
+    using AcceptanceTesting;
+    using EndpointTemplates;
+    using NUnit.Framework;
+
+    public class When_regular_handler_with_no_container_information : NServiceBusAcceptanceTest
+    {
+        [Test]
+        public async Task Should_work()
+        {
+            var context = await Scenario.Define<Context>()
+                .WithEndpoint<EndpointWithRegularHandler>(b => b.When(session => session.SendLocal(new MyMessage())))
+                .Done(c => c.MessageReceived)
+                .Run();
+
+            Assert.True(context.MessageReceived);
+        }
+
+        public class Context : ScenarioContext
+        {
+            public bool MessageReceived { get; set; }
+        }
+
+        public class EndpointWithRegularHandler : EndpointConfigurationBuilder
+        {
+            public EndpointWithRegularHandler()
+            {
+                EndpointSetup<DefaultServer>(config =>
+                {
+                    config.Pipeline.Register(new ContainerInformationRemoverBehavior.Registration());
+                });
+            }
+
+            class ContainerInformationRemoverBehavior : Behavior<IIncomingLogicalMessageContext>
+            {
+                public override Task Invoke(IIncomingLogicalMessageContext context, Func<Task> next)
+                {
+                    context.Extensions.Remove<ContainerInformation>();
+                    return next();
+                }
+
+                public class Registration : RegisterStep
+                {
+                    public Registration() : base(nameof(ContainerInformationRemoverBehavior),
+                        typeof(ContainerInformationRemoverBehavior),
+                        "Removes the container information if present",
+                        b => new ContainerInformationRemoverBehavior())
+                    {
+                        InsertBeforeIfExists(nameof(LogicalOutboxBehavior));
+                    }
+                }
+            }
+
+            public class AHandler : IHandleMessages<MyMessage>
+            {
+                public AHandler(Context testContext)
+                {
+                    this.testContext = testContext;
+                }
+
+                public Task Handle(MyMessage message, IMessageHandlerContext context)
+                {
+                    testContext.MessageReceived = true;
+                    return Task.CompletedTask;
+                }
+
+                readonly Context testContext;
+            }
+        }
+
+        public class MyMessage : ICommand
+        {
+        }
+    }
+}