resolve conflicts

Author: YoWuwuuuw

core/src/main/java/org/apache/seata/core/rpc/netty/http/HttpDispatchHandler.java

@@ -39,12 +39,7 @@
 import org.apache.seata.core.rpc.netty.NettyServerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
 import org.apache.seata.common.rpc.http.HttpContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.ExecutorService;
@@ -76,45 +71,36 @@ public class HttpDispatchHandler extends SimpleChannelInboundHandler<HttpRequest
     }
 
     @Override
-    protected void channelRead0(ChannelHandlerContext ctx, HttpRequest httpRequest) throws Exception {
+    protected void channelRead0(ChannelHandlerContext ctx, HttpRequest httpRequest) {
         boolean keepAlive = HttpUtil.isKeepAlive(httpRequest) && httpRequest.protocolVersion().isKeepAliveDefault();
         try {
             httpHandlerThreads.execute(() -> {
                 try {
                     processHttpRequest(ctx, httpRequest, keepAlive);
+                } catch (IllegalArgumentException e) {
+                    LOGGER.error("Illegal argument exception: {}", e.getMessage(), e);
+                    sendErrorResponse(ctx, HttpResponseStatus.BAD_REQUEST, false);
                 } catch (Exception e) {
-                    LOGGER.error("HTTP request processing error", e);
-                    sendResponse(ctx, null, keepAlive);
+                    LOGGER.error("Exception occurred while processing HTTP request: {}", e.getMessage(), e);
+                    sendErrorResponse(ctx, HttpResponseStatus.INTERNAL_SERVER_ERROR, false);
                 }
             });
         } catch (RejectedExecutionException e) {
-            sendUnavailable(ctx, keepAlive);
-            LOGGER.warn("HTTP thread pool is full, return 503 status code", e);
+            sendErrorResponse(ctx, HttpResponseStatus.SERVICE_UNAVAILABLE, false);
+            LOGGER.error("HTTP thread pool is full: {}", e.getMessage(), e);
         }
     }
 
-
-    /*
-    catch (IllegalArgumentException e) {
-            keepAlive = false;
-            LOGGER.error("Illegal argument exception: {}", e.getMessage(), e);
-            response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.BAD_REQUEST,
-                    Unpooled.wrappedBuffer(Unpooled.EMPTY_BUFFER));
-        } catch (Exception e) {
-            keepAlive = false;
-            LOGGER.error("Exception occurred while processing HTTP request: {}", e.getMessage(), e);
-            response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.INTERNAL_SERVER_ERROR,
-                    Unpooled.wrappedBuffer(Unpooled.EMPTY_BUFFER));
-        }
-     */
     private void processHttpRequest(ChannelHandlerContext ctx, HttpRequest httpRequest, boolean keepAlive) throws Exception {
         QueryStringDecoder queryStringDecoder = new QueryStringDecoder(httpRequest.uri());
         String path = queryStringDecoder.path();
         HttpInvocation httpInvocation = ControllerManager.getHttpInvocation(path);
+
         if (httpInvocation == null) {
-            sendNotFound(ctx, keepAlive);
+            sendErrorResponse(ctx, HttpResponseStatus.NOT_FOUND, keepAlive);
             return;
         }
+
         HttpContext httpContext = new HttpContext(httpRequest, ctx, keepAlive);
         ObjectNode requestDataNode = OBJECT_MAPPER.createObjectNode();
         requestDataNode.putIfAbsent("param", ParameterParser.convertParamMap(queryStringDecoder.parameters()));
@@ -149,55 +135,30 @@ private void processHttpRequest(ChannelHandlerContext ctx, HttpRequest httpReque
             return;
         }
 
-        if (requestDataNode.get("channel") == null) {
-            return;
-        }
-
         sendResponse(ctx, result, keepAlive);
     }
 
-    private void sendResponse(ChannelHandlerContext ctx, Object result, boolean keepAlive) {
-        try {
-            FullHttpResponse response;
-            if (result != null) {
-                byte[] body = OBJECT_MAPPER.writeValueAsBytes(result);
-                response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
-                        Unpooled.wrappedBuffer(body));
-                response.headers().set(HttpHeaderNames.CONTENT_LENGTH, body.length);
-            } else {
-                response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
-                        Unpooled.wrappedBuffer(Unpooled.EMPTY_BUFFER));
-            }
-            if (!keepAlive) {
-                ctx.writeAndFlush(response).addListeners(ChannelFutureListener.CLOSE);
-            } else {
-                ctx.writeAndFlush(response);
-            }
-        } catch (JsonProcessingException e) {
-            LOGGER.error("Failed to serialize response", e);
-            FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.INTERNAL_SERVER_ERROR,
+    private void sendResponse(ChannelHandlerContext ctx, Object result, boolean keepAlive) throws JsonProcessingException {
+        FullHttpResponse response;
+        if (result != null) {
+            byte[] body = OBJECT_MAPPER.writeValueAsBytes(result);
+            response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
+                    Unpooled.wrappedBuffer(body));
+            response.headers().set(HttpHeaderNames.CONTENT_LENGTH, body.length);
+        } else {
+            response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
                     Unpooled.wrappedBuffer(Unpooled.EMPTY_BUFFER));
-            if (!keepAlive) {
-                ctx.writeAndFlush(response).addListeners(ChannelFutureListener.CLOSE);
-            } else {
-                ctx.writeAndFlush(response);
-            }
         }
-    }
-
-    private void sendNotFound(ChannelHandlerContext ctx, boolean keepAlive) {
-        FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NOT_FOUND,
-                Unpooled.wrappedBuffer(Unpooled.EMPTY_BUFFER));
         if (!keepAlive) {
             ctx.writeAndFlush(response).addListeners(ChannelFutureListener.CLOSE);
         } else {
             ctx.writeAndFlush(response);
         }
     }
 
-    private void sendUnavailable(ChannelHandlerContext ctx, boolean keepAlive) {
-        FullHttpResponse response = new DefaultFullHttpResponse(
-                HttpVersion.HTTP_1_1, HttpResponseStatus.SERVICE_UNAVAILABLE, Unpooled.wrappedBuffer(Unpooled.EMPTY_BUFFER));
+    private void sendErrorResponse(ChannelHandlerContext ctx, HttpResponseStatus status, boolean keepAlive) {
+        FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, status,
+                Unpooled.wrappedBuffer(Unpooled.EMPTY_BUFFER));
         if (!keepAlive) {
             ctx.writeAndFlush(response).addListeners(ChannelFutureListener.CLOSE);
         } else {