From 72778d640776b6faed501c4350ef3f33db005643 Mon Sep 17 00:00:00 2001 From: Ivan Olexyn Date: Sat, 18 Apr 2020 16:24:39 +0200 Subject: [PATCH] ~ declutter. --- mispbridge/mispbridge.iml | 5 ++- mispbridge/src/BridgeServlet.java | 64 ++++++++++++------------------- 2 files changed, 27 insertions(+), 42 deletions(-) diff --git a/mispbridge/mispbridge.iml b/mispbridge/mispbridge.iml index d89b084..68af228 100644 --- a/mispbridge/mispbridge.iml +++ b/mispbridge/mispbridge.iml @@ -4,11 +4,12 @@ - - + + + \ No newline at end of file diff --git a/mispbridge/src/BridgeServlet.java b/mispbridge/src/BridgeServlet.java index 304fa3f..69da862 100644 --- a/mispbridge/src/BridgeServlet.java +++ b/mispbridge/src/BridgeServlet.java @@ -15,11 +15,17 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -public final class BridgeServlet extends HttpServlet { +public class BridgeServlet extends HttpServlet { private static final String MISP_CLIENT_URL = "http://localhost:9090/mispclient/core"; - private List list = new ArrayList<>(); + public List availableRides = new ArrayList<>(); + public List reservedRides = new ArrayList<>(); + public List deliveredRides = new ArrayList<>(); + private List newRequests = new ArrayList<>(); + private List forwardedRequests = new ArrayList<>(); + private List newData = new ArrayList<>(); + private List forwardedData = new ArrayList<>(); public BridgeServlet() { @@ -29,8 +35,7 @@ public final class BridgeServlet extends HttpServlet { - // handle POST (Ride) - // add Ride to AvailableRides + // handle GET (Link) // remove Ride from AvailableRides @@ -74,50 +79,29 @@ public final class BridgeServlet extends HttpServlet { // # send OK (EOL) - + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { response.setContentType("text/html"); PrintWriter writer = response.getWriter(); - writer.println(""); - writer.println(""); - writer.println("MispBridge"); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - writer.println(""); - - writer.println("REQUEST"); - writer.println(request.getRequestURI()); - writer.println(request.getRequestURL()); - writer.println(request.getMethod()); - - for(String s : list){ - writer.println(s); - } - - - - - - writer.println("
"); - writer.println(""); - writer.println(""); - writer.println("

Sample Application Servlet

"); - writer.println("This is the output of a servlet that is part of"); - writer.println("the BridgeServlet, Very World application."); - writer.println("
"); - writer.println(""); - writer.println(""); + writer.println("MispClient"); + writer.println("");writer.println("MispClient"); + writer.println(""); } - + /** + * handle POST (Ride) + * add Ride to AvailableRides + */ + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - list.add(request.getRemoteUser()); + String json = "foo"; // TODO + Ride availableRide = new Ride(json); + availableRides.add(availableRide); + // TODO wait rill GET(Link) to return OK(Ride) to mispclient + + }