Updated library version to v2.2.2

Author: antonyvorontsov

examples/Examples.ConsumerConsole/Examples.ConsumerConsole.csproj

@@ -5,6 +5,10 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;1998</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
@@ -23,4 +27,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>

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;
 

examples/Examples.ConsumerHost/Examples.ConsumerHost.csproj

@@ -24,4 +24,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>

examples/Examples.Producer/Examples.Producer.csproj

@@ -13,4 +13,4 @@
     <ProjectReference Include="..\..\src\RabbitMQ.Client.Core.DependencyInjection\RabbitMQ.Client.Core.DependencyInjection.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>

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}";

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)
             {

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

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);
                     }
-                } 
+                }
             }
         }
 

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>

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>