Fixed router path bug, and support OPTIONS check.

Author: liuhongyuand

EasyRest/src/main/java/tech/dbgsoftware/easyrest/actors/request/RequestProcessActor.java

@@ -4,6 +4,7 @@
 import akka.actor.ActorRef;
 import tech.dbgsoftware.easyrest.actors.ActorFactory;
 import tech.dbgsoftware.easyrest.actors.ExceptionHandleActor;
+import tech.dbgsoftware.easyrest.actors.response.OutputActor;
 import tech.dbgsoftware.easyrest.aop.StaticAopStepUtil;
 import tech.dbgsoftware.easyrest.model.HttpEntity;
 import tech.dbgsoftware.easyrest.utils.LogUtils;
@@ -15,7 +16,7 @@ public Receive createReceive() {
         return receiveBuilder().match(HttpEntity.class, (httpEntity -> {
             HttpEntity[] httpEntityTemp = {httpEntity};
             StaticAopStepUtil.getAopPreCommitStepList().forEach((step) -> {
-                if (httpEntityTemp[0].getErrorMap().size() == 0) {
+                if (httpEntityTemp[0].getErrorMap().size() == 0 && !httpEntityTemp[0].isOptionsCheck()) {
                     try {
                         httpEntityTemp[0] = step.executeStep(httpEntityTemp[0]);
                     } catch (Exception e) {
@@ -25,7 +26,11 @@ public Receive createReceive() {
                 }
             });
             if (httpEntityTemp[0].getErrorMap().size() == 0) {
-                ActorFactory.createActor(ControllerInvokeActor.class).tell(httpEntityTemp[0], ActorRef.noSender());
+                if (httpEntityTemp[0].isOptionsCheck()) {
+                    ActorFactory.createActor(OutputActor.class).tell(httpEntityTemp[0], ActorRef.noSender());
+                } else {
+                    ActorFactory.createActor(ControllerInvokeActor.class).tell(httpEntityTemp[0], ActorRef.noSender());
+                }
             } else {
                 ActorFactory.createActor(ExceptionHandleActor.class).tell(httpEntityTemp[0], ActorRef.noSender());
             }

EasyRest/src/main/java/tech/dbgsoftware/easyrest/actors/response/OutputActor.java

@@ -10,7 +10,8 @@ public class OutputActor extends AbstractActor {
     @Override
     public Receive createReceive() {
         return receiveBuilder().match(HttpEntity.class, (httpEntity -> {
-            if (httpEntity.getRestObject().getMethod().getReturnType().equals(ResponseEntity.class) ||
+            if (httpEntity.isOptionsCheck() ||
+                    httpEntity.getRestObject().getMethod().getReturnType().equals(ResponseEntity.class) ||
                     httpEntity.getRestObject().getMethod().getReturnType().getSimpleName().equalsIgnoreCase(Void.class.getSimpleName())) {
                 httpEntity.getResponse().buildResponse(httpEntity.getResponseEntity());
             } else {

EasyRest/src/main/java/tech/dbgsoftware/easyrest/aop/pre/AopRequestValidateStep.java

@@ -29,8 +29,12 @@ public HttpEntity executeStep(HttpEntity entity) throws Exception {
             throw new PageNotFoundException(String.format(NOT_FOUND, url));
         } else {
             if (!restObject.getHttpMethodList().contains(entity.getRequest().getRequestHttpMethod().toLowerCase())){
-                entity.getResponse().getRealResponse().setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
-                throw new MethodNotAllowedException(String.format(NOT_ALLOWED, entity.getRequest().getRequestHttpMethod()));
+                if (entity.getRequest().getRequestHttpMethod().toLowerCase().equalsIgnoreCase("options")) {
+                    entity.setOptionsCheck(true);
+                } else {
+                    entity.getResponse().getRealResponse().setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
+                    throw new MethodNotAllowedException(String.format(NOT_ALLOWED, entity.getRequest().getRequestHttpMethod()));
+                }
             }
         }
         entity.setRestObject(restObject);

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

@@ -14,6 +14,7 @@ public class HttpEntity {
     private Request request;
     private Response response;
     private Class controller;
+    private Boolean isOptionsCheck = false;
     private ChannelHandlerContext channelHandlerContext;
     private ResponseEntity responseEntity;
     private RestObject restObject;
@@ -26,6 +27,14 @@ public HttpEntity(Request request, Response response, ChannelHandlerContext chan
         this.channelHandlerContext = channelHandlerContext;
     }
 
+    public Boolean isOptionsCheck() {
+        return isOptionsCheck;
+    }
+
+    public void setOptionsCheck(Boolean optionsCheck) {
+        isOptionsCheck = optionsCheck;
+    }
+
     public void setMethod(Method method) {
         this.method = method;
     }

EasyRest/src/main/java/tech/dbgsoftware/easyrest/network/router/RouterProvider.java

@@ -74,7 +74,7 @@ private static void putRouter(String bindUrl, String methodUrl, HttpMethod httpM
             url.insert(0, "/");
         }
         if (!bindUrl.endsWith("/") && !methodUrl.startsWith("/")){
-            url.insert(bindUrl.length(), "/");
+            url.insert(url.length(), "/");
         }
         url.append(methodUrl);
         RouterProvider.registerUrl(url.toString(), httpMethod, restObject);