From 6a4bfce1fd33ac94fe22d6632f2aa0a609fbf788 Mon Sep 17 00:00:00 2001 From: Ivan Olexyn Date: Sat, 18 Apr 2020 17:42:40 +0200 Subject: [PATCH] + do structure. --- mispbridge/src/BridgeServlet.java | 151 ++++++++++++++++-------------- 1 file changed, 82 insertions(+), 69 deletions(-) diff --git a/mispbridge/src/BridgeServlet.java b/mispbridge/src/BridgeServlet.java index 69da862..c59825c 100644 --- a/mispbridge/src/BridgeServlet.java +++ b/mispbridge/src/BridgeServlet.java @@ -1,23 +1,16 @@ +import org.apache.commons.io.IOUtils; -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - - - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; public class BridgeServlet extends HttpServlet { - private static final String MISP_CLIENT_URL = "http://localhost:9090/mispclient/core"; + private static final String MISP_CLIENT_URL = "http://localhost:9090/mispclient/core"; public List availableRides = new ArrayList<>(); public List reservedRides = new ArrayList<>(); @@ -27,65 +20,95 @@ public class BridgeServlet extends HttpServlet { private List newData = new ArrayList<>(); private List forwardedData = new ArrayList<>(); + // ####### + // + // ####### - public BridgeServlet() { - - - } - - - + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + String jsonPayload = IOUtils.toString(request.getReader()); - // handle GET (Link) - // remove Ride from AvailableRides - // add Ride to ReservedRides - // send OK (Ride) to mispclient - // send OK (Ride) to public + if (jsonPayload.contains("LINK")) { + handleGetLink(request, response); + } else { + Ride ridePayload = new Ride(jsonPayload); + boolean hasReqeust = ridePayload.getRequest() != null; + boolean hasData = ridePayload.getData() != null; - // handle GET (Ride) - // if Ride in ReservedRides, - // remove Ride from ReservedRides - // add Ride to Deliveredrides + if (!hasReqeust && !hasData) { handleGetRide(request, response);} + if (hasReqeust && !hasData) { handleGetRideRequest(request, response);} + if (hasReqeust && hasData) { handleGetRideRequestData(request, response);} + } + } - // handle GET (Ride)(Request) - // if Ride in DeliveredRides - // remove Ride from DeliveredRides - // add Ride to NewRequest - // send OK (Ride)(Request) - // remove Ride from NewRequest - // add Ride to ForwardedRequest - // handle GET (Ride)(Data) - // if Ride in ForwardedRequest - // remove Ride from ForwardedRequest - // add Ride to NewData - // send OK (Ride)(Data) - // remove Ride from NewData - // add Ride to ForwardedData - // send OK (EOL) - // remove Ride from ForwardedData - // add Ride to EOL + /** + * handle GET (Link) + * remove Ride from AvailableRides + * add Ride to ReservedRides + * send OK (Ride) to mispclient + * send OK (Ride) to public + */ + private Ride handleGetLink(HttpServletRequest request, HttpServletResponse response) { + // # send OK (Ride) to mispclient + // # send OK (Ride) to public + return new Ride(); + } - // # send OK (Ride) to mispclient + /** + * handle GET (Ride) + * if Ride in ReservedRides, + * remove Ride from ReservedRides + * add Ride to Deliveredrides + */ + private Ride handleGetRide(HttpServletRequest request, HttpServletResponse response) { + // # send OK (Ride)(Request) + return new Ride(); + } - // # send OK (Ride) to public - // # send OK (Ride)(Request) + /** + * handle GET (Ride)(Request) + * if Ride in DeliveredRides + * remove Ride from DeliveredRides + * add Ride to NewRequest + * send OK (Ride)(Request) + * remove Ride from NewRequest + * add Ride to ForwardedRequest + */ + private Ride handleGetRideRequest(HttpServletRequest request, HttpServletResponse response) { + // # send OK (Ride)(Request)(Data) + return new Ride(); + } - // # send OK (Ride)(Data) - // # send OK (EOL) + /** + * handle GET (Ride)(Data) + * if Ride in ForwardedRequest + * remove Ride from ForwardedRequest + * add Ride to NewData + * send OK (Ride)(Data) + * remove Ride from NewData + * add Ride to ForwardedData + * send OK (EOL) + * remove Ride from ForwardedData + * add Ride to EOL + */ + private Ride handleGetRideRequestData(HttpServletRequest request, HttpServletResponse response) { + // # send OK (EOL) + return new Ride(); + } + // ####### + // + // ####### @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - response.setContentType("text/html"); - PrintWriter writer = response.getWriter(); - writer.println("MispClient"); - writer.println("");writer.println("MispClient"); - writer.println(""); + public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + + handlePostRide(request, response); } @@ -93,17 +116,7 @@ public class BridgeServlet extends HttpServlet { * handle POST (Ride) * add Ride to AvailableRides */ - @Override - public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - - String json = "foo"; // TODO - Ride availableRide = new Ride(json); - availableRides.add(availableRide); - // TODO wait rill GET(Link) to return OK(Ride) to mispclient - - + private Ride handlePostRide(HttpServletRequest request, HttpServletResponse response) { + return new Ride(); } - - - -} +} \ No newline at end of file