WebAPI: мелкие исправления
This commit is contained in:
@@ -18,21 +18,18 @@ import java.io.IOException;
|
|||||||
* @author DmitriyMX <mail@dmitriymx.ru> 2016 (порт на ArcadexSystem Reborn)
|
* @author DmitriyMX <mail@dmitriymx.ru> 2016 (порт на ArcadexSystem Reborn)
|
||||||
*/
|
*/
|
||||||
public class RequestRouter extends AbstractHandler {
|
public class RequestRouter extends AbstractHandler {
|
||||||
private final Gson gson;
|
private final Gson gson = new Gson();
|
||||||
private Logger logger = LoggerFactory.getLogger(RequestRouter.class.getName());
|
private Logger logger = LoggerFactory.getLogger(RequestRouter.class.getName());
|
||||||
|
|
||||||
private DBMethodHandler dbHandler = new DBMethodHandler();
|
private DBMethodHandler dbHandler = new DBMethodHandler();
|
||||||
private AdminMethodHandler restMethodHandler = new AdminMethodHandler(this);
|
private AdminMethodHandler restMethodHandler = new AdminMethodHandler(this);
|
||||||
|
|
||||||
public RequestRouter() {
|
|
||||||
this.gson = new Gson();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handle(String url, Request request, HttpServletRequest httpRequest, HttpServletResponse response) throws IOException, ServletException {
|
public void handle(String url, Request request, HttpServletRequest httpRequest, HttpServletResponse response) throws IOException, ServletException {
|
||||||
request.setHandled(true);
|
request.setHandled(true);
|
||||||
response.setContentType("text/html;charset=utf-8");
|
response.setContentType("text/html;charset=utf-8");
|
||||||
// Some headers for Cross Domain Origin
|
// Some headers for Cross Domain Origin
|
||||||
|
// TODO: переместить в конфиг
|
||||||
response.setHeader("Access-Control-Allow-Origin", "*");
|
response.setHeader("Access-Control-Allow-Origin", "*");
|
||||||
response.setHeader("Access-Control-Allow-Headers", "Authorization");
|
response.setHeader("Access-Control-Allow-Headers", "Authorization");
|
||||||
|
|
||||||
@@ -55,7 +52,7 @@ public class RequestRouter extends AbstractHandler {
|
|||||||
* @param request
|
* @param request
|
||||||
* @param httpRequest
|
* @param httpRequest
|
||||||
* @param response
|
* @param response
|
||||||
* @return
|
* @return Response
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
* @throws ServletException
|
* @throws ServletException
|
||||||
*/
|
*/
|
||||||
@@ -70,7 +67,7 @@ public class RequestRouter extends AbstractHandler {
|
|||||||
return (new Response("error", "Error: action not found"));
|
return (new Response("error", "Error: action not found"));
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
logger.error("Error route", e);
|
||||||
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
|
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
|
||||||
return (new Response("error", "Error: internal server error"));
|
return (new Response("error", "Error: internal server error"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ public class AdminMethodHandler extends AbstractMethodHandler {
|
|||||||
* @param request
|
* @param request
|
||||||
* @param httpRequest
|
* @param httpRequest
|
||||||
* @param response
|
* @param response
|
||||||
* @return
|
* @return Response
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
* @throws ServletException
|
* @throws ServletException
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package eu.arcadex.system.web_api.methods;
|
package eu.arcadex.system.web_api.methods;
|
||||||
|
|
||||||
import eu.arcadex.system.web_api.RequestRouter;
|
|
||||||
import eu.arcadex.system.web_api.Response;
|
import eu.arcadex.system.web_api.Response;
|
||||||
import org.eclipse.jetty.server.Request;
|
import org.eclipse.jetty.server.Request;
|
||||||
|
|
||||||
@@ -51,7 +50,7 @@ public class DBMethodHandler extends AbstractMethodHandler {
|
|||||||
* @param request
|
* @param request
|
||||||
* @param httpRequest
|
* @param httpRequest
|
||||||
* @param response
|
* @param response
|
||||||
* @return
|
* @return Response
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
* @throws ServletException
|
* @throws ServletException
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user