Upgrade Apache NMS packages (#280)

lahma · web-flow · commit 19fbf9ede2be · 2025-07-23T12:09:19.000+03:00
diff --git a/examples/Directory.Packages.props b/examples/Directory.Packages.props
@@ -3,8 +3,8 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Apache.NMS" Version="2.0.0" />
-    <PackageVersion Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
+    <PackageVersion Include="Apache.NMS" Version="2.2.0" />
+    <PackageVersion Include="Apache.NMS.ActiveMQ" Version="2.1.1" />
     <PackageVersion Include="log4net" Version="3.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Antlr3.Runtime" Version="3.5.1" />
-    <PackageVersion Include="Apache.NMS" Version="2.0.0" />
+    <PackageVersion Include="Apache.NMS" Version="2.2.0" />
     <PackageVersion Include="Castle.NVelocity" Version="1.1.1" />
     <PackageVersion Include="Common.Logging" Version="3.4.1" />
     <PackageVersion Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" />
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageConsumer .cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageConsumer .cs
@@ -59,14 +59,17 @@ public string MessageSelector
     /// </summary>
     public event MessageListener Listener
     {
-        add
-        {
-            target.Listener += value;
-        }
-        remove
-        {
-            target.Listener -= value;
-        }
+        add => target.Listener += value;
+        remove => target.Listener -= value;
+    }
+
+    /// <summary>
+    /// An asynchronous listener which can be used to consume messages asynchronously.
+    /// </summary>
+    public event AsyncMessageListener AsyncListener
+    {
+        add => target.AsyncListener += value;
+        remove => target.AsyncListener -= value;
     }
 
     /// <summary>
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsConsumer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsConsumer.cs
@@ -119,4 +119,10 @@ public event MessageListener Listener
         add => consumer.Listener += value;
         remove => consumer.Listener -= value;
     }
+
+    public event AsyncMessageListener AsyncListener
+    {
+        add => consumer.AsyncListener += value;
+        remove => consumer.AsyncListener -= value;
+    }
 }
diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props
@@ -3,8 +3,8 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Apache.NMS" Version="2.0.0" />
-    <PackageVersion Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
+    <PackageVersion Include="Apache.NMS" Version="2.2.0" />
+    <PackageVersion Include="Apache.NMS.ActiveMQ" Version="2.1.1" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageVersion Include="FakeItEasy" Version="8.3.0" />
     <PackageVersion Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1" />
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageConsumer.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageConsumer.cs
@@ -22,13 +22,20 @@ public class TestMessageConsumer : IMessageConsumer
 {
     public string MessageSelector { get; }
     public event MessageListener Listener;
+    public event AsyncMessageListener AsyncListener;
 
     private void InvokeListener(IMessage message)
     {
         MessageListener listener = Listener;
         if (listener != null) listener(message);
     }
 
+    private void InvokeAsyncListener(IMessage message)
+    {
+        AsyncMessageListener listener = AsyncListener;
+        if (listener != null) listener(message, CancellationToken.None);
+    }
+
     public IMessage Receive()
     {
         throw new NotImplementedException();
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageListenerContainerTests.cs
@@ -131,12 +131,18 @@ internal class SimpleMessageConsumer : IMessageConsumer
     {
         public string MessageSelector { get; }
         public event MessageListener Listener;
+        public event AsyncMessageListener AsyncListener;
 
         public void SendMessage(IMessage message)
         {
             Listener(message);
         }
 
+        public void SendAsyncMessage(IMessage message)
+        {
+            AsyncListener(message, CancellationToken.None);
+        }
+
         public IMessage Receive()
         {
             throw new NotImplementedException();

Original file line number	Diff line number	Diff line change
`@@ -119,4 +119,10 @@ public event MessageListener Listener`
`119`	`119`	`add => consumer.Listener += value;`
`120`	`120`	`remove => consumer.Listener -= value;`
`121`	`121`	`}`
	`122`	`+`
	`123`	`+ public event AsyncMessageListener AsyncListener`
	`124`	`+ {`
	`125`	`+ add => consumer.AsyncListener += value;`
	`126`	`+ remove => consumer.AsyncListener -= value;`
	`127`	`+ }`
`122`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,20 @@ public class TestMessageConsumer : IMessageConsumer`
`22`	`22`	`{`
`23`	`23`	`public string MessageSelector { get; }`
`24`	`24`	`public event MessageListener Listener;`
	`25`	`+ public event AsyncMessageListener AsyncListener;`
`25`	`26`
`26`	`27`	`private void InvokeListener(IMessage message)`
`27`	`28`	`{`
`28`	`29`	`MessageListener listener = Listener;`
`29`	`30`	`if (listener != null) listener(message);`
`30`	`31`	`}`
`31`	`32`
	`33`	`+ private void InvokeAsyncListener(IMessage message)`
	`34`	`+ {`
	`35`	`+ AsyncMessageListener listener = AsyncListener;`
	`36`	`+ if (listener != null) listener(message, CancellationToken.None);`
	`37`	`+ }`
	`38`	`+`
`32`	`39`	`public IMessage Receive()`
`33`	`40`	`{`
`34`	`41`	`throw new NotImplementedException();`
Original file line number	Diff line number	Diff line change
`@@ -131,12 +131,18 @@ internal class SimpleMessageConsumer : IMessageConsumer`
`131`	`131`	`{`
`132`	`132`	`public string MessageSelector { get; }`
`133`	`133`	`public event MessageListener Listener;`
	`134`	`+ public event AsyncMessageListener AsyncListener;`
`134`	`135`
`135`	`136`	`public void SendMessage(IMessage message)`
`136`	`137`	`{`
`137`	`138`	`Listener(message);`
`138`	`139`	`}`
`139`	`140`
	`141`	`+ public void SendAsyncMessage(IMessage message)`
	`142`	`+ {`
	`143`	`+ AsyncListener(message, CancellationToken.None);`
	`144`	`+ }`
	`145`	`+`
`140`	`146`	`public IMessage Receive()`
`141`	`147`	`{`
`142`	`148`	`throw new NotImplementedException();`