Refactoring namespace

src/DotNetCore.CAP.AzureServiceBus/AzureServiceBusConsumerClient.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Messages;
+using DotNetCore.CAP.Transport;
 using Microsoft.Azure.ServiceBus;
 using Microsoft.Azure.ServiceBus.Management;
 using Microsoft.Extensions.Logging;

src/DotNetCore.CAP.AzureServiceBus/AzureServiceBusConsumerClientFactory.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Core Community. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 

src/DotNetCore.CAP.Dashboard/DashboardRoutes.cs

@@ -3,6 +3,8 @@
 
 using System.Reflection;
 using DotNetCore.CAP.Dashboard.Pages;
+using DotNetCore.CAP.Internal;
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DotNetCore.CAP.Dashboard

src/DotNetCore.CAP.Dashboard/NodeDiscovery/CAP.DiscoveryOptionsExtensions.cs

@@ -3,6 +3,7 @@
 
 using System;
 using DotNetCore.CAP;
+using DotNetCore.CAP.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DotNetCore.CAP.Dashboard.NodeDiscovery

src/DotNetCore.CAP.Dashboard/NodeDiscovery/IProcessingServer.Consul.cs

@@ -1,6 +1,8 @@
 // Copyright (c) .NET Core Community. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using DotNetCore.CAP.Internal;
+
 namespace DotNetCore.CAP.Dashboard.NodeDiscovery
 {
     internal class ConsulProcessingNodeServer : IProcessingServer

src/DotNetCore.CAP.InMemoryStorage/ICapTransaction.InMemory.cs

@@ -5,6 +5,7 @@
 
 using System.Threading;
 using System.Threading.Tasks;
+using DotNetCore.CAP.Transport;
 
 namespace DotNetCore.CAP.InMemoryStorage
 {

src/DotNetCore.CAP.Kafka/KafkaConsumerClient.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading;
 using Confluent.Kafka;
 using DotNetCore.CAP.Messages;
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.Options;
 
 namespace DotNetCore.CAP.Kafka

src/DotNetCore.CAP.Kafka/KafkaConsumerClientFactory.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Core Community. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.Options;
 
 namespace DotNetCore.CAP.Kafka

src/DotNetCore.CAP.MongoDB/ICapTransaction.MongoDB.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.DependencyInjection;
 using MongoDB.Driver;
 

src/DotNetCore.CAP.MySql/ICapTransaction.MySql.cs

@@ -5,6 +5,7 @@ using System.Data;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using DotNetCore.CAP.Transport;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.DependencyInjection;

src/DotNetCore.CAP.PostgreSql/ICapTransaction.PostgreSql.cs

@@ -5,6 +5,7 @@ using System.Data;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using DotNetCore.CAP.Transport;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.DependencyInjection;

src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClient.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading;
 using DotNetCore.CAP.Messages;
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.Options;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;

src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClientFactory.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Core Community. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.Options;
 
 namespace DotNetCore.CAP.RabbitMQ

src/DotNetCore.CAP.SqlServer/Diagnostics/DiagnosticObserver.cs

@@ -6,6 +6,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Reflection;
 using DotNetCore.CAP.Persistence;
+using DotNetCore.CAP.Transport;
 using Microsoft.Data.SqlClient;
 
 namespace DotNetCore.CAP.SqlServer.Diagnostics

src/DotNetCore.CAP.SqlServer/Diagnostics/DiagnosticProcessorObserver.cs

@@ -6,6 +6,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using DotNetCore.CAP.Persistence;
+using DotNetCore.CAP.Transport;
 
 namespace DotNetCore.CAP.SqlServer.Diagnostics
 {

src/DotNetCore.CAP.SqlServer/ICapTransaction.SqlServer.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using DotNetCore.CAP.Internal;
 using DotNetCore.CAP.Persistence;
 using DotNetCore.CAP.SqlServer.Diagnostics;
+using DotNetCore.CAP.Transport;
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;

src/DotNetCore.CAP/Abstractions/IModelBinderFactory.cs

@@ -1,21 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System.Reflection;
-using DotNetCore.CAP.Abstractions.ModelBinding;
-
-namespace DotNetCore.CAP.Abstractions
-{
-    /// <summary>
-    /// Model binder factory.
-    /// </summary>
-    public interface IModelBinderFactory
-    {
-        /// <summary>
-        /// Create a model binder by parameter.
-        /// </summary>
-        /// <param name="parameter">The method parameter info</param>
-        /// <returns>A model binder instance.</returns>
-        IModelBinder CreateBinder(ParameterInfo parameter);
-    }
-}

src/DotNetCore.CAP/Abstractions/ModelBinding/IModelBinder.cs

@@ -1,15 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-
-namespace DotNetCore.CAP.Abstractions.ModelBinding
-{
-    /// <summary>
-    /// Defines an interface for model binders.
-    /// </summary>
-    public interface IModelBinder
-    {
-        Task<ModelBindingResult> BindModelAsync(string content);
-    }
-}

src/DotNetCore.CAP/Abstractions/ModelBinding/ModelBindingResult.cs

@@ -1,104 +0,0 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using DotNetCore.CAP.Internal;
-
-namespace DotNetCore.CAP.Abstractions.ModelBinding
-{
-    /// <summary>
-    /// Contains the result of model binding.
-    /// </summary>
-    public struct ModelBindingResult
-    {
-        /// <summary>
-        /// Creates a <see cref="ModelBindingResult" /> representing a failed model binding operation.
-        /// </summary>
-        /// <returns>A <see cref="ModelBindingResult" /> representing a failed model binding operation.</returns>
-        public static ModelBindingResult Failed()
-        {
-            return new ModelBindingResult(null, false);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="ModelBindingResult" /> representing a successful model binding operation.
-        /// </summary>
-        /// <param name="model">The model value. May be <c>null.</c></param>
-        /// <returns>A <see cref="ModelBindingResult" /> representing a successful model bind.</returns>
-        public static ModelBindingResult Success(object model)
-        {
-            return new ModelBindingResult(model, true);
-        }
-
-        private ModelBindingResult(object model, bool isSuccess)
-        {
-            Model = model;
-            IsSuccess = isSuccess;
-        }
-
-        /// <summary>
-        /// Gets the model associated with this context.
-        /// </summary>
-        public object Model { get; }
-
-        public bool IsSuccess { get; }
-
-        public override string ToString()
-        {
-            if (IsSuccess)
-            {
-                return $"Success '{Model}'";
-            }
-
-            return "Failed";
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as ModelBindingResult?;
-            if (other == null)
-            {
-                return false;
-            }
-
-            return Equals(other.Value);
-        }
-
-        public override int GetHashCode()
-        {
-            var hashCodeCombiner = HashCodeCombiner.Start();
-            hashCodeCombiner.Add(IsSuccess);
-            hashCodeCombiner.Add(Model);
-
-            return hashCodeCombiner.CombinedHash;
-        }
-
-        public bool Equals(ModelBindingResult other)
-        {
-            return
-                IsSuccess == other.IsSuccess &&
-                Equals(Model, other.Model);
-        }
-
-        /// <summary>
-        /// Compares <see cref="ModelBindingResult" /> objects for equality.
-        /// </summary>
-        /// <param name="x">A <see cref="ModelBindingResult" />.</param>
-        /// <param name="y">A <see cref="ModelBindingResult" />.</param>
-        /// <returns><c>true</c> if the objects are equal, otherwise <c>false</c>.</returns>
-        public static bool operator ==(ModelBindingResult x, ModelBindingResult y)
-        {
-            return x.Equals(y);
-        }
-
-        /// <summary>
-        /// Compares <see cref="ModelBindingResult" /> objects for inequality.
-        /// </summary>
-        /// <param name="x">A <see cref="ModelBindingResult" />.</param>
-        /// <param name="y">A <see cref="ModelBindingResult" />.</param>
-        /// <returns><c>true</c> if the objects are not equal, otherwise <c>false</c>.</returns>
-        public static bool operator !=(ModelBindingResult x, ModelBindingResult y)
-        {
-            return !x.Equals(y);
-        }
-    }
-}

src/DotNetCore.CAP/CAP.Attribute.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using DotNetCore.CAP.Abstractions;
+using DotNetCore.CAP.Internal;
 
 // ReSharper disable once CheckNamespace
 namespace DotNetCore.CAP

src/DotNetCore.CAP/CAP.Builder.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
-using DotNetCore.CAP.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace DotNetCore.CAP

src/DotNetCore.CAP/CAP.ServiceCollectionExtensions.cs

@@ -3,10 +3,10 @@
 
 using System;
 using DotNetCore.CAP;
-using DotNetCore.CAP.Abstractions;
 using DotNetCore.CAP.Internal;
 using DotNetCore.CAP.Processor;
 using DotNetCore.CAP.Serialization;
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace

src/DotNetCore.CAP/ICapTransaction.Base.cs

@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Persistence;
+using DotNetCore.CAP.Transport;
 
 namespace DotNetCore.CAP
 {

src/DotNetCore.CAP/ConsumerExecutorDescriptor.cs → src/DotNetCore.CAP/Internal/ConsumerExecutorDescriptor.cs

@@ -4,9 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using DotNetCore.CAP.Abstractions;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     /// <summary>
     /// A descriptor of user definition method.

src/DotNetCore.CAP/Internal/ConsumerInvokerFactory.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
-using DotNetCore.CAP.Abstractions;
 using Microsoft.Extensions.Logging;
 
 namespace DotNetCore.CAP.Internal

src/DotNetCore.CAP/IBootstrapper.Default.cs → src/DotNetCore.CAP/Internal/IBootstrapper.Default.cs

@@ -9,10 +9,10 @@ using DotNetCore.CAP.Persistence;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     /// <summary>
-    /// Default implement of <see cref="T:DotNetCore.CAP.IBootstrapper" />.
+    /// Default implement of <see cref="T:DotNetCore.CAP.Internal.IBootstrapper" />.
     /// </summary>
     internal class DefaultBootstrapper : BackgroundService, IBootstrapper
     {

src/DotNetCore.CAP/IBootstrapper.cs → src/DotNetCore.CAP/Internal/IBootstrapper.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     /// <summary>
     /// Represents bootstrapping logic. For example, adding initial state to the storage or querying certain entities.

src/DotNetCore.CAP/Abstractions/CapPublisher.cs → src/DotNetCore.CAP/Internal/ICapPublisher.Default.cs

@@ -7,14 +7,14 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Diagnostics;
-using DotNetCore.CAP.Internal;
 using DotNetCore.CAP.Messages;
 using DotNetCore.CAP.Persistence;
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace DotNetCore.CAP.Abstractions
+namespace DotNetCore.CAP.Internal
 {
-    public class CapPublisher : ICapPublisher
+    internal class CapPublisher : ICapPublisher
     {
         private readonly IDispatcher _dispatcher;
         private readonly IDataStorage _storage;

src/DotNetCore.CAP/IConsumerRegister.Default.cs → src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs

@@ -4,19 +4,17 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Diagnostics;
-using DotNetCore.CAP.Internal;
 using DotNetCore.CAP.Messages;
 using DotNetCore.CAP.Persistence;
 using DotNetCore.CAP.Serialization;
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     internal class ConsumerRegister : IConsumerRegister
     {

src/DotNetCore.CAP/IConsumerRegister.cs → src/DotNetCore.CAP/Internal/IConsumerRegister.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Core Community. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     /// <summary>
     /// Handler received message of subscribed.

src/DotNetCore.CAP/IConsumerServiceSelector.Default.cs → src/DotNetCore.CAP/Internal/IConsumerServiceSelector.Default.cs

@@ -1,233 +1,231 @@
-// Copyright (c) .NET Core Community. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using DotNetCore.CAP.Abstractions;
-using Microsoft.Extensions.DependencyInjection;
-using System.Collections.Concurrent;
-using DotNetCore.CAP.Internal;
-using Microsoft.Extensions.Options;
-
-namespace DotNetCore.CAP
-{
-    /// <inheritdoc />
-    /// <summary>
-    /// A default <see cref="T:DotNetCore.CAP.Abstractions.IConsumerServiceSelector" /> implementation.
-    /// </summary>
-    public class DefaultConsumerServiceSelector : IConsumerServiceSelector
-    {
-        private readonly CapOptions _capOptions;
-        private readonly IServiceProvider _serviceProvider;
-
-        /// <summary>
-        /// since this class be designed as a Singleton service,the following two list must be thread safe!
-        /// </summary>
-        private readonly ConcurrentDictionary<string, List<RegexExecuteDescriptor<ConsumerExecutorDescriptor>>> _asteriskList;
-        private readonly ConcurrentDictionary<string, List<RegexExecuteDescriptor<ConsumerExecutorDescriptor>>> _poundList;
-
-        /// <summary>
-        /// Creates a new <see cref="DefaultConsumerServiceSelector" />.
-        /// </summary>
-        public DefaultConsumerServiceSelector(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-            _capOptions = serviceProvider.GetService<IOptions<CapOptions>>().Value;
-
-            _asteriskList = new ConcurrentDictionary<string, List<RegexExecuteDescriptor<ConsumerExecutorDescriptor>>>();
-            _poundList = new ConcurrentDictionary<string, List<RegexExecuteDescriptor<ConsumerExecutorDescriptor>>>();
-        }
-
-        public IReadOnlyList<ConsumerExecutorDescriptor> SelectCandidates()
-        {
-            var executorDescriptorList = new List<ConsumerExecutorDescriptor>();
-
-            executorDescriptorList.AddRange(FindConsumersFromInterfaceTypes(_serviceProvider));
-
-            executorDescriptorList.AddRange(FindConsumersFromControllerTypes());
-
-            return executorDescriptorList;
-        }
-
-        public ConsumerExecutorDescriptor SelectBestCandidate(string key, IReadOnlyList<ConsumerExecutorDescriptor> executeDescriptor)
-        {
-            var result = MatchUsingName(key, executeDescriptor);
-            if (result != null)
-            {
-                return result;
-            }
-
-            //[*] match with regex, i.e.  foo.*.abc
-            result = MatchAsteriskUsingRegex(key, executeDescriptor);
-            if (result != null)
-            {
-                return result;
-            }
-
-            //[#] match regex, i.e. foo.#
-            result = MatchPoundUsingRegex(key, executeDescriptor);
-            return result;
-        }
-
-        protected virtual IEnumerable<ConsumerExecutorDescriptor> FindConsumersFromInterfaceTypes(
-            IServiceProvider provider)
-        {
-            var executorDescriptorList = new List<ConsumerExecutorDescriptor>();
-
-            var capSubscribeTypeInfo = typeof(ICapSubscribe).GetTypeInfo();
-
-            foreach (var service in ServiceCollectionExtensions.ServiceCollection.Where(o => o.ImplementationType != null && o.ServiceType != null))
-            {
-                var typeInfo = service.ImplementationType.GetTypeInfo();
-                if (!capSubscribeTypeInfo.IsAssignableFrom(typeInfo))
-                {
-                    continue;
-                }
-                var serviceTypeInfo = service.ServiceType.GetTypeInfo();
-
-                executorDescriptorList.AddRange(GetTopicAttributesDescription(typeInfo, serviceTypeInfo));
-            }
-
-            return executorDescriptorList;
-        }
-
-        protected virtual IEnumerable<ConsumerExecutorDescriptor> FindConsumersFromControllerTypes()
-        {
-            var executorDescriptorList = new List<ConsumerExecutorDescriptor>();
-
-            var types = Assembly.GetEntryAssembly().ExportedTypes;
-            foreach (var type in types)
-            {
-                var typeInfo = type.GetTypeInfo();
-                if (Helper.IsController(typeInfo))
-                {
-                    executorDescriptorList.AddRange(GetTopicAttributesDescription(typeInfo));
-                }
-            }
-
-            return executorDescriptorList;
-        }
-
-        protected IEnumerable<ConsumerExecutorDescriptor> GetTopicAttributesDescription(TypeInfo typeInfo, TypeInfo serviceTypeInfo = null)
-        {
-            foreach (var method in typeInfo.DeclaredMethods)
-            {
-                var topicAttr = method.GetCustomAttributes<TopicAttribute>(true);
-                var topicAttributes = topicAttr as IList<TopicAttribute> ?? topicAttr.ToList();
-
-                if (!topicAttributes.Any())
-                {
-                    continue;
-                }
-
-                foreach (var attr in topicAttributes)
-                {
-                    if (attr.Group == null)
-                    {
-                        attr.Group = _capOptions.DefaultGroup + "." + _capOptions.Version;
-                    }
-                    else
-                    {
-                        attr.Group = attr.Group + "." + _capOptions.Version;
-                    }
-
-                    var parameters = method.GetParameters()
-                        .Select(parameter => new ParameterDescriptor
-                        {
-                            Name = parameter.Name,
-                            ParameterType = parameter.ParameterType,
-                            IsFromCap = parameter.GetCustomAttributes(typeof(FromCapAttribute)).Any()
-                        }).ToList();
-
-                    yield return InitDescriptor(attr, method, typeInfo, serviceTypeInfo, parameters);
-                }
-            }
-        }
-
-        private static ConsumerExecutorDescriptor InitDescriptor(
-            TopicAttribute attr,
-            MethodInfo methodInfo,
-            TypeInfo implType,
-            TypeInfo serviceTypeInfo,
-            IList<ParameterDescriptor> parameters)
-        {
-            var descriptor = new ConsumerExecutorDescriptor
-            {
-                Attribute = attr,
-                MethodInfo = methodInfo,
-                ImplTypeInfo = implType,
-                ServiceTypeInfo = serviceTypeInfo,
-                Parameters = parameters
-            };
-
-            return descriptor;
-        }
-
-        private ConsumerExecutorDescriptor MatchUsingName(string key, IReadOnlyList<ConsumerExecutorDescriptor> executeDescriptor)
-        {
-            return executeDescriptor.FirstOrDefault(x => x.Attribute.Name == key);
-        }
-
-        private ConsumerExecutorDescriptor MatchAsteriskUsingRegex(string key, IReadOnlyList<ConsumerExecutorDescriptor> executeDescriptor)
-        {
-            var group = executeDescriptor.First().Attribute.Group;
-            if (!_asteriskList.TryGetValue(group, out var tmpList))
-            {
-                tmpList = executeDescriptor.Where(x => x.Attribute.Name.IndexOf('*') >= 0)
-                    .Select(x => new RegexExecuteDescriptor<ConsumerExecutorDescriptor>
-                    {
-                        Name = ("^" + x.Attribute.Name + "$").Replace("*", "[0-9_a-zA-Z]+").Replace(".", "\\."),
-                        Descriptor = x
-                    }).ToList();
-                _asteriskList.TryAdd(group, tmpList);
-            }
-
-            foreach (var red in tmpList)
-            {
-                if (Regex.IsMatch(key, red.Name, RegexOptions.Singleline))
-                {
-                    return red.Descriptor;
-                }
-            }
-
-            return null;
-        }
-
-        private ConsumerExecutorDescriptor MatchPoundUsingRegex(string key, IReadOnlyList<ConsumerExecutorDescriptor> executeDescriptor)
-        {
-            var group = executeDescriptor.First().Attribute.Group;
-            if (!_poundList.TryGetValue(group, out var tmpList))
-            {
-                tmpList = executeDescriptor
-                    .Where(x => x.Attribute.Name.IndexOf('#') >= 0)
-                    .Select(x => new RegexExecuteDescriptor<ConsumerExecutorDescriptor>
-                    {
-                        Name = ("^" + x.Attribute.Name.Replace(".", "\\.") + "$").Replace("#", "[0-9_a-zA-Z\\.]+"),
-                        Descriptor = x
-                    }).ToList();
-                _poundList.TryAdd(group, tmpList);
-            }
-
-            foreach (var red in tmpList)
-            {
-                if (Regex.IsMatch(key, red.Name, RegexOptions.Singleline))
-                {
-                    return red.Descriptor;
-                }
-            }
-
-            return null;
-        }
-
-
-        private class RegexExecuteDescriptor<T>
-        {
-            public string Name { get; set; }
-
-            public T Descriptor { get; set; }
-        }
-    }
-}
+// Copyright (c) .NET Core Community. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace DotNetCore.CAP.Internal
+{
+    /// <inheritdoc />
+    /// <summary>
+    /// A default <see cref="T:DotNetCore.CAP.Abstractions.IConsumerServiceSelector" /> implementation.
+    /// </summary>
+    public class DefaultConsumerServiceSelector : IConsumerServiceSelector
+    {
+        private readonly CapOptions _capOptions;
+        private readonly IServiceProvider _serviceProvider;
+
+        /// <summary>
+        /// since this class be designed as a Singleton service,the following two list must be thread safe!
+        /// </summary>
+        private readonly ConcurrentDictionary<string, List<RegexExecuteDescriptor<ConsumerExecutorDescriptor>>> _asteriskList;
+        private readonly ConcurrentDictionary<string, List<RegexExecuteDescriptor<ConsumerExecutorDescriptor>>> _poundList;
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultConsumerServiceSelector" />.
+        /// </summary>
+        public DefaultConsumerServiceSelector(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+            _capOptions = serviceProvider.GetService<IOptions<CapOptions>>().Value;
+
+            _asteriskList = new ConcurrentDictionary<string, List<RegexExecuteDescriptor<ConsumerExecutorDescriptor>>>();
+            _poundList = new ConcurrentDictionary<string, List<RegexExecuteDescriptor<ConsumerExecutorDescriptor>>>();
+        }
+
+        public IReadOnlyList<ConsumerExecutorDescriptor> SelectCandidates()
+        {
+            var executorDescriptorList = new List<ConsumerExecutorDescriptor>();
+
+            executorDescriptorList.AddRange(FindConsumersFromInterfaceTypes(_serviceProvider));
+
+            executorDescriptorList.AddRange(FindConsumersFromControllerTypes());
+
+            return executorDescriptorList;
+        }
+
+        public ConsumerExecutorDescriptor SelectBestCandidate(string key, IReadOnlyList<ConsumerExecutorDescriptor> executeDescriptor)
+        {
+            var result = MatchUsingName(key, executeDescriptor);
+            if (result != null)
+            {
+                return result;
+            }
+
+            //[*] match with regex, i.e.  foo.*.abc
+            result = MatchAsteriskUsingRegex(key, executeDescriptor);
+            if (result != null)
+            {
+                return result;
+            }
+
+            //[#] match regex, i.e. foo.#
+            result = MatchPoundUsingRegex(key, executeDescriptor);
+            return result;
+        }
+
+        protected virtual IEnumerable<ConsumerExecutorDescriptor> FindConsumersFromInterfaceTypes(
+            IServiceProvider provider)
+        {
+            var executorDescriptorList = new List<ConsumerExecutorDescriptor>();
+
+            var capSubscribeTypeInfo = typeof(ICapSubscribe).GetTypeInfo();
+
+            foreach (var service in ServiceCollectionExtensions.ServiceCollection.Where(o => o.ImplementationType != null && o.ServiceType != null))
+            {
+                var typeInfo = service.ImplementationType.GetTypeInfo();
+                if (!capSubscribeTypeInfo.IsAssignableFrom(typeInfo))
+                {
+                    continue;
+                }
+                var serviceTypeInfo = service.ServiceType.GetTypeInfo();
+
+                executorDescriptorList.AddRange(GetTopicAttributesDescription(typeInfo, serviceTypeInfo));
+            }
+
+            return executorDescriptorList;
+        }
+
+        protected virtual IEnumerable<ConsumerExecutorDescriptor> FindConsumersFromControllerTypes()
+        {
+            var executorDescriptorList = new List<ConsumerExecutorDescriptor>();
+
+            var types = Assembly.GetEntryAssembly().ExportedTypes;
+            foreach (var type in types)
+            {
+                var typeInfo = type.GetTypeInfo();
+                if (Helper.IsController(typeInfo))
+                {
+                    executorDescriptorList.AddRange(GetTopicAttributesDescription(typeInfo));
+                }
+            }
+
+            return executorDescriptorList;
+        }
+
+        protected IEnumerable<ConsumerExecutorDescriptor> GetTopicAttributesDescription(TypeInfo typeInfo, TypeInfo serviceTypeInfo = null)
+        {
+            foreach (var method in typeInfo.DeclaredMethods)
+            {
+                var topicAttr = method.GetCustomAttributes<TopicAttribute>(true);
+                var topicAttributes = topicAttr as IList<TopicAttribute> ?? topicAttr.ToList();
+
+                if (!topicAttributes.Any())
+                {
+                    continue;
+                }
+
+                foreach (var attr in topicAttributes)
+                {
+                    if (attr.Group == null)
+                    {
+                        attr.Group = _capOptions.DefaultGroup + "." + _capOptions.Version;
+                    }
+                    else
+                    {
+                        attr.Group = attr.Group + "." + _capOptions.Version;
+                    }
+
+                    var parameters = method.GetParameters()
+                        .Select(parameter => new ParameterDescriptor
+                        {
+                            Name = parameter.Name,
+                            ParameterType = parameter.ParameterType,
+                            IsFromCap = parameter.GetCustomAttributes(typeof(FromCapAttribute)).Any()
+                        }).ToList();
+
+                    yield return InitDescriptor(attr, method, typeInfo, serviceTypeInfo, parameters);
+                }
+            }
+        }
+
+        private static ConsumerExecutorDescriptor InitDescriptor(
+            TopicAttribute attr,
+            MethodInfo methodInfo,
+            TypeInfo implType,
+            TypeInfo serviceTypeInfo,
+            IList<ParameterDescriptor> parameters)
+        {
+            var descriptor = new ConsumerExecutorDescriptor
+            {
+                Attribute = attr,
+                MethodInfo = methodInfo,
+                ImplTypeInfo = implType,
+                ServiceTypeInfo = serviceTypeInfo,
+                Parameters = parameters
+            };
+
+            return descriptor;
+        }
+
+        private ConsumerExecutorDescriptor MatchUsingName(string key, IReadOnlyList<ConsumerExecutorDescriptor> executeDescriptor)
+        {
+            return executeDescriptor.FirstOrDefault(x => x.Attribute.Name == key);
+        }
+
+        private ConsumerExecutorDescriptor MatchAsteriskUsingRegex(string key, IReadOnlyList<ConsumerExecutorDescriptor> executeDescriptor)
+        {
+            var group = executeDescriptor.First().Attribute.Group;
+            if (!_asteriskList.TryGetValue(group, out var tmpList))
+            {
+                tmpList = executeDescriptor.Where(x => x.Attribute.Name.IndexOf('*') >= 0)
+                    .Select(x => new RegexExecuteDescriptor<ConsumerExecutorDescriptor>
+                    {
+                        Name = ("^" + x.Attribute.Name + "$").Replace("*", "[0-9_a-zA-Z]+").Replace(".", "\\."),
+                        Descriptor = x
+                    }).ToList();
+                _asteriskList.TryAdd(group, tmpList);
+            }
+
+            foreach (var red in tmpList)
+            {
+                if (Regex.IsMatch(key, red.Name, RegexOptions.Singleline))
+                {
+                    return red.Descriptor;
+                }
+            }
+
+            return null;
+        }
+
+        private ConsumerExecutorDescriptor MatchPoundUsingRegex(string key, IReadOnlyList<ConsumerExecutorDescriptor> executeDescriptor)
+        {
+            var group = executeDescriptor.First().Attribute.Group;
+            if (!_poundList.TryGetValue(group, out var tmpList))
+            {
+                tmpList = executeDescriptor
+                    .Where(x => x.Attribute.Name.IndexOf('#') >= 0)
+                    .Select(x => new RegexExecuteDescriptor<ConsumerExecutorDescriptor>
+                    {
+                        Name = ("^" + x.Attribute.Name.Replace(".", "\\.") + "$").Replace("#", "[0-9_a-zA-Z\\.]+"),
+                        Descriptor = x
+                    }).ToList();
+                _poundList.TryAdd(group, tmpList);
+            }
+
+            foreach (var red in tmpList)
+            {
+                if (Regex.IsMatch(key, red.Name, RegexOptions.Singleline))
+                {
+                    return red.Descriptor;
+                }
+            }
+
+            return null;
+        }
+
+
+        private class RegexExecuteDescriptor<T>
+        {
+            public string Name { get; set; }
+
+            public T Descriptor { get; set; }
+        }
+    }
+}

src/DotNetCore.CAP/IConsumerServiceSelector.cs → src/DotNetCore.CAP/Internal/IConsumerServiceSelector.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     /// <summary>
     /// Defines an interface for selecting an consumer service method to invoke for the current message.

src/DotNetCore.CAP/Abstractions/IMongoTransaction.cs → src/DotNetCore.CAP/Internal/IMongoTransaction.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace DotNetCore.CAP.Abstractions
+namespace DotNetCore.CAP.Internal
 {
     public interface IMongoTransaction : IDisposable
     {
@@ -14,8 +14,8 @@ namespace DotNetCore.CAP.Abstractions
         /// <value></value>
         bool AutoCommit { get; set; }
 
-        Task<IMongoTransaction> BegeinAsync(bool autoCommit = true);
+        Task<IMongoTransaction> BeginAsync(bool autoCommit = true);
 
-        IMongoTransaction Begein(bool autoCommit = true);
+        IMongoTransaction Begin(bool autoCommit = true);
     }
 }

src/DotNetCore.CAP/IProcessingServer.cs → src/DotNetCore.CAP/Internal/IProcessingServer.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     /// <inheritdoc />
     /// <summary>

src/DotNetCore.CAP/ISubscribeExecutor.Default.cs → src/DotNetCore.CAP/Internal/ISubscriberExecutor.Default.cs

@@ -7,15 +7,14 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Diagnostics;
-using DotNetCore.CAP.Internal;
 using DotNetCore.CAP.Messages;
 using DotNetCore.CAP.Persistence;
 using DotNetCore.CAP.Processor;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.DependencyInjection;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     internal class DefaultSubscriberExecutor : ISubscriberExecutor
     {

src/DotNetCore.CAP/ISubscriberExecutor.cs → src/DotNetCore.CAP/Internal/ISubscriberExecutor.cs

@@ -5,7 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Persistence;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     /// <summary>
     /// Consumer executor

src/DotNetCore.CAP/Internal/LoggerExtensions.cs

@@ -5,7 +5,7 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Internal
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal static class LoggerExtensions

src/DotNetCore.CAP/Abstractions/TopicAttribute.cs → src/DotNetCore.CAP/Internal/TopicAttribute.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace DotNetCore.CAP.Abstractions
+namespace DotNetCore.CAP.Internal
 {
     /// <inheritdoc />
     /// <summary>

src/DotNetCore.CAP/Monitoring/MessageQueryDto.cs

@@ -10,6 +10,7 @@ namespace DotNetCore.CAP.Monitoring
         public MessageType MessageType { get; set; }
 
         public string Group { get; set; }
+
         public string Name { get; set; }
 
         public string Content { get; set; }

src/DotNetCore.CAP/Processor/IDispatcher.Default.cs

@@ -7,6 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Internal;
 using DotNetCore.CAP.Persistence;
+using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.Logging;
 
 namespace DotNetCore.CAP.Processor

src/DotNetCore.CAP/Processor/IProcessingServer.Cap.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using DotNetCore.CAP.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 

src/DotNetCore.CAP/Processor/IProcessor.TransportCheck.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
+using DotNetCore.CAP.Internal;
 
 namespace DotNetCore.CAP.Processor
 {

src/DotNetCore.CAP/IConsumerClient.cs → src/DotNetCore.CAP/Transport/IConsumerClient.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Threading;
 using DotNetCore.CAP.Messages;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Transport
 {
     /// <inheritdoc />
     /// <summary>

src/DotNetCore.CAP/IConsumerClientFactory.cs → src/DotNetCore.CAP/Transport/IConsumerClientFactory.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Core Community. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Transport
 {
     /// <summary>
     /// Consumer client factory to create consumer client instance.

src/DotNetCore.CAP/IDispatcher.cs → src/DotNetCore.CAP/Transport/IDispatcher.cs

@@ -1,9 +1,10 @@
 // Copyright (c) .NET Core Community. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using DotNetCore.CAP.Internal;
 using DotNetCore.CAP.Persistence;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Transport
 {
     public interface IDispatcher
     {

src/DotNetCore.CAP/MqLogType.cs → src/DotNetCore.CAP/Transport/MqLogType.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP.Transport
 {
     public enum MqLogType
     {

test/DotNetCore.CAP.Test/ModelBinderFactoryTest.cs

@@ -1,46 +0,0 @@
-using System.Linq;
-using System.Reflection;
-using DotNetCore.CAP.Abstractions;
-using DotNetCore.CAP.Internal;
-using Moq;
-using Xunit;
-
-namespace DotNetCore.CAP.Test
-{
-    public class ModelBinderFactoryTest
-    {
-        private IModelBinderFactory _factory;
-
-        public ModelBinderFactoryTest()
-        {
-            var serializer = Mock.Of<IContentSerializer>();
-            _factory = new ModelBinderFactory(serializer);
-        }
-
-        [Theory]
-        [InlineData(nameof(Sample.DateTimeParam))]
-        [InlineData(nameof(Sample.StringParam))]
-        [InlineData(nameof(Sample.IntegerParam))]
-        [InlineData(nameof(Sample.GuidParam))]
-        [InlineData(nameof(Sample.UriParam))]
-        public void CreateSimpleTypeBinderTest(string methodName)
-        {
-            var methodInfo = typeof(Sample).GetRuntimeMethods().Single(x => x.Name == methodName);
-            var binder = _factory.CreateBinder(methodInfo.GetParameters()[0]);
-            Assert.NotNull(binder);
-            Assert.True(binder is SimpleTypeModelBinder);
-            Assert.False(binder is ComplexTypeModelBinder);
-        }
-
-        [Theory]
-        [InlineData(nameof(Sample.ComplexTypeParam))]
-        public void CreateComplexTypeBinderTest(string methodName)
-        {
-            var methodInfo = typeof(Sample).GetRuntimeMethods().Single(x => x.Name == methodName);
-            var binder = _factory.CreateBinder(methodInfo.GetParameters()[0]);
-            Assert.NotNull(binder);
-            Assert.False(binder is SimpleTypeModelBinder);
-            Assert.True(binder is ComplexTypeModelBinder);
-        }
-    }
-}

test/DotNetCore.CAP.Test/SnowflakeIdTest.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
-using DotNetCore.CAP.Infrastructure;
+using DotNetCore.CAP.Internal;
 using Xunit;
 
 namespace DotNetCore.CAP.Test