resolved #80

Author: ymh199478

src/CatLib.Core.NetStandard/CatLib.Core.NetStandard.csproj

@@ -99,6 +99,7 @@
     <Compile Include="..\CatLib.Core\Support\Events\IEvent.cs" Link="Support\Events\IEvent.cs" />
     <Compile Include="..\CatLib.Core\Support\Exception\AssertException.cs" Link="Support\Exception\AssertException.cs" />
     <Compile Include="..\CatLib.Core\Support\Exception\CodeStandardException.cs" Link="Support\Exception\CodeStandardException.cs" />
+    <Compile Include="..\CatLib.Core\Support\Exception\LogicException.cs" Link="Support\Exception\LogicException.cs" />
     <Compile Include="..\CatLib.Core\Support\Exception\RuntimeException.cs" Link="Support\Exception\RuntimeException.cs" />
     <Compile Include="..\CatLib.Core\Support\FilterChain\FilterChain.cs" Link="Support\FilterChain\FilterChain.cs" />
     <Compile Include="..\CatLib.Core\Support\FilterChain\IFilterChain.cs" Link="Support\FilterChain\IFilterChain.cs" />

src/CatLib.Core/CatLib.Core.csproj

@@ -82,6 +82,7 @@
     <Compile Include="Support\Events\Event.cs" />
     <Compile Include="Support\Exception\AssertException.cs" />
     <Compile Include="Support\Exception\CodeStandardException.cs" />
+    <Compile Include="Support\Exception\LogicException.cs" />
     <Compile Include="Support\Exception\RuntimeException.cs" />
     <Compile Include="Support\FilterChain\FilterChain.cs" />
     <Compile Include="Support\FilterChain\IFilterChain.cs" />

src/CatLib.Core/CatLib/Application.cs

@@ -233,7 +233,7 @@ public virtual void Init()
         /// <summary>
         /// 初始化
         /// </summary>
-        /// <exception cref="RuntimeException">没有调用<c>Bootstrap(...)</c>就尝试初始化时触发</exception>
+        /// <exception cref="CodeStandardException">没有调用<c>Bootstrap(...)</c>就尝试初始化时触发</exception>
         protected IEnumerator CoroutineInit()
         {
             if (!bootstrapped)
@@ -267,7 +267,7 @@ protected IEnumerator CoroutineInit()
         /// 注册服务提供者
         /// </summary>
         /// <param name="provider">注册服务提供者</param>
-        /// <exception cref="RuntimeException">服务提供者被重复注册时触发</exception>
+        /// <exception cref="LogicException">服务提供者被重复注册时触发</exception>
         public virtual void Register(IServiceProvider provider)
         {
             StartCoroutine(CoroutineRegister(provider));
@@ -277,14 +277,14 @@ public virtual void Register(IServiceProvider provider)
         /// 注册服务提供者
         /// </summary>
         /// <param name="provider">注册服务提供者</param>
-        /// <exception cref="RuntimeException">服务提供者被重复注册时触发</exception>
+        /// <exception cref="LogicException">服务提供者被重复注册时触发</exception>
         protected IEnumerator CoroutineRegister(IServiceProvider provider)
         {
             Guard.Requires<ArgumentNullException>(provider != null);
 
             if (IsRegisted(provider))
             {
-                throw new RuntimeException($"Provider [{provider.GetType()}] is already register.");
+                throw new LogicException($"Provider [{provider.GetType()}] is already register.");
             }
 
             if (Process == StartProcess.Initing)

src/CatLib.Core/Support/Container/BindData.cs

@@ -127,7 +127,7 @@ public IBindData OnRelease(Action<IBindData, object> closure)
             Guard.NotNull(closure, nameof(closure));
             if (!IsStatic)
             {
-                throw new RuntimeException($"Service [{Service}] is not Singleton(Static) Bind , Can not call {nameof(OnRelease)}().");
+                throw new LogicException($"Service [{Service}] is not Singleton(Static) Bind , Can not call {nameof(OnRelease)}().");
             }
             lock (SyncRoot)
             {

src/CatLib.Core/Support/Container/Bindable.cs

@@ -85,7 +85,7 @@ internal void AddContextual(string needs, string given)
                 }
                 if (contextual.ContainsKey(needs))
                 {
-                    throw new RuntimeException($"Needs [{needs}] is already exist.");
+                    throw new LogicException($"Needs [{needs}] is already exist.");
                 }
                 contextual.Add(needs, given);
             }
@@ -117,7 +117,7 @@ protected void GuardIsDestroy()
         {
             if (isDestroy)
             {
-                throw new RuntimeException("Current bind has be mark Destroy.");
+                throw new LogicException("Current bind has be mark Destroy.");
             }
         }
     }

src/CatLib.Core/Support/Container/Container.cs

@@ -193,7 +193,7 @@ public void Tag(string tag, params string[] service)
         /// </summary>
         /// <param name="tag">标记名</param>
         /// <returns>将会返回标记所对应的所有服务实例</returns>
-        /// <exception cref="RuntimeException"><paramref name="tag"/>不存在</exception>
+        /// <exception cref="LogicException"><paramref name="tag"/>不存在</exception>
         /// <exception cref="ArgumentNullException"><paramref name="tag"/>为<c>null</c>或者空字符串</exception>
         public object[] Tagged(string tag)
         {
@@ -202,7 +202,7 @@ public object[] Tagged(string tag)
             {
                 if (!tags.TryGetValue(tag, out List<string> services))
                 {
-                    throw new RuntimeException($"Tag [{tag}] is not exist.");
+                    throw new LogicException($"Tag [{tag}] is not exist.");
                 }
 
                 var result = new object[services.Count];
@@ -321,7 +321,7 @@ public bool IsAlias(string name)
         /// <param name="alias">别名</param>
         /// <param name="service">映射到的服务名</param>
         /// <returns>当前容器对象</returns>
-        /// <exception cref="RuntimeException"><paramref name="alias"/>别名冲突或者<paramref name="service"/>的绑定与实例都不存在</exception>
+        /// <exception cref="LogicException"><paramref name="alias"/>别名冲突或者<paramref name="service"/>的绑定与实例都不存在</exception>
         /// <exception cref="ArgumentNullException"><paramref name="alias"/>,<paramref name="service"/>为<c>null</c>或者空字符串</exception>
         public IContainer Alias(string alias, string service)
         {
@@ -330,7 +330,7 @@ public IContainer Alias(string alias, string service)
 
             if (alias == service)
             {
-                throw new RuntimeException($"Alias is same as service name: [{alias}].");
+                throw new LogicException($"Alias is same as service name: [{alias}].");
             }
 
             alias = FormatService(alias);
@@ -341,7 +341,7 @@ public IContainer Alias(string alias, string service)
                 GuardFlushing();
                 if (aliases.ContainsKey(alias))
                 {
-                    throw new RuntimeException($"Alias [{alias}] is already exists.");
+                    throw new LogicException($"Alias [{alias}] is already exists.");
                 }
 
                 if (!binds.ContainsKey(service) && !instances.ContainsKey(service))
@@ -414,7 +414,7 @@ public IBindData Bind(string service, Type concrete, bool isStatic)
             Guard.NotNull(concrete, nameof(concrete));
             if (IsUnableType(concrete))
             {
-                throw new RuntimeException($"Bind type [{concrete}] can not built");
+                throw new LogicException($"Bind type [{concrete}] can not built");
             }
             return Bind(service, WrapperTypeBuilder(service, concrete), isStatic);
         }
@@ -426,7 +426,7 @@ public IBindData Bind(string service, Type concrete, bool isStatic)
         /// <param name="concrete">服务实现</param>
         /// <param name="isStatic">服务是否静态化</param>
         /// <returns>服务绑定数据</returns>
-        /// <exception cref="RuntimeException"><paramref name="service"/>绑定冲突</exception>
+        /// <exception cref="LogicException"><paramref name="service"/>绑定冲突</exception>
         /// <exception cref="ArgumentNullException"><paramref name="concrete"/>为<c>null</c></exception>
         public IBindData Bind(string service, Func<IContainer, object[], object> concrete, bool isStatic)
         {
@@ -441,17 +441,17 @@ public IBindData Bind(string service, Func<IContainer, object[], object> concret
 
                 if (binds.ContainsKey(service))
                 {
-                    throw new RuntimeException($"Bind [{service}] already exists.");
+                    throw new LogicException($"Bind [{service}] already exists.");
                 }
 
                 if (instances.ContainsKey(service))
                 {
-                    throw new RuntimeException($"Instances [{service}] is already exists.");
+                    throw new LogicException($"Instances [{service}] is already exists.");
                 }
 
                 if (aliases.ContainsKey(service))
                 {
-                    throw new RuntimeException($"Aliase [{service}] is already exists.");
+                    throw new LogicException($"Aliase [{service}] is already exists.");
                 }
 
                 var bindData = new BindData(this, service, concrete, isStatic);
@@ -550,7 +550,7 @@ public object Call(object target, MethodInfo methodInfo, params object[] userPar
         /// <param name="service">服务名或别名</param>
         /// <param name="userParams">用户传入的构造参数</param>
         /// <exception cref="ArgumentNullException"><paramref name="service"/>为<c>null</c>或者空字符串</exception>
-        /// <exception cref="RuntimeException">出现循环依赖</exception>
+        /// <exception cref="LogicException">出现循环依赖</exception>
         /// <returns>服务实例，如果构造失败那么返回null</returns>
         public object Make(string service, params object[] userParams)
         {
@@ -651,7 +651,7 @@ public void ClearExtenders(string service)
         /// <param name="service">服务名或别名</param>
         /// <param name="instance">服务实例，<c>null</c>也是合法的实例值</param>
         /// <exception cref="ArgumentNullException"><paramref name="service"/>为<c>null</c>或者空字符串</exception>
-        /// <exception cref="RuntimeException"><paramref name="service"/>的服务在绑定设置中不是静态的</exception>
+        /// <exception cref="LogicException"><paramref name="service"/>的服务在绑定设置中不是静态的</exception>
         /// <returns>被修饰器处理后的新的实例</returns>
         public object Instance(string service, object instance)
         {
@@ -669,7 +669,7 @@ public object Instance(string service, object instance)
                 {
                     if (!bindData.IsStatic)
                     {
-                        throw new RuntimeException($"Service [{service}] is not Singleton(Static) Bind.");
+                        throw new LogicException($"Service [{service}] is not Singleton(Static) Bind.");
                     }
                     instance = ((BindData)bindData).TriggerResolving(instance);
                 }
@@ -938,7 +938,7 @@ public void Flash(Action callback, params KeyValuePair<string, object>[] service
                             // 所以我们抛出一个异常来终止该操作。
                             if (HasBind(service.Key))
                             {
-                                throw new RuntimeException(
+                                throw new LogicException(
                                     $"Flash service [{service.Key}] name has be used for {nameof(Bind)} or {nameof(Alias)}.");
                             }
                         }
@@ -1162,7 +1162,6 @@ protected virtual object ResloveAttrClass(Bindable makeServiceBindData, string s
                 {
                     return result;
                 }
-
                 throw;
             }
         }
@@ -1332,11 +1331,11 @@ protected virtual UnresolvableException MakeUnresolvablePrimitiveException(strin
         /// </summary>
         /// <param name="service">当前服务名</param>
         /// <returns>运行时异常</returns>
-        protected virtual RuntimeException MakeCircularDependencyException(string service)
+        protected virtual LogicException MakeCircularDependencyException(string service)
         {
             var message = $"Circular dependency detected while for [{service}].";
             message += GetBuildStackDebugMessage();
-            return new RuntimeException(message);
+            return new LogicException(message);
         }
 
         /// <summary>
@@ -1368,7 +1367,7 @@ protected virtual void GuardUserParamsCount(int count)
         {
             if (count > 255)
             {
-                throw new RuntimeException("Too many parameters , must be less or equal than 255");
+                throw new LogicException("Too many parameters , must be less or equal than 255");
             }
         }
 
@@ -1415,7 +1414,7 @@ protected virtual Type SpeculatedServiceType(string service)
         /// <param name="makeServiceBindData">服务绑定数据</param>
         /// <param name="makeServiceInstance">服务实例</param>
         /// <returns>服务实例</returns>
-        /// <exception cref="RuntimeException">属性是必须的或者注入类型和需求类型不一致</exception>
+        /// <exception cref="LogicException">属性是必须的或者注入类型和需求类型不一致</exception>
         protected virtual void AttributeInject(Bindable makeServiceBindData, object makeServiceInstance)
         {
             if (makeServiceInstance == null)
@@ -1521,7 +1520,7 @@ protected virtual Func<ParameterInfo, object> GetParamsMatcher(ref object[] user
         /// <param name="baseParams">服务实例的参数信息</param>
         /// <param name="userParams">输入的构造参数列表</param>
         /// <returns>服务所需参数的解决结果</returns>
-        /// <exception cref="RuntimeException">生成的实例类型和需求类型不一致</exception>
+        /// <exception cref="LogicException">生成的实例类型和需求类型不一致</exception>
         protected virtual object[] GetDependencies(Bindable makeServiceBindData, ParameterInfo[] baseParams, object[] userParams)
         {
             if (baseParams.Length <= 0)
@@ -1813,7 +1812,7 @@ private BindData MakeEmptyBindData(string service)
         /// <param name="userParams">用户传入的构造参数</param>
         /// <returns>服务实例，如果构造失败那么返回null</returns>
         /// <exception cref="ArgumentNullException"><paramref name="service"/>为<c>null</c>或者空字符串</exception>
-        /// <exception cref="RuntimeException">出现循环依赖</exception>
+        /// <exception cref="LogicException">出现循环依赖</exception>
         /// <exception cref="UnresolvableException">无法解决服务</exception>
         /// <returns>服务实例</returns>
         private object Resolve(string service, params object[] userParams)

src/CatLib.Core/Support/Container/MethodContainer.cs

@@ -80,7 +80,7 @@ public IMethodBind Bind(string method, object target, MethodInfo methodInfo)
             {
                 if (methodMappings.ContainsKey(method))
                 {
-                    throw new RuntimeException($"Method [{method}] is already {nameof(Bind)}");
+                    throw new LogicException($"Method [{method}] is already {nameof(Bind)}");
                 }
 
                 var methodBind = new MethodBind(this, container, method, target, methodInfo);
@@ -223,9 +223,9 @@ public void Flush()
         /// 生成一个方法没有找到异常
         /// </summary>
         /// <param name="method"></param>
-        private RuntimeException MakeMethodNotFoundException(string method)
+        private LogicException MakeMethodNotFoundException(string method)
         {
-            return new RuntimeException($"Method [{method}] is not found.");
+            return new LogicException($"Method [{method}] is not found.");
         }
     }
 }

src/CatLib.Core/Support/Exception/LogicException.cs

@@ -0,0 +1,47 @@
+/*
+ * This file is part of the CatLib package.
+ *
+ * (c) Yu Bin <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Document: http://catlib.io/
+ */
+
+using System;
+
+namespace CatLib
+{
+    /// <summary>
+    /// 代码逻辑异常
+    /// </summary>
+    [ExcludeFromCodeCoverage]
+    public class LogicException : RuntimeException
+    {
+        /// <summary>
+        /// 代码逻辑异常
+        /// </summary>
+        public LogicException()
+        {
+
+        }
+
+        /// <summary>
+        /// 代码逻辑异常
+        /// </summary>
+        /// <param name="message">异常消息</param>
+        public LogicException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// 代码逻辑异常
+        /// </summary>
+        /// <param name="message">异常消息</param>
+        /// <param name="innerException">内部异常</param>
+        public LogicException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}

src/CatLib.Core/Support/SortSet/SortSet.cs

@@ -142,7 +142,7 @@ public TElement Current
                     {
                         return current.Element;
                     }
-                    throw new RuntimeException($"Can not get {nameof(current)} element");
+                    throw new LogicException($"Can not get {nameof(current)} element");
                 }
             }
 
@@ -157,7 +157,7 @@ object IEnumerator.Current
                     {
                         return current.Element;
                     }
-                    throw new RuntimeException($"Can not get {nameof(current)} element");
+                    throw new LogicException($"Can not get {nameof(current)} element");
                 }
             }
 

src/CatLib.Core/Support/Template/Managed.cs

@@ -51,7 +51,7 @@ public void Extend(Func<TInterface> builder, string name = null)
 
             if (extendBuilder.ContainsKey(name))
             {
-                throw new RuntimeException($"Extend [{name}]({GetType()}) is already exists.");
+                throw new LogicException($"Extend [{name}]({GetType()}) is already exists.");
             }
 
             extendBuilder.Add(name, builder);
@@ -139,7 +139,7 @@ private Func<TInterface> GetExtend(string name)
 
             if (!extendBuilder.TryGetValue(name, out Func<TInterface> result))
             {
-                throw new RuntimeException($"Can not find [{name}]({GetType()}) Extend.");
+                throw new LogicException($"Can not find [{name}]({GetType()}) Extend.");
             }
 
             return result;