diff --git a/web_api/src/main/java/eu/arcadex/system/web_api/RequestRouter.java b/web_api/src/main/java/eu/arcadex/system/web_api/RequestRouter.java index 2721c73..3e18648 100644 --- a/web_api/src/main/java/eu/arcadex/system/web_api/RequestRouter.java +++ b/web_api/src/main/java/eu/arcadex/system/web_api/RequestRouter.java @@ -18,21 +18,18 @@ import java.io.IOException; * @author DmitriyMX 2016 (порт на ArcadexSystem Reborn) */ public class RequestRouter extends AbstractHandler { - private final Gson gson; + private final Gson gson = new Gson(); private Logger logger = LoggerFactory.getLogger(RequestRouter.class.getName()); private DBMethodHandler dbHandler = new DBMethodHandler(); private AdminMethodHandler restMethodHandler = new AdminMethodHandler(this); - public RequestRouter() { - this.gson = new Gson(); - } - @Override public void handle(String url, Request request, HttpServletRequest httpRequest, HttpServletResponse response) throws IOException, ServletException { request.setHandled(true); response.setContentType("text/html;charset=utf-8"); // Some headers for Cross Domain Origin + // TODO: переместить в конфиг response.setHeader("Access-Control-Allow-Origin", "*"); response.setHeader("Access-Control-Allow-Headers", "Authorization"); @@ -55,7 +52,7 @@ public class RequestRouter extends AbstractHandler { * @param request * @param httpRequest * @param response - * @return + * @return Response * @throws IOException * @throws ServletException */ @@ -70,7 +67,7 @@ public class RequestRouter extends AbstractHandler { return (new Response("error", "Error: action not found")); } } catch (Exception e) { - e.printStackTrace(); + logger.error("Error route", e); response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); return (new Response("error", "Error: internal server error")); } diff --git a/web_api/src/main/java/eu/arcadex/system/web_api/methods/AdminMethodHandler.java b/web_api/src/main/java/eu/arcadex/system/web_api/methods/AdminMethodHandler.java index 312f2af..9b2936a 100644 --- a/web_api/src/main/java/eu/arcadex/system/web_api/methods/AdminMethodHandler.java +++ b/web_api/src/main/java/eu/arcadex/system/web_api/methods/AdminMethodHandler.java @@ -46,7 +46,7 @@ public class AdminMethodHandler extends AbstractMethodHandler { * @param request * @param httpRequest * @param response - * @return + * @return Response * @throws IOException * @throws ServletException */ diff --git a/web_api/src/main/java/eu/arcadex/system/web_api/methods/DBMethodHandler.java b/web_api/src/main/java/eu/arcadex/system/web_api/methods/DBMethodHandler.java index 51bf9f7..f784773 100644 --- a/web_api/src/main/java/eu/arcadex/system/web_api/methods/DBMethodHandler.java +++ b/web_api/src/main/java/eu/arcadex/system/web_api/methods/DBMethodHandler.java @@ -1,6 +1,5 @@ package eu.arcadex.system.web_api.methods; -import eu.arcadex.system.web_api.RequestRouter; import eu.arcadex.system.web_api.Response; import org.eclipse.jetty.server.Request; @@ -51,7 +50,7 @@ public class DBMethodHandler extends AbstractMethodHandler { * @param request * @param httpRequest * @param response - * @return + * @return Response * @throws IOException * @throws ServletException */