Add IQpSerializer and AbstractQpSerializer

aaasoft · aaasoft · commit 0a8742cabddc · 2023-12-06T09:33:29.000+08:00
diff --git a/QpTestClient/Controls/CommandInfoControl.cs b/QpTestClient/Controls/CommandInfoControl.cs
@@ -1,10 +1,4 @@
 ﻿using Quick.Protocol;
-using Quick.Protocol.Utils;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 
diff --git a/QpTestClient/Forms/CommandTestForm.cs b/QpTestClient/Forms/CommandTestForm.cs
@@ -1,11 +1,6 @@
 ﻿using Quick.Protocol;
 using Quick.Protocol.Utils;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace QpTestClient.Forms
diff --git a/Quick.Protocol/AbstractQpSerializer.cs b/Quick.Protocol/AbstractQpSerializer.cs
@@ -0,0 +1,30 @@
+﻿using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+
+namespace Quick.Protocol
+{
+    public abstract class AbstractQpSerializer<T> : IQpSerializer, IQpModel<T>
+    {
+        protected abstract JsonTypeInfo<T> GetTypeInfo();
+
+        public T Deserialize(string value)
+        {
+            return JsonSerializer.Deserialize(value, GetTypeInfo());
+        }
+
+        public string Serialize(T obj)
+        {
+            return JsonSerializer.Serialize(obj, GetTypeInfo());
+        }
+
+        object IQpSerializer.Deserialize(string value)
+        {
+            return Deserialize(value);
+        }
+
+        string IQpSerializer.Serialize(object obj)
+        {
+            return Serialize((T)obj);
+        }
+    }
+}
diff --git a/Quick.Protocol/Base.cs b/Quick.Protocol/Base.cs
@@ -8,25 +8,15 @@ public class Base
             Name = "基础指令集",
             NoticeInfos = new QpNoticeInfo[]
             {
-                QpNoticeInfo.Create<Notices.PrivateNotice>(Notices.NoticesSerializerContext.Default)
+                QpNoticeInfo.Create(new Notices.PrivateNotice())
             },
             CommandInfos = new QpCommandInfo[]
             {
-                QpCommandInfo.Create(
-                    new Commands.Connect.Request(),
-                    Commands.ConnectCommandSerializerContext.Default),
-                QpCommandInfo.Create(
-                    new Commands.Authenticate.Request(),
-                    Commands.AuthenticateCommandSerializerContext.Default),
-                QpCommandInfo.Create(
-                    new Commands.HandShake.Request(),
-                    Commands.HandShakeCommandSerializerContext.Default),
-                QpCommandInfo.Create(
-                    new Commands.PrivateCommand.Request(),
-                    Commands.PrivateCommandCommandSerializerContext.Default),
-                QpCommandInfo.Create(
-                    new Commands.GetQpInstructions.Request(),
-                    Commands.GetQpInstructionsCommandSerializerContext.Default)
+                QpCommandInfo.Create(new Commands.Connect.Request()),
+                QpCommandInfo.Create(new Commands.Authenticate.Request()),
+                QpCommandInfo.Create(new Commands.HandShake.Request()),
+                QpCommandInfo.Create(new Commands.PrivateCommand.Request()),
+                QpCommandInfo.Create(new Commands.GetQpInstructions.Request())
             }
         };
     }
diff --git a/Quick.Protocol/CommandExecuterManager.cs b/Quick.Protocol/CommandExecuterManager.cs
@@ -29,7 +29,7 @@ public void Register<TCmdRequest, TCmdResponse>(Func<QpChannel, TCmdRequest, TCm
         }
 
         public void Register<TCmdRequest, TCmdResponse>(TCmdRequest request, Func<QpChannel, TCmdRequest, TCmdResponse> commandExecuter)
-            where TCmdRequest : class, IQpCommandRequest<TCmdResponse>, new()
+            where TCmdRequest : class, IQpCommandRequest<TCmdRequest, TCmdResponse>, new()
             where TCmdResponse : class, new()
         {
             var cmdRequestTypeName = request.GetType().FullName;
diff --git a/Quick.Protocol/Commands/Authenticate/Request.cs b/Quick.Protocol/Commands/Authenticate/Request.cs
@@ -1,13 +1,12 @@
-﻿using Quick.Protocol.Model;
-using System.ComponentModel;
+﻿using System.ComponentModel;
 using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.Authenticate
 {
     [DisplayName("认证")]
-    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
+    public class Request : AbstractQpSerializer<Request>, IQpCommandRequest<Request, Response>
     {
-        protected override JsonTypeInfo<Request> TypeInfo => AuthenticateCommandSerializerContext.Default.Request;
+        protected override JsonTypeInfo<Request> GetTypeInfo() => AuthenticateCommandSerializerContext.Default.Request;
 
         /// 认证回答
         /// </summary>
diff --git a/Quick.Protocol/Commands/Authenticate/Response.cs b/Quick.Protocol/Commands/Authenticate/Response.cs
@@ -1,11 +1,10 @@
-﻿using Quick.Protocol.Model;
-using System.Text.Json.Serialization.Metadata;
+﻿using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.Authenticate
 {
-    public class Response : AbstractQpModel<Response>
+    public class Response : AbstractQpSerializer<Response>
     {
-        protected override JsonTypeInfo<Response> TypeInfo => AuthenticateCommandSerializerContext.Default.Response;
+        protected override JsonTypeInfo<Response> GetTypeInfo() => AuthenticateCommandSerializerContext.Default.Response;
 
     }
 }
diff --git a/Quick.Protocol/Commands/Connect/Request.cs b/Quick.Protocol/Commands/Connect/Request.cs
@@ -1,5 +1,4 @@
-﻿using Quick.Protocol.Model;
-using System.ComponentModel;
+﻿using System.ComponentModel;
 using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.Connect
@@ -8,9 +7,9 @@ namespace Quick.Protocol.Commands.Connect
     /// 连接请求命令
     /// </summary>
     [DisplayName("连接")]
-    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
+    public class Request : AbstractQpSerializer<Request>, IQpCommandRequest<Request, Response>
     {
-        protected override JsonTypeInfo<Request> TypeInfo => ConnectCommandSerializerContext.Default.Request;
+        protected override JsonTypeInfo<Request> GetTypeInfo() => ConnectCommandSerializerContext.Default.Request;
         /// <summary>
         /// 指令集编号数组
         /// </summary>
diff --git a/Quick.Protocol/Commands/Connect/Response.cs b/Quick.Protocol/Commands/Connect/Response.cs
@@ -1,14 +1,13 @@
-﻿using Quick.Protocol.Model;
-using System.Text.Json.Serialization.Metadata;
+﻿using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.Connect
 {
     /// <summary>
     /// 连接响应命令
     /// </summary>
-    public class Response : AbstractQpModel<Response>
+    public class Response : AbstractQpSerializer<Response>
     {
-        protected override JsonTypeInfo<Response> TypeInfo => ConnectCommandSerializerContext.Default.Response;
+        protected override JsonTypeInfo<Response> GetTypeInfo() => ConnectCommandSerializerContext.Default.Response;
 
         /// <summary>
         /// 缓存大小
diff --git a/Quick.Protocol/Commands/GetQpInstructions/Request.cs b/Quick.Protocol/Commands/GetQpInstructions/Request.cs
@@ -1,5 +1,4 @@
-﻿using Quick.Protocol.Model;
-using System.ComponentModel;
+﻿using System.ComponentModel;
 using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.GetQpInstructions
@@ -8,8 +7,8 @@ namespace Quick.Protocol.Commands.GetQpInstructions
     /// 获取全部指令集信息请求
     /// </summary>
     [DisplayName("获取全部指令集信息")]
-    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
+    public class Request : AbstractQpSerializer<Request>, IQpCommandRequest<Request, Response>
     {
-        protected override JsonTypeInfo<Request> TypeInfo => GetQpInstructionsCommandSerializerContext.Default.Request;
+        protected override JsonTypeInfo<Request> GetTypeInfo() => GetQpInstructionsCommandSerializerContext.Default.Request;
     }
 }
diff --git a/Quick.Protocol/Commands/GetQpInstructions/Response.cs b/Quick.Protocol/Commands/GetQpInstructions/Response.cs
@@ -1,14 +1,13 @@
-﻿using Quick.Protocol.Model;
-using System.Text.Json.Serialization.Metadata;
+﻿using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.GetQpInstructions
 {
     /// <summary>
     /// 获取全部指令集信息响应
     /// </summary>
-    public class Response: AbstractQpModel<Response>
+    public class Response: AbstractQpSerializer<Response>
     {
-        protected override JsonTypeInfo<Response> TypeInfo => GetQpInstructionsCommandSerializerContext.Default.Response;
+        protected override JsonTypeInfo<Response> GetTypeInfo() => GetQpInstructionsCommandSerializerContext.Default.Response;
         /// <summary>
         /// 指令集数据
         /// </summary>
diff --git a/Quick.Protocol/Commands/HandShake/Request.cs b/Quick.Protocol/Commands/HandShake/Request.cs
@@ -1,13 +1,12 @@
-﻿using Quick.Protocol.Model;
-using System.ComponentModel;
+﻿using System.ComponentModel;
 using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.HandShake
 {
     [DisplayName("握手")]
-    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
+    public class Request : AbstractQpSerializer<Request>, IQpCommandRequest<Request, Response>
     {
-        protected override JsonTypeInfo<Request> TypeInfo => HandShakeCommandSerializerContext.Default.Request;
+        protected override JsonTypeInfo<Request> GetTypeInfo() => HandShakeCommandSerializerContext.Default.Request;
 
         /// <summary>
         /// 传输超时(默认15秒)
diff --git a/Quick.Protocol/Commands/HandShake/Response.cs b/Quick.Protocol/Commands/HandShake/Response.cs
@@ -1,10 +1,9 @@
-﻿using Quick.Protocol.Model;
-using System.Text.Json.Serialization.Metadata;
+﻿using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.HandShake
 {
-    public class Response : AbstractQpModel<Response>
+    public class Response : AbstractQpSerializer<Response>
     {
-        protected override JsonTypeInfo<Response> TypeInfo => HandShakeCommandSerializerContext.Default.Response;
+        protected override JsonTypeInfo<Response> GetTypeInfo() => HandShakeCommandSerializerContext.Default.Response;
     }
 }
diff --git a/Quick.Protocol/Commands/PrivateCommand/Request.cs b/Quick.Protocol/Commands/PrivateCommand/Request.cs
@@ -1,5 +1,4 @@
-﻿using Quick.Protocol.Model;
-using System.ComponentModel;
+﻿using System.ComponentModel;
 using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.PrivateCommand
@@ -8,9 +7,9 @@ namespace Quick.Protocol.Commands.PrivateCommand
     /// 私有命令请求
     /// </summary>
     [DisplayName("私有命令")]
-    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
+    public class Request : AbstractQpSerializer<Request>, IQpCommandRequest<Request, Response>
     {
-        protected override JsonTypeInfo<Request> TypeInfo => PrivateCommandCommandSerializerContext.Default.Request;
+        protected override JsonTypeInfo<Request> GetTypeInfo() => PrivateCommandCommandSerializerContext.Default.Request;
         /// <summary>
         /// 动作
         /// </summary>
diff --git a/Quick.Protocol/Commands/PrivateCommand/Response.cs b/Quick.Protocol/Commands/PrivateCommand/Response.cs
@@ -1,5 +1,4 @@
-﻿using Quick.Protocol.Model;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json.Serialization.Metadata;
@@ -9,9 +8,9 @@ namespace Quick.Protocol.Commands.PrivateCommand
     /// <summary>
     /// 私有命令响应
     /// </summary>
-    public class Response : AbstractQpModel<Response>
+    public class Response : AbstractQpSerializer<Response>
     {
-        protected override JsonTypeInfo<Response> TypeInfo => PrivateCommandCommandSerializerContext.Default.Response;
+        protected override JsonTypeInfo<Response> GetTypeInfo() => PrivateCommandCommandSerializerContext.Default.Response;
         /// <summary>
         /// 内容
         /// </summary>
diff --git a/Quick.Protocol/IQpCommandRequest.cs b/Quick.Protocol/IQpCommandRequest.cs
@@ -4,7 +4,7 @@
 
 namespace Quick.Protocol
 {
-    public interface IQpCommandRequest<TResponse>
+    public interface IQpCommandRequest<TRequest, TResponse>
     {
     }
 }
diff --git a/Quick.Protocol/IQpSerializer.cs b/Quick.Protocol/IQpSerializer.cs
@@ -1,12 +1,12 @@
-﻿namespace Quick.Protocol.Model;
+﻿namespace Quick.Protocol;
 
-public interface IQpModel
+public interface IQpSerializer
 {
     string Serialize(object obj);
     object Deserialize(string value);
 }
 
-public interface IQpModel<T> : IQpModel
+public interface IQpModel<T> : IQpSerializer
 {
     string Serialize(T obj);
     new T Deserialize(string value);
diff --git a/Quick.Protocol/Model/AbstractQpModel.cs b/Quick.Protocol/Model/AbstractQpModel.cs
diff --git a/Quick.Protocol/Notices/PrivateNotice.cs b/Quick.Protocol/Notices/PrivateNotice.cs
@@ -1,14 +1,13 @@
-﻿using Quick.Protocol.Model;
-using System.ComponentModel;
+﻿using System.ComponentModel;
 using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Notices
 {
     [DisplayName("私有通知")]
     [Description("用于传递私有协议通知。")]
-    public class PrivateNotice : AbstractQpModel<PrivateNotice>
+    public class PrivateNotice : AbstractQpSerializer<PrivateNotice>
     {
-        protected override JsonTypeInfo<PrivateNotice> TypeInfo => NoticesSerializerContext.Default.PrivateNotice;
+        protected override JsonTypeInfo<PrivateNotice> GetTypeInfo() => NoticesSerializerContext.Default.PrivateNotice;
 
         /// <summary>
         /// 动作
diff --git a/Quick.Protocol/QpChannel.cs b/Quick.Protocol/QpChannel.cs
diff --git a/Quick.Protocol/QpCommandInfo.cs b/Quick.Protocol/QpCommandInfo.cs
diff --git a/Quick.Protocol/QpInstruction.cs b/Quick.Protocol/QpInstruction.cs
diff --git a/Quick.Protocol/QpNoticeInfo.cs b/Quick.Protocol/QpNoticeInfo.cs
diff --git a/Quick.Protocol/Quick.Protocol.csproj b/Quick.Protocol/Quick.Protocol.csproj
diff --git a/Test/Pipeline/PipelineClient/Program.cs b/Test/Pipeline/PipelineClient/Program.cs
diff --git a/Test/Pipeline/PipelineServer/Program.cs b/Test/Pipeline/PipelineServer/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void Register<TCmdRequest, TCmdResponse>(Func<QpChannel, TCmdRequest, TCm`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public void Register<TCmdRequest, TCmdResponse>(TCmdRequest request, Func<QpChannel, TCmdRequest, TCmdResponse> commandExecuter)`
`32`		`- where TCmdRequest : class, IQpCommandRequest<TCmdResponse>, new()`
	`32`	`+ where TCmdRequest : class, IQpCommandRequest<TCmdRequest, TCmdResponse>, new()`
`33`	`33`	`where TCmdResponse : class, new()`
`34`	`34`	`{`
`35`	`35`	`var cmdRequestTypeName = request.GetType().FullName;`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`		`-using Quick.Protocol.Model;`
`2`		`-using System.Text.Json.Serialization.Metadata;`
	`1`	`+using System.Text.Json.Serialization.Metadata;`
`3`	`2`
`4`	`3`	`namespace Quick.Protocol.Commands.Authenticate`
`5`	`4`	`{`
`6`		`- public class Response : AbstractQpModel<Response>`
	`5`	`+ public class Response : AbstractQpSerializer<Response>`
`7`	`6`	`{`
`8`		`- protected override JsonTypeInfo<Response> TypeInfo => AuthenticateCommandSerializerContext.Default.Response;`
	`7`	`+ protected override JsonTypeInfo<Response> GetTypeInfo() => AuthenticateCommandSerializerContext.Default.Response;`
`9`	`8`
`10`	`9`	`}`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using Quick.Protocol.Model;`
`2`		`-using System.ComponentModel;`
	`1`	`+using System.ComponentModel;`
`3`	`2`	`using System.Text.Json.Serialization.Metadata;`
`4`	`3`
`5`	`4`	`namespace Quick.Protocol.Commands.GetQpInstructions`
`@@ -8,8 +7,8 @@ namespace Quick.Protocol.Commands.GetQpInstructions`
`8`	`7`	`/// 获取全部指令集信息请求`
`9`	`8`	`/// </summary>`
`10`	`9`	`[DisplayName("获取全部指令集信息")]`
`11`		`- public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>`
	`10`	`+ public class Request : AbstractQpSerializer<Request>, IQpCommandRequest<Request, Response>`
`12`	`11`	`{`
`13`		`- protected override JsonTypeInfo<Request> TypeInfo => GetQpInstructionsCommandSerializerContext.Default.Request;`
	`12`	`+ protected override JsonTypeInfo<Request> GetTypeInfo() => GetQpInstructionsCommandSerializerContext.Default.Request;`
`14`	`13`	`}`
`15`	`14`	`}`