diff --git a/mispbridge/src/BridgeServlet.java b/mispbridge/src/BridgeServlet.java index c59825c..2d3641d 100644 --- a/mispbridge/src/BridgeServlet.java +++ b/mispbridge/src/BridgeServlet.java @@ -10,15 +10,15 @@ import java.util.List; public class BridgeServlet extends HttpServlet { - private static final String MISP_CLIENT_URL = "http://localhost:9090/mispclient/core"; + protected static final String MISP_CLIENT_URL = "http://localhost:9090/mispclient/core"; 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<>(); + protected List newRequests = new ArrayList<>(); + protected List forwardedRequests = new ArrayList<>(); + protected List newData = new ArrayList<>(); + protected List forwardedData = new ArrayList<>(); // ####### // @@ -50,8 +50,7 @@ public class BridgeServlet extends HttpServlet { * send OK (Ride) to mispclient * send OK (Ride) to public */ - private Ride handleGetLink(HttpServletRequest request, HttpServletResponse response) { - // # send OK (Ride) to mispclient + protected Ride handleGetLink(HttpServletRequest request, HttpServletResponse response) { // # send OK (Ride) to public return new Ride(); } @@ -63,7 +62,7 @@ public class BridgeServlet extends HttpServlet { * remove Ride from ReservedRides * add Ride to Deliveredrides */ - private Ride handleGetRide(HttpServletRequest request, HttpServletResponse response) { + protected Ride handleGetRide(HttpServletRequest request, HttpServletResponse response) { // # send OK (Ride)(Request) return new Ride(); } @@ -78,7 +77,7 @@ public class BridgeServlet extends HttpServlet { * remove Ride from NewRequest * add Ride to ForwardedRequest */ - private Ride handleGetRideRequest(HttpServletRequest request, HttpServletResponse response) { + protected Ride handleGetRideRequest(HttpServletRequest request, HttpServletResponse response) { // # send OK (Ride)(Request)(Data) return new Ride(); } @@ -96,7 +95,7 @@ public class BridgeServlet extends HttpServlet { * remove Ride from ForwardedData * add Ride to EOL */ - private Ride handleGetRideRequestData(HttpServletRequest request, HttpServletResponse response) { + protected Ride handleGetRideRequestData(HttpServletRequest request, HttpServletResponse response) { // # send OK (EOL) return new Ride(); } @@ -116,7 +115,8 @@ public class BridgeServlet extends HttpServlet { * handle POST (Ride) * add Ride to AvailableRides */ - private Ride handlePostRide(HttpServletRequest request, HttpServletResponse response) { + protected Ride handlePostRide(HttpServletRequest request, HttpServletResponse response) { + // # send OK (Ride) to mispclient return new Ride(); } } \ No newline at end of file diff --git a/mispmock/src/BridgeMock.java b/mispmock/src/BridgeMock.java index 9a27c0b..5786dd9 100644 --- a/mispmock/src/BridgeMock.java +++ b/mispmock/src/BridgeMock.java @@ -20,10 +20,29 @@ public class BridgeMock extends BridgeServlet { @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + + + + + + super.doPost(request,response); } + + + /** + * handle POST (Ride) + * add Ride to AvailableRides + */ + @Override + protected Ride handlePostRide(HttpServletRequest request, HttpServletResponse response) { + // WIP wait till GET (LINK) arrives. + // # send OK (Ride) to mispclient + return new Ride(); + } + } diff --git a/mispmock/src/ClientMock.java b/mispmock/src/ClientMock.java index 4bd98f5..bdd27ab 100644 --- a/mispmock/src/ClientMock.java +++ b/mispmock/src/ClientMock.java @@ -25,7 +25,7 @@ public class ClientMock extends ClientServlet { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); mockSet.bridgeMock.doPost(request,response); - + // END return super.sendPostRide(ride); }