optimize logic

mxsm · mxsm · commit b759be124670 · 2023-08-13T23:06:02.000+08:00
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/HttpCommand.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/HttpCommand.java
@@ -22,6 +22,7 @@
 import org.apache.eventmesh.common.protocol.http.body.BaseResponseBody;
 import org.apache.eventmesh.common.protocol.http.body.Body;
 import org.apache.eventmesh.common.protocol.http.common.EventMeshRetCode;
+import org.apache.eventmesh.common.protocol.http.common.RequestCode;
 import org.apache.eventmesh.common.protocol.http.header.BaseResponseHeader;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 import org.apache.eventmesh.common.utils.JsonUtils;
@@ -80,7 +81,9 @@ public HttpCommand(String httpMethod, String httpVersion, String requestCode) {
     }
 
     public HttpCommand createHttpCommandResponse(Header header, Body body) {
-
+        if (this.requestCode == null) {
+            this.requestCode = RequestCode.UNKNOWN.getRequestCode().toString();
+        }
         HttpCommand response = new HttpCommand(this.httpMethod, this.httpVersion, this.requestCode);
         response.setOpaque(this.opaque);
         response.setReqTime(this.reqTime);
@@ -92,7 +95,9 @@ public HttpCommand createHttpCommandResponse(Header header, Body body) {
     }
 
     public HttpCommand createHttpCommandResponse(EventMeshRetCode eventMeshRetCode) {
-
+        if (this.requestCode == null) {
+            this.requestCode = RequestCode.UNKNOWN.getRequestCode().toString();
+        }
         HttpCommand response = new HttpCommand(this.httpMethod, this.httpVersion, this.requestCode);
         response.setOpaque(this.opaque);
         response.setReqTime(this.reqTime);
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/RequestCode.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/RequestCode.java
@@ -19,6 +19,8 @@
 
 public enum RequestCode {
 
+    UNKNOWN(0, "UNKNOWN"),
+
     MSG_BATCH_SEND(102, "SEND BATCH MSG"),
 
     MSG_BATCH_SEND_V2(107, "SEND BATCH MSG V2"),
diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/http/HttpCommandTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/http/HttpCommandTest.java
@@ -20,6 +20,7 @@
 import static org.mockito.Mockito.when;
 
 import org.apache.eventmesh.common.protocol.http.body.Body;
+import org.apache.eventmesh.common.protocol.http.common.EventMeshRetCode;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 
 import java.util.HashMap;
@@ -89,4 +90,13 @@ public void testHttpResponseWithREQCmdType() throws Exception {
         DefaultFullHttpResponse response = httpCommand.httpResponse();
         Assert.assertNull(response);
     }
+
+    @Test
+    public void testCreateHttpCommandResponse() {
+        HttpCommand command = new HttpCommand();
+        HttpCommand response = command.createHttpCommandResponse(EventMeshRetCode.SUCCESS);
+        Assert.assertNotNull(response);
+        Assert.assertEquals("0", response.getRequestCode());
+
+    }
 }
