Updated libraries to 3.1.1, raised lib version to the 3.1.1 also

antonyvorontsov · antonyvorontsov · commit 056daa47c75b · 2020-01-18T18:44:21.000+03:00
diff --git a/examples/Examples.ConsumerConsole/Examples.ConsumerConsole.csproj b/examples/Examples.ConsumerConsole/Examples.ConsumerConsole.csproj
@@ -5,12 +5,16 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1998</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -23,4 +27,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/examples/Examples.ConsumerHost/ConsumingService.cs b/examples/Examples.ConsumerHost/ConsumingService.cs
@@ -1,7 +1,6 @@
 ﻿using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using RabbitMQ.Client.Core.DependencyInjection;
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/examples/Examples.ConsumerHost/Examples.ConsumerHost.csproj b/examples/Examples.ConsumerHost/Examples.ConsumerHost.csproj
@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -24,4 +24,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/examples/Examples.Producer/Examples.Producer.csproj b/examples/Examples.Producer/Examples.Producer.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\RabbitMQ.Client.Core.DependencyInjection\RabbitMQ.Client.Core.DependencyInjection.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/Extensions/WildcardExtensions.cs b/src/RabbitMQ.Client.Core.DependencyInjection/Extensions/WildcardExtensions.cs
@@ -15,7 +15,7 @@ public static class WildcardExtensions
         const string Separator = ".";
         const string SingleWordPattern = "*";
         const string MultipleWordsPattern = "#";
-        
+
         /// <summary>
         /// Construct tree (trie) structure of message handler route patterns.
         /// </summary>
@@ -39,8 +39,8 @@ public static IEnumerable<TreeNode> ConstructRoutesTree(IEnumerable<string> rout
                 {
                     var part = keyParts[index];
 
-                    var existingNode = index == keyParts.Length - 1 
-                        ? currentTreeNode.FirstOrDefault(x => x.KeyPartition == part && x.IsLastNode) 
+                    var existingNode = index == keyParts.Length - 1
+                        ? currentTreeNode.FirstOrDefault(x => x.KeyPartition == part && x.IsLastNode)
                         : currentTreeNode.FirstOrDefault(x => x.KeyPartition == part && !x.IsLastNode);
 
                     if (existingNode is null)
@@ -76,7 +76,7 @@ public static IEnumerable<string> GetMatchingRoutePatterns(IEnumerable<TreeNode>
         {
             return GetMatchingRoutePatterns(tree, routingKeyParts, depth: 0);
         }
-        
+
         static IEnumerable<string> GetMatchingRoutePatterns(IEnumerable<TreeNode> tree, string[] routingKeyParts, int depth)
         {
             foreach (var node in tree)
@@ -118,15 +118,15 @@ static IEnumerable<string> GetMatchingRoutePatterns(IEnumerable<TreeNode> tree,
                 }
             }
         }
-        
+
         static IEnumerable<string[]> CollectRoutingKeyTails(IReadOnlyCollection<string> routingKeyParts, int depthStart)
         {
             for (var index = depthStart; index < routingKeyParts.Count; index++)
             {
                 yield return routingKeyParts.Skip(index).ToArray();
             }
         }
-        
+
         static string CollectRoutingKeyInReverseOrder(TreeNode node, string routingKey = "")
         {
             routingKey = string.IsNullOrEmpty(routingKey) ? node.KeyPartition : $"{node.KeyPartition}.{routingKey}";
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/MessageHandlerContainerBuilder.cs b/src/RabbitMQ.Client.Core.DependencyInjection/MessageHandlerContainerBuilder.cs
@@ -18,7 +18,7 @@ public class MessageHandlerContainerBuilder : IMessageHandlerContainerBuilder
         readonly IEnumerable<IAsyncMessageHandler> _asyncMessageHandlers;
         readonly IEnumerable<INonCyclicMessageHandler> _nonCyclicHandlers;
         readonly IEnumerable<IAsyncNonCyclicMessageHandler> _asyncNonCyclicHandlers;
-        
+
         public MessageHandlerContainerBuilder(
             IEnumerable<MessageHandlerRouter> routers,
             IEnumerable<IMessageHandler> messageHandlers,
@@ -32,7 +32,7 @@ public MessageHandlerContainerBuilder(
             _nonCyclicHandlers = nonCyclicHandlers;
             _asyncNonCyclicHandlers = asyncNonCyclicHandlers;
         }
-        
+
         /// <summary>
         /// Build message handler containers collection.
         /// </summary>
@@ -46,7 +46,7 @@ public IEnumerable<MessageHandlerContainer> BuildCollection()
                 var container = CreateContainer(null, generalRouters);
                 containers.Add(container);
             }
-            
+
             var exchanges = _routers.Where(x => !x.IsGeneral).Select(x => x.Exchange).Distinct().ToList();
             foreach (var exchange in exchanges)
             {
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/MessageHandlerDependencyInjectionExtensions.cs b/src/RabbitMQ.Client.Core.DependencyInjection/MessageHandlerDependencyInjectionExtensions.cs
@@ -169,7 +169,7 @@ public static IServiceCollection AddAsyncNonCyclicMessageHandlerSingleton<T>(thi
         /// <returns>Service collection.</returns>
         public static IServiceCollection AddAsyncNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routePatterns) where T : class, IAsyncNonCyclicMessageHandler =>
             services.AddInstanceSingleton<IAsyncNonCyclicMessageHandler, T>(routePatterns.ToList());
-        
+
         /// <summary>
         /// Add a transient message handler.
         /// </summary>
@@ -361,7 +361,7 @@ public static IServiceCollection AddAsyncNonCyclicMessageHandlerSingleton<T>(thi
         public static IServiceCollection AddAsyncNonCyclicMessageHandlerSingleton<T>(this IServiceCollection services, IEnumerable<string> routePatterns, string exchange)
             where T : class, IAsyncNonCyclicMessageHandler =>
             services.AddInstanceSingleton<IAsyncNonCyclicMessageHandler, T>(routePatterns.ToList(), exchange);
-        
+
         static IServiceCollection AddInstanceTransient<TInterface, TImplementation>(this IServiceCollection services, IEnumerable<string> routePatterns)
             where TInterface : class
             where TImplementation : class, TInterface =>
@@ -371,7 +371,7 @@ static IServiceCollection AddInstanceSingleton<TInterface, TImplementation>(this
             where TInterface : class
             where TImplementation : class, TInterface =>
             services.AddInstanceSingleton<TInterface, TImplementation>(routePatterns, null);
-        
+
         static IServiceCollection AddInstanceTransient<TInterface, TImplementation>(this IServiceCollection services, IEnumerable<string> routePatterns, string exchange)
             where TInterface : class
             where TImplementation : class, TInterface
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/MessageHandlingService.cs b/src/RabbitMQ.Client.Core.DependencyInjection/MessageHandlingService.cs
@@ -16,11 +16,11 @@ namespace RabbitMQ.Client.Core.DependencyInjection
     public class MessageHandlingService : IMessageHandlingService
     {
         const int ResendTimeout = 60;
-        
+
         readonly IEnumerable<RabbitMqExchange> _exchanges;
         readonly IEnumerable<MessageHandlerContainer> _messageHandlerContainers;
         readonly ILogger<MessageHandlingService> _logger;
-        
+
         public MessageHandlingService(
             IMessageHandlerContainerBuilder messageHandlerContainerBuilder,
             IEnumerable<RabbitMqExchange> exchanges,
@@ -30,7 +30,7 @@ public MessageHandlingService(
             _messageHandlerContainers = messageHandlerContainerBuilder.BuildCollection();
             _logger = logger;
         }
-        
+
         /// <summary>
         /// Handle message receiving event.
         /// </summary>
@@ -85,7 +85,7 @@ public void HandleMessageReceivingEvent(BasicDeliverEventArgs eventArgs, IQueueS
 
         IEnumerable<string> GetMatchingRoutePatterns(string exchange, string routingKey)
         {
-            var tree = _messageHandlerContainers.FirstOrDefault(x => x.Exchange == exchange)?.Tree 
+            var tree = _messageHandlerContainers.FirstOrDefault(x => x.Exchange == exchange)?.Tree
                 ?? _messageHandlerContainers.FirstOrDefault(x => x.IsGeneral)?.Tree;
             if (tree is null)
             {
@@ -166,7 +166,7 @@ void ProcessMessage(string exchange, string message, IQueueService queueService,
                         executedHandlers.Add(handlerType);
                         RunNonCyclicMessageHandler(handler, message, matchingRoute, queueService);
                     }
-                } 
+                }
             }
         }
 
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/Models/MessageHandlerContainer.cs b/src/RabbitMQ.Client.Core.DependencyInjection/Models/MessageHandlerContainer.cs
@@ -15,7 +15,7 @@ public class MessageHandlerContainer
         /// Could be null.
         /// </remarks>
         public string Exchange { get; set; }
-        
+
         /// <summary>
         /// Route patterns tree (trie) structure.
         /// </summary>
@@ -30,17 +30,17 @@ public class MessageHandlerContainer
         /// Dictionary of route patterns and message handlers connected by them.
         /// </summary>
         public IDictionary<string, IList<IMessageHandler>> MessageHandlers { get; set; }
-        
+
         /// <summary>
         /// Dictionary of route patterns and async message handlers connected by them.
         /// </summary>
         public IDictionary<string, IList<IAsyncMessageHandler>> AsyncMessageHandlers { get; set; }
-        
+
         /// <summary>
         /// Dictionary of route patterns and non-cyclic message handlers connected by them.
         /// </summary>
         public IDictionary<string, IList<INonCyclicMessageHandler>> NonCyclicHandlers { get; set; }
-        
+
         /// <summary>
         /// Dictionary of route patterns and async non-cyclic message handlers connected by them.
         /// </summary>
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/Models/TreeNode.cs b/src/RabbitMQ.Client.Core.DependencyInjection/Models/TreeNode.cs
@@ -24,7 +24,7 @@ public class TreeNode
         /// Child nodes.
         /// </summary>
         public List<TreeNode> Nodes { get; } = new List<TreeNode>();
-        
+
         /// <summary>
         /// Flag is the node "last" - a single word that comes without any other parts.
         /// </summary>
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/QueueService.cs b/src/RabbitMQ.Client.Core.DependencyInjection/QueueService.cs
@@ -24,7 +24,7 @@ internal class QueueService : IQueueService, IDisposable
 
         readonly IConnection _connection;
         readonly IModel _channel;
-        
+
         readonly IMessageHandlingService _messageHandlingService;
         readonly IEnumerable<RabbitMqExchange> _exchanges;
         readonly ILogger<QueueService> _logger;
@@ -50,7 +50,7 @@ public QueueService(
             _messageHandlingService = messageHandlingService;
             _exchanges = exchanges;
             _logger = logger;
-            
+
             _connection = CreateRabbitMqConnection(options.Value);
             // Event handling.
             _connection.CallbackException += HandleConnectionCallbackException;
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/RabbitMQ.Client.Core.DependencyInjection.csproj b/src/RabbitMQ.Client.Core.DependencyInjection/RabbitMQ.Client.Core.DependencyInjection.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Version>3.1.0</Version>
+    <Version>3.1.1</Version>
     <PackageTags>RabbitMQ</PackageTags>
     <RepositoryUrl>https://github.com/AntonyVorontsov/RabbitMQ.Client.Core.DependencyInjection</RepositoryUrl>
     <Company />
@@ -19,9 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
   </ItemGroup>
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/RabbitMqClientDependencyInjectionExtensions.cs b/src/RabbitMQ.Client.Core.DependencyInjection/RabbitMqClientDependencyInjectionExtensions.cs
@@ -43,7 +43,7 @@ public static IServiceCollection AddRabbitMqClient(this IServiceCollection servi
             services.AddSingleton<IQueueService, QueueService>();
             return services;
         }
-        
+
         /// <summary>
         /// Add RabbitMQ client and required service infrastructure.
         /// </summary>
@@ -60,7 +60,7 @@ public static IServiceCollection AddRabbitMqClientTransient(this IServiceCollect
             services.AddTransient<IQueueService, QueueService>();
             return services;
         }
-        
+
         /// <summary>
         /// Add RabbitMQ client and required service infrastructure.
         /// </summary>
diff --git a/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/RabbitMQ.Client.Core.DependencyInjection.Tests.csproj b/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/RabbitMQ.Client.Core.DependencyInjection.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
diff --git a/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/HandleMessageReceivingEventTestData.cs b/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/HandleMessageReceivingEventTestData.cs
@@ -6,7 +6,7 @@ namespace RabbitMQ.Client.Core.DependencyInjection.Tests.UnitTests
     public class HandleMessageReceivingEventTestData : IEnumerable<object[]>
     {
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-        
+
         public IEnumerator<object[]> GetEnumerator()
         {
             yield return new object[]
diff --git a/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/HandleMessageReceivingEventTestDataModel.cs b/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/HandleMessageReceivingEventTestDataModel.cs
@@ -5,31 +5,31 @@ namespace RabbitMQ.Client.Core.DependencyInjection.Tests.UnitTests
     public class HandleMessageReceivingEventTestDataModel
     {
         public string MessageRoutingKey { get; set; }
-        
+
         public string MessageExchange { get; set; }
 
         public string MessageHandlerExchange { get; set; }
-        
+
         public List<string> MessageHandlerPatterns { get; set; }
-            
+
         public bool MessageHandlerShouldTrigger { get; set; }
 
         public string AsyncMessageHandlerExchange { get; set; }
-            
+
         public List<string> AsyncMessageHandlerPatterns { get; set; }
-            
+
         public bool AsyncMessageHandlerShouldTrigger { get; set; }
 
-        public string NonCyclicMessageHandlerExchange { get; set; }           
-            
+        public string NonCyclicMessageHandlerExchange { get; set; }
+
         public List<string> NonCyclicMessageHandlerPatterns { get; set; }
-            
+
         public bool NonCyclicMessageHandlerShouldTrigger { get; set; }
 
         public string AsyncNonCyclicMessageHandlerExchange { get; set; }
-            
+
         public List<string> AsyncNonCyclicMessageHandlerPatterns { get; set; }
-        
+
         public bool AsyncNonCyclicMessageHandlerShouldTrigger { get; set; }
     }
 }
diff --git a/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/MessageHandlingServiceTests.cs b/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/MessageHandlingServiceTests.cs
diff --git a/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/WildcardExtensionsTests.cs b/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/WildcardExtensionsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class WildcardExtensions`
`15`	`15`	`const string Separator = ".";`
`16`	`16`	`const string SingleWordPattern = "*";`
`17`	`17`	`const string MultipleWordsPattern = "#";`
`18`		`-`
	`18`	`+`
`19`	`19`	`/// <summary>`
`20`	`20`	`/// Construct tree (trie) structure of message handler route patterns.`
`21`	`21`	`/// </summary>`
`@@ -39,8 +39,8 @@ public static IEnumerable<TreeNode> ConstructRoutesTree(IEnumerable<string> rout`
`39`	`39`	`{`
`40`	`40`	`var part = keyParts[index];`
`41`	`41`
`42`		`- var existingNode = index == keyParts.Length - 1`
`43`		`- ? currentTreeNode.FirstOrDefault(x => x.KeyPartition == part && x.IsLastNode)`
	`42`	`+ var existingNode = index == keyParts.Length - 1`
	`43`	`+ ? currentTreeNode.FirstOrDefault(x => x.KeyPartition == part && x.IsLastNode)`
`44`	`44`	`: currentTreeNode.FirstOrDefault(x => x.KeyPartition == part && !x.IsLastNode);`
`45`	`45`
`46`	`46`	`if (existingNode is null)`
`@@ -76,7 +76,7 @@ public static IEnumerable<string> GetMatchingRoutePatterns(IEnumerable<TreeNode>`
`76`	`76`	`{`
`77`	`77`	`return GetMatchingRoutePatterns(tree, routingKeyParts, depth: 0);`
`78`	`78`	`}`
`79`		`-`
	`79`	`+`
`80`	`80`	`static IEnumerable<string> GetMatchingRoutePatterns(IEnumerable<TreeNode> tree, string[] routingKeyParts, int depth)`
`81`	`81`	`{`
`82`	`82`	`foreach (var node in tree)`
`@@ -118,15 +118,15 @@ static IEnumerable<string> GetMatchingRoutePatterns(IEnumerable<TreeNode> tree,`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`-`
	`121`	`+`
`122`	`122`	`static IEnumerable<string[]> CollectRoutingKeyTails(IReadOnlyCollection<string> routingKeyParts, int depthStart)`
`123`	`123`	`{`
`124`	`124`	`for (var index = depthStart; index < routingKeyParts.Count; index++)`
`125`	`125`	`{`
`126`	`126`	`yield return routingKeyParts.Skip(index).ToArray();`
`127`	`127`	`}`
`128`	`128`	`}`
`129`		`-`
	`129`	`+`
`130`	`130`	`static string CollectRoutingKeyInReverseOrder(TreeNode node, string routingKey = "")`
`131`	`131`	`{`
`132`	`132`	`routingKey = string.IsNullOrEmpty(routingKey) ? node.KeyPartition : $"{node.KeyPartition}.{routingKey}";`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ namespace RabbitMQ.Client.Core.DependencyInjection`
`16`	`16`	`public class MessageHandlingService : IMessageHandlingService`
`17`	`17`	`{`
`18`	`18`	`const int ResendTimeout = 60;`
`19`		`-`
	`19`	`+`
`20`	`20`	`readonly IEnumerable<RabbitMqExchange> _exchanges;`
`21`	`21`	`readonly IEnumerable<MessageHandlerContainer> _messageHandlerContainers;`
`22`	`22`	`readonly ILogger<MessageHandlingService> _logger;`
`23`		`-`
	`23`	`+`
`24`	`24`	`public MessageHandlingService(`
`25`	`25`	`IMessageHandlerContainerBuilder messageHandlerContainerBuilder,`
`26`	`26`	`IEnumerable<RabbitMqExchange> exchanges,`
`@@ -30,7 +30,7 @@ public MessageHandlingService(`
`30`	`30`	`_messageHandlerContainers = messageHandlerContainerBuilder.BuildCollection();`
`31`	`31`	`_logger = logger;`
`32`	`32`	`}`
`33`		`-`
	`33`	`+`
`34`	`34`	`/// <summary>`
`35`	`35`	`/// Handle message receiving event.`
`36`	`36`	`/// </summary>`
`@@ -85,7 +85,7 @@ public void HandleMessageReceivingEvent(BasicDeliverEventArgs eventArgs, IQueueS`
`85`	`85`
`86`	`86`	`IEnumerable<string> GetMatchingRoutePatterns(string exchange, string routingKey)`
`87`	`87`	`{`
`88`		`- var tree = _messageHandlerContainers.FirstOrDefault(x => x.Exchange == exchange)?.Tree`
	`88`	`+ var tree = _messageHandlerContainers.FirstOrDefault(x => x.Exchange == exchange)?.Tree`
`89`	`89`	`?? _messageHandlerContainers.FirstOrDefault(x => x.IsGeneral)?.Tree;`
`90`	`90`	`if (tree is null)`
`91`	`91`	`{`
`@@ -166,7 +166,7 @@ void ProcessMessage(string exchange, string message, IQueueService queueService,`
`166`	`166`	`executedHandlers.Add(handlerType);`
`167`	`167`	`RunNonCyclicMessageHandler(handler, message, matchingRoute, queueService);`
`168`	`168`	`}`
`169`		`- }`
	`169`	`+ }`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`