Change TCP Decoder and Encoder (#621)

apache · Dec 1, 2021 · 35a0181 · 35a0181
1 parent c76e563
commit 35a0181
Show file tree

Hide file tree

Showing 33 changed files with 315 additions and 367 deletions.
diff --git a/...tmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/EventMeshMessage.java b/...tmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/EventMeshMessage.java
@@ -20,51 +20,16 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class EventMeshMessage {
-
-    private String topic;
-    Map<String, String> properties = new ConcurrentHashMap<>();
-    private String body;
-
-    public EventMeshMessage() {
-    }
-
-    public EventMeshMessage(String topic, Map<String, String> properties, String body) {
-        this.topic = topic;
-        this.properties = properties;
-        this.body = body;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
-    public void setTopic(String topic) {
-        this.topic = topic;
-    }
-
-    public Map<String, String> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Map<String, String> properties) {
-        this.properties = properties;
-    }
-
-    public String getBody() {
-        return body;
-    }
-
-    public void setBody(String body) {
-        this.body = body;
-    }
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EventMeshMessage {
 
-    @Override
-    public String toString() {
-        return "EventMeshMessage{" +
-                "topic='" + topic + '\'' +
-                ", properties=" + properties +
-                ", body='" + body + '\'' +
-                '}';
-    }
+    private String              topic;
+    private Map<String, String> properties = new ConcurrentHashMap<>();
+    private String              body;
 }
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Header.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Header.java
@@ -20,13 +20,16 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import lombok.Data;
+
+@Data
 public class Header {
 
-    private Command cmd;
-    private int code;
-    private String desc;
-    private String seq;
-    private Map<String, Object> properties;
+    private Command             cmd;
+    private int                 code;
+    private String              desc;
+    private String              seq;
+    private Map<String, Object> properties = new HashMap<>();
 
     public Header() {
     }
@@ -45,6 +48,7 @@ public Header(int code, String desc, String seq, Map<String, Object> properties)
         this.properties = properties;
     }
 
+
     public Command getCommand() {
         return cmd;
     }
@@ -97,18 +101,7 @@ public Object getProperty(final String name) {
         if (null == this.properties) {
             this.properties = new HashMap<>();
         }
-
         return this.properties.get(name);
     }
 
-    @Override
-    public String toString() {
-        return "Header{" +
-            "cmd=" + cmd +
-            ", code=" + code +
-            ", desc='" + desc + '\'' +
-            ", seq='" + seq + '\'' +
-            ", properties=" + properties +
-            '}';
-    }
 }
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Package.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Package.java
@@ -19,23 +19,20 @@
 
 import org.apache.eventmesh.common.protocol.ProtocolTransportObject;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Package implements ProtocolTransportObject {
 
     private Header header;
     private Object body;
 
-    public Package() {
-    }
-
     public Package(Header header) {
         this.header = header;
     }
 
-    public Package(Header header, Object body) {
-        this.header = header;
-        this.body = body;
-    }
 }