+ do structure.

mispbridge/src/BridgeServlet.java

@@ -1,19 +1,12 @@
+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 {
 
@@ -27,65 +20,95 @@ public class BridgeServlet extends HttpServlet {
     private List<Ride> newData = new ArrayList<>();
     private List<Ride> forwardedData = new ArrayList<>();
 
+    // #######
+    //
+    // #######
 
-    public BridgeServlet() {
-
-
-    }
-
-
-
-
-
-    // handle GET (Link)
-    // remove Ride from AvailableRides
-    // add Ride to ReservedRides
-    // send OK (Ride) to mispclient
-    // send OK (Ride) to public
+    @Override
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
 
-    // handle GET (Ride)
-    // if Ride in ReservedRides,
-    // remove Ride from ReservedRides
-    // add Ride to Deliveredrides
+        String jsonPayload = IOUtils.toString(request.getReader());
 
-    // 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
+        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)(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
+            if (!hasReqeust && !hasData) { handleGetRide(request, response);}
+            if (hasReqeust && !hasData) { handleGetRideRequest(request, response);}
+            if (hasReqeust && hasData) { handleGetRideRequestData(request, response);}
+        }
+    }
 
 
+    /**
+     * 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();
+    }
+
 
+    /**
+     * 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)(Data)
+    /**
+     * 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();
+    }
 
+
+    /**
+     * 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("<html><head><title>MispClient</title></head><body bgcolor=white>");
-        writer.println("</body></html>");writer.println("<html><head><title>MispClient</title></head><body bgcolor=white>");
-        writer.println("</body></html>");
+    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();
     }
-
-
-
 }