1.7.3

xljiulang · Feb 3, 2018 · 2d1ca92 · 2d1ca92
1 parent 9980ddd
commit 2d1ca92
Show file tree

Hide file tree

Showing 153 changed files with 381 additions and 928 deletions.
diff --git a/NetworkSocket/ByteBits.cs b/NetworkSocket/ByteBits.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 
 namespace NetworkSocket
 {

diff --git a/NetworkSocket/Core/ApiAction.cs b/NetworkSocket/Core/ApiAction.cs
@@ -5,7 +5,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -76,8 +75,7 @@ public ApiAction(MethodInfo method)
         /// <returns></returns>
         private string GetApiName(MethodInfo method)
         {
-            var api = Attribute.GetCustomAttribute(method, typeof(ApiAttribute)) as ApiAttribute;
-            if (api != null && string.IsNullOrWhiteSpace(api.Name) == false)
+            if (Attribute.GetCustomAttribute(method, typeof(ApiAttribute)) is ApiAttribute api && string.IsNullOrWhiteSpace(api.Name) == false)
             {
                 return api.Name;
             }

diff --git a/NetworkSocket/Core/ApiAttribute.cs b/NetworkSocket/Core/ApiAttribute.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/ApiParameter.cs b/NetworkSocket/Core/ApiParameter.cs
@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/ApiResult.cs b/NetworkSocket/Core/ApiResult.cs
@@ -1,9 +1,6 @@
 using NetworkSocket.Tasks;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace NetworkSocket.Core
@@ -26,11 +23,7 @@ public class ApiResult<TResult> : IApiResult, IApiResult<TResult>
         /// <exception cref="ArgumentNullException"></exception>
         public ApiResult(ITaskSetter<TResult> taskSetter)
         {
-            if (taskSetter == null)
-            {
-                throw new ArgumentNullException();
-            }
-            this.taskSetter = taskSetter;
+            this.taskSetter = taskSetter ?? throw new ArgumentNullException();
         }
 
         /// <summary>

diff --git a/NetworkSocket/Core/FilterAttribute.cs b/NetworkSocket/Core/FilterAttribute.cs
@@ -1,10 +1,7 @@
 using NetworkSocket.Tasks;
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/IActionContext.cs b/NetworkSocket/Core/IActionContext.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NetworkSocket.Core
+namespace NetworkSocket.Core
 {
     /// <summary>
     /// 定义Api执行上下文

diff --git a/NetworkSocket/Core/IApiResult.cs b/NetworkSocket/Core/IApiResult.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/ICloneable.cs b/NetworkSocket/Core/ICloneable.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NetworkSocket.Core
+namespace NetworkSocket.Core
 {
     /// <summary>
     /// 定义克隆相关的接口

diff --git a/NetworkSocket/Core/IDependencyResolver.cs b/NetworkSocket/Core/IDependencyResolver.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/IDependencyResolverSupportable.cs b/NetworkSocket/Core/IDependencyResolverSupportable.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NetworkSocket.Core
+namespace NetworkSocket.Core
 {
     /// <summary>
     /// 定义支持依赖注入功能的接口

diff --git a/NetworkSocket/Core/IDynamicJsonSerializer.cs b/NetworkSocket/Core/IDynamicJsonSerializer.cs
@@ -1,8 +1,5 @@
 using NetworkSocket.Exceptions;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/IExceptionContext.cs b/NetworkSocket/Core/IExceptionContext.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/IFilter.cs b/NetworkSocket/Core/IFilter.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NetworkSocket.Core
+namespace NetworkSocket.Core
 {
     /// <summary>
     /// 定义滤过器的接口

diff --git a/NetworkSocket/Core/IFilterAttributeProvider.cs b/NetworkSocket/Core/IFilterAttributeProvider.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/IFilterSupportable.cs b/NetworkSocket/Core/IFilterSupportable.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NetworkSocket.Core
+namespace NetworkSocket.Core
 {
     /// <summary>
     /// 定义支持过滤器功能的接口

diff --git a/NetworkSocket/Core/IGlobalFilters.cs b/NetworkSocket/Core/IGlobalFilters.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/ISerializer.cs b/NetworkSocket/Core/ISerializer.cs
@@ -1,8 +1,5 @@
 using NetworkSocket.Exceptions;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/Internal/ApiActionTable.cs b/NetworkSocket/Core/Internal/ApiActionTable.cs
@@ -1,15 +1,12 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {
     /// <summary>
     /// 表示Api行为表
     /// </summary>
-    internal class ApiActionTable
+    class ApiActionTable
     {
         /// <summary>
         /// Api行为字典
@@ -79,8 +76,7 @@ public void AddRange(IEnumerable<ApiAction> apiActions)
         /// <returns></returns>
         public ApiAction TryGetAndClone(string name)
         {
-            ApiAction apiAction;
-            if (this.dictionary.TryGetValue(name, out apiAction))
+            if (this.dictionary.TryGetValue(name, out ApiAction apiAction))
             {
                 return ((ICloneable<ApiAction>)apiAction).CloneConstructor();
             }

diff --git a/NetworkSocket/Core/Internal/DefaultDependencyResolver.cs b/NetworkSocket/Core/Internal/DefaultDependencyResolver.cs
@@ -1,15 +1,11 @@
 using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {
     /// <summary>
     /// 默认的依赖关系解析程序的实现
     /// </summary>
-    internal class DefaultDependencyResolver : IDependencyResolver
+    class DefaultDependencyResolver : IDependencyResolver
     {
         /// <summary>
         /// 解析支持任意对象创建的一次注册的服务

diff --git a/NetworkSocket/Core/Internal/DefaultDynamicJsonSerializer.cs b/NetworkSocket/Core/Internal/DefaultDynamicJsonSerializer.cs
@@ -2,14 +2,13 @@
 using NetworkSocket.Util;
 using Newtonsoft.Json;
 using System;
-using System.Globalization;
 
 namespace NetworkSocket.Core
 {
     /// <summary>
     /// 默认提供的动态Json序列化工具
     /// </summary>
-    internal class DefaultDynamicJsonSerializer : IDynamicJsonSerializer
+    class DefaultDynamicJsonSerializer : IDynamicJsonSerializer
     {
         /// <summary>
         /// 序列化为Json

diff --git a/NetworkSocket/Core/Internal/DefaultFilterAttributeProvider.cs b/NetworkSocket/Core/Internal/DefaultFilterAttributeProvider.cs
@@ -2,14 +2,13 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {
     /// <summary>
     /// 默认提供的Api行为特性过滤器提供者
     /// </summary>
-    internal class DefaultFilterAttributeProvider : IFilterAttributeProvider
+    class DefaultFilterAttributeProvider : IFilterAttributeProvider
     {
         /// <summary>
         /// ApiAction的过滤器缓存

diff --git a/NetworkSocket/Core/Internal/DomainAssembly.cs b/NetworkSocket/Core/Internal/DomainAssembly.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/Internal/GlobalFiltersBase.cs b/NetworkSocket/Core/Internal/GlobalFiltersBase.cs
@@ -2,14 +2,13 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Core
 {
     /// <summary>
     /// 全局过滤器管理者的基础类
     /// </summary>
-    internal class GlobalFiltersBase : IGlobalFilters
+    class GlobalFiltersBase : IGlobalFilters
     {
         /// <summary>
         /// 获取过过滤器过滤器

diff --git a/NetworkSocket/Core/Internal/PacketIdProvider.cs b/NetworkSocket/Core/Internal/PacketIdProvider.cs
@@ -1,15 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
+using System.Threading;
 
 namespace NetworkSocket.Core
 {
     /// <summary>
     /// 表示数据包id提供者
     /// </summary>
-    internal class PacketIdProvider
+    class PacketIdProvider
     {
         /// <summary>
         /// 基准值

diff --git a/NetworkSocket/Core/NotNullAttribute.cs b/NetworkSocket/Core/NotNullAttribute.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Core/ParameterFilterAttribute.cs b/NetworkSocket/Core/ParameterFilterAttribute.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NetworkSocket.Core
 {

diff --git a/NetworkSocket/Endians.cs b/NetworkSocket/Endians.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NetworkSocket
+namespace NetworkSocket
 {
     /// <summary>
     /// 表示字节存储次序枚举

diff --git a/NetworkSocket/Exceptions/ApiExecuteException.cs b/NetworkSocket/Exceptions/ApiExecuteException.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Exceptions
 {

diff --git a/NetworkSocket/Exceptions/ApiNotExistException.cs b/NetworkSocket/Exceptions/ApiNotExistException.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Exceptions
 {

diff --git a/NetworkSocket/Exceptions/HttpException.cs b/NetworkSocket/Exceptions/HttpException.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Text;
 
 namespace NetworkSocket.Exceptions
 {

diff --git a/NetworkSocket/Exceptions/RemoteException.cs b/NetworkSocket/Exceptions/RemoteException.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Exceptions
 {

diff --git a/NetworkSocket/Exceptions/ResolveException.cs b/NetworkSocket/Exceptions/ResolveException.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Exceptions
 {

diff --git a/NetworkSocket/Exceptions/SerializerException.cs b/NetworkSocket/Exceptions/SerializerException.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NetworkSocket.Exceptions
 {