From 8918104a1504ab23c6049368d48f9cb30597a659 Mon Sep 17 00:00:00 2001
From: godotg <jaysunxiao@gmail.com>
Date: Wed, 17 Jan 2024 11:07:10 +0800
Subject: [PATCH] del[message]: delete fields that are not used for generic
 returns

---
 .../com/zfoo/net/packet/common/Error.java     | 67 ++++++-------------
 .../com/zfoo/net/packet/common/Message.java   | 38 +++--------
 2 files changed, 30 insertions(+), 75 deletions(-)

diff --git a/net/src/main/java/com/zfoo/net/packet/common/Error.java b/net/src/main/java/com/zfoo/net/packet/common/Error.java
index 7b4e3ba4..8a6d5667 100644
--- a/net/src/main/java/com/zfoo/net/packet/common/Error.java
+++ b/net/src/main/java/com/zfoo/net/packet/common/Error.java
@@ -13,77 +13,52 @@
 
 package com.zfoo.net.packet.common;
 
-import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.anno.Protocol;
-import org.slf4j.helpers.FormattingTuple;
-import org.slf4j.helpers.MessageFormatter;
+import com.zfoo.protocol.util.StringUtils;
 
 /**
+ * internal error message
+ *
  * @author godotg
  */
 @Protocol(id = 101)
 public class Error {
 
-    private int module;
-    private int errorCode;
-    private String errorMessage;
+    private int code;
+    private String message;
 
     @Override
     public String toString() {
-        FormattingTuple message = MessageFormatter.arrayFormat(
-                "module:[{}], errorCode:[{}], errorMessage:[{}]", new Object[]{module, errorCode, errorMessage});
-        return message.getMessage();
+        return StringUtils.format("code:[{}] message:[{}]", code, message);
     }
 
-    public static Error valueOf(int module, int errorCode, String errorMessage) {
+    public static Error valueOf(int code, String errorMessage) {
         Error response = new Error();
-        response.module = module;
-        response.errorCode = errorCode;
-        response.errorMessage = errorMessage;
+        response.code = code;
+        response.message = errorMessage;
         return response;
     }
 
-    public static Error valueOf(Object packet, int errorCode, String errorMessage) {
-        Error response = new Error();
-        response.module = ProtocolManager.getProtocol(packet.getClass()).module();
-        response.errorCode = errorCode;
-        response.errorMessage = errorMessage;
-        return response;
-    }
-
-    public static Error valueOf(Object packet, int errorCode) {
-        return valueOf(packet, errorCode, null);
-    }
-
-    public static Error valueOf(Object packet, String errorMessage) {
-        return valueOf(packet, 0, errorMessage);
-    }
-
     public static Error valueOf(String errorMessage) {
-        return valueOf(0, 0, errorMessage);
+        Error response = new Error();
+        response.code = 0;
+        response.message = errorMessage;
+        return response;
     }
 
-    public int getModule() {
-        return module;
+    public int getCode() {
+        return code;
     }
 
-    public void setModule(int module) {
-        this.module = module;
+    public void setCode(int code) {
+        this.code = code;
     }
 
-    public int getErrorCode() {
-        return errorCode;
+    public String getMessage() {
+        return message;
     }
 
-    public void setErrorCode(int errorCode) {
-        this.errorCode = errorCode;
-    }
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public void setErrorMessage(String errorMessage) {
-        this.errorMessage = errorMessage;
+    public void setMessage(String message) {
+        this.message = message;
     }
 }
diff --git a/net/src/main/java/com/zfoo/net/packet/common/Message.java b/net/src/main/java/com/zfoo/net/packet/common/Message.java
index bed3ff38..ff929d0c 100644
--- a/net/src/main/java/com/zfoo/net/packet/common/Message.java
+++ b/net/src/main/java/com/zfoo/net/packet/common/Message.java
@@ -13,19 +13,19 @@
 
 package com.zfoo.net.packet.common;
 
-import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.anno.Protocol;
+import com.zfoo.protocol.util.StringUtils;
 
 /**
- * 通用的返回，既可以用在远程调用，又可以嵌套在其它协议里
+ *
+ * EN: Generic returns can be used both remotely and nested in other protocols
+ * CN: 通用的返回，既可以用在远程调用，又可以嵌套在其它协议里
  *
  * @author godotg
  */
 @Protocol(id = 100)
 public class Message {
 
-    private byte module;
-
     /**
      * 1是成功，其它的均视为失败的请求
      */
@@ -33,6 +33,11 @@ public class Message {
 
     private String message;
 
+    @Override
+    public String toString() {
+        return StringUtils.format("code:[{}] message:[{}]", code, message);
+    }
+
     public boolean success() {
         return code == 1;
     }
@@ -41,17 +46,6 @@ public class Message {
         return code == 0;
     }
 
-    public static Message valueOf(Object packet, int code, String message) {
-        var mess = new Message();
-        mess.module = ProtocolManager.moduleByProtocol(packet.getClass()).getId();
-        mess.code = code;
-        mess.message = message;
-        return mess;
-    }
-
-    public static Message valueOf(Object packet, int code) {
-        return Message.valueOf(packet, code, null);
-    }
 
     public static Message valueError(String message) {
         var mess = new Message();
@@ -74,20 +68,6 @@ public class Message {
         return mess;
     }
 
-    public static Message valueWarning(String message) {
-        var mess = new Message();
-        mess.code = 3;
-        mess.message = message;
-        return mess;
-    }
-
-    public byte getModule() {
-        return module;
-    }
-
-    public void setModule(byte module) {
-        this.module = module;
-    }
 
     public int getCode() {
         return code;