Fixed bug and add cross site header to customer configuration.

Author: liuhongyuand

EasyRest/src/main/java/tech/dbgsoftware/easyrest/model/Response.java

@@ -7,9 +7,10 @@
 import io.netty.handler.codec.http.HttpHeaderValues;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
-import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION;
-import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
-import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
+import java.util.HashMap;
+import java.util.Map;
+
+import static io.netty.handler.codec.http.HttpHeaderNames.*;
 import static io.netty.handler.codec.http.HttpResponseStatus.OK;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
@@ -18,12 +19,17 @@ public class Response {
     private final static Gson GSON = new Gson();
     private FullHttpResponse response;
     private HttpResponseStatus status = HttpResponseStatus.OK;
+    private Map<String, String> responseHeaders = new HashMap<>();
 
     public Response(){
         this.response = newResponse(ResponseEntity.buildOkResponse());
         this.response.setStatus(status);
     }
 
+    public Map<String, String> getResponseHeaders() {
+        return responseHeaders;
+    }
+
     public Response buildResponse(Object responseEntity){
         this.response = newResponse(responseEntity);
         this.response.setStatus(status);
@@ -43,6 +49,7 @@ private FullHttpResponse newResponse(Object responseEntity){
         response.headers().set(CONTENT_TYPE, "application/json");
         response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
         response.headers().set(CONNECTION, HttpHeaderValues.KEEP_ALIVE);
+        responseHeaders.forEach((k, v) -> response.headers().set(k, v));
         return response;
     }
 

EasyRest/src/main/java/tech/dbgsoftware/easyrest/network/NettyInit.java

@@ -1,8 +1,5 @@
 package tech.dbgsoftware.easyrest.network;
 
-import tech.dbgsoftware.easyrest.network.conf.ChannelOptionBuilder;
-import tech.dbgsoftware.easyrest.network.core.api.BaseConfiguration;
-import tech.dbgsoftware.easyrest.network.core.pipeline.in.RequestProcessHandler;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.*;
 import io.netty.channel.epoll.Epoll;
@@ -34,6 +31,7 @@
 public class NettyInit implements BaseConfiguration {
 
     private int port = 8080;
+    private String host = "*";
     private int ioExecutors = Runtime.getRuntime().availableProcessors() * 2;
     public static String SystemName = "EasyRest";
     private int maxContentLength = 20480;
@@ -49,7 +47,12 @@ public class NettyInit implements BaseConfiguration {
     public NettyInit(){}
 
     public NettyInit(int port){
+        this("*", port);
+    }
+
+    public NettyInit(String host, int port) {
         setPort(port);
+        setHost(host);
     }
 
     public ServerBootstrap build(){
@@ -83,6 +86,15 @@ public NettyInit setPort(int port){
         return this;
     }
 
+    @Override
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+
     public NettyInit setIoExecutors(int ioExecutors){
         if (ioExecutors < 1) {
             this.ioExecutors = Runtime.getRuntime().availableProcessors() * 2;

EasyRest/src/main/java/tech/dbgsoftware/easyrest/network/core/api/BaseConfiguration.java

@@ -6,6 +6,8 @@ public interface BaseConfiguration {
 
     int getPort();
 
+    String getHost();
+
     int getIoExecutors();
 
     String getSystemName();

EasyRest/src/main/java/tech/dbgsoftware/easyrest/network/core/pipeline/in/RequestProcessHandler.java

@@ -33,13 +33,20 @@ protected void channelRead0(ChannelHandlerContext channelHandlerContext, FullHtt
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        if (ctx.channel().isActive()){
+            ctx.close();
+        }
         super.exceptionCaught(ctx, cause);
     }
 
     private HttpEntity createNewRequestEntity(ChannelHandlerContext channelHandlerContext, FullHttpRequest fullHttpRequest){
         Request request = new Request(fullHttpRequest);
         Response response = new Response();
-        return new HttpEntity(request, response, channelHandlerContext);
+        HttpEntity httpEntity = new HttpEntity(request, response, channelHandlerContext);
+        httpEntity.getResponse().getResponseHeaders().put("Access-Control-Allow-Origin", baseConfiguration.getHost().equalsIgnoreCase("*") ? "*" : (baseConfiguration.getHost() + ":" + baseConfiguration.getPort()));
+        httpEntity.getResponse().getResponseHeaders().put("Access-Control-Allow-Methods", "POST,GET,OPTIONS,DELETE");
+        httpEntity.getResponse().getResponseHeaders().put("Access-Control-Allow-Headers", "DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization");
+        return httpEntity;
     }
 
 }

EasyRest/src/main/java/tech/dbgsoftware/easyrest/network/core/pipeline/utils/ByteBufUtils.java

@@ -1,11 +1,18 @@
 package tech.dbgsoftware.easyrest.network.core.pipeline.utils;
+
 import io.netty.buffer.ByteBuf;
+import tech.dbgsoftware.easyrest.utils.LogUtils;
 
 public class ByteBufUtils {
 
     public static byte[] readAll(ByteBuf byteBuf) {
-        byte[] contentByte = new byte[byteBuf.readableBytes()];
-        byteBuf.readBytes(contentByte);
-        return contentByte;
+        try {
+            byte[] contentByte = new byte[byteBuf.readableBytes()];
+            byteBuf.readBytes(contentByte);
+            return contentByte;
+        } catch (Exception e) {
+            LogUtils.error(e.getMessage());
+        }
+        return new byte[0];
     }
 }

EasyRest/src/main/java/tech/dbgsoftware/easyrest/utils/LogUtils.java

@@ -4,6 +4,7 @@
 import com.google.gson.GsonBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import tech.dbgsoftware.easyrest.exception.PageNotFoundException;
 
 import java.util.Date;
 
@@ -42,11 +43,23 @@ public static void info(Object obj, Class aClass){
         LOGGER.info(String.format("%s %s", String.valueOf(new Date()), "From " + aClass.getName() + ": " + GSON.toJson(obj)));
     }
 
+    public static void error(String message){
+        LOGGER.error(String.format("%s %s", String.valueOf(new Date()), message));
+    }
+
     public static void error(String message, Object object){
-        LOGGER.error(String.format("%s %s", String.valueOf(new Date()), message), object);
+        if (object == null) {
+            error(message);
+        } else {
+            LOGGER.error(String.format("%s %s", String.valueOf(new Date()), message), object);
+        }
     }
 
     public static void error(String message, Exception e){
-        LOGGER.error(String.format("%s %s", String.valueOf(new Date()), message), e);
+        if (e instanceof PageNotFoundException) {
+            error(message);
+        } else {
+            LOGGER.error(String.format("%s %s", String.valueOf(new Date()), message), e);
+        }
     }
 }

Example/Example-Quick-Start/src/main/java/com/example/Example.java

@@ -7,7 +7,7 @@ public class Example {
 
     public static void main(String[] args) {
         EasyRest easyRest = new EasyRest("classpath:MyExampleApplicationContext.xml");
-        easyRest.startup("EasyRestServer");
+        easyRest.startup("EasyRestServer", 8080);
     }
 
 }

Example/Example-Quick-Start/src/main/java/com/example/rest/TestRestService.java

@@ -0,0 +1,12 @@
+package com.example.rest;
+
+import tech.dbgsoftware.easyrest.annotations.method.BindURL;
+import tech.dbgsoftware.easyrest.annotations.method.Get;
+
+@BindURL("/test")
+public interface TestRestService {
+
+    @Get
+    String ping();
+
+}

…controller/StockInfoRestServiceImpl.java …e/services/StockInfoRestServiceImpl.javaExample/Example-Quick-Start/src/main/java/com/example/controller/StockInfoRestServiceImpl.java renamed to Example/Example-Quick-Start/src/main/java/com/example/services/StockInfoRestServiceImpl.java Example/Example-Quick-Start/src/main/java/com/example/controller/StockInfoRestServiceImpl.java renamed to Example/Example-Quick-Start/src/main/java/com/example/services/StockInfoRestServiceImpl.java

@@ -1,4 +1,4 @@
-package com.example.controller;
+package com.example.services;
 
 import tech.dbgsoftware.easyrest.model.ResponseEntity;
 import com.example.model.Stock;

Example/Example-Quick-Start/src/main/java/com/example/services/TestServiceImpl.java

@@ -0,0 +1,14 @@
+package com.example.services;
+
+import com.example.rest.TestRestService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TestServiceImpl implements TestRestService {
+
+    @Override
+    public String ping() {
+        return ("Pong");
+    }
+
+}