public
/
misp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- split code.

Browse Source
pull/1/head
Ivan Olexyn 5 years ago
parent 5e647c4408
commit 35d8d8d7d5
2 changed files with 99 additions and 56 deletions
Show Stats Download Patch File Download Diff File

84
mispclient/src/ClientServlet.java
Unescape View File

@ -15,32 +15,32 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public final class ClientServlet extends HttpServlet { public class ClientServlet extends HttpServlet {
private static final String MISP_BRIDGE_URL = "http://localhost:9090/mispbridge/core"; private static final String MISP_BRIDGE_URL = "http://localhost:9090/mispbridge/core";
private List<Ride> availableRides = new ArrayList<>(); public List<Ride> availableRides = new ArrayList<>();
private List<Ride> reservedRides = new ArrayList<>(); public List<Ride> reservedRides = new ArrayList<>();
private List<Ride> newRequests = new ArrayList<>(); private List<Ride> newRequests = new ArrayList<>();
private List<Ride> forwardedRequests = new ArrayList<>(); private List<Ride> forwardedRequests = new ArrayList<>();
private List<Ride> newData = new ArrayList<>(); private List<Ride> newData = new ArrayList<>();
private List<Ride> forwardedData = new ArrayList<>(); private List<Ride> forwardedData = new ArrayList<>();
public ClientServlet() { public ClientServlet() {
new DoClientThings().start(this);
}
// Thread 1
// get ride count from mispbridge
// while ride count < max
// add POST (Ride) to AvailableRides
// send POST (Ride)
// Thread 2
// for Rides in ReservedRides,
// send GET (Ride)
}
// handle OK (Ride) // handle OK (Ride)
// remove Ride from AvailableRides // remove Ride from AvailableRides
@ -73,47 +73,22 @@ public final class ClientServlet extends HttpServlet {
// # send GET (Ride)(Data) // # send GET (Ride)(Data)
@Override
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
response.setContentType("text/html"); response.setContentType("text/html");
PrintWriter writer = response.getWriter(); PrintWriter writer = response.getWriter();
writer.println("<html>"); writer.println("<html><head><title>MispClient</title></head><body bgcolor=white>");
writer.println("<head>"); writer.println("</body></html>");
writer.println("<title>MispClient</title>");
writer.println("</head>");
writer.println("<body bgcolor=white>");
writer.println("<table border=\"0\">");
writer.println("<tr>");
writer.println("<td>");
writer.println("<img src=\"images/tomcat.gif\">");
writer.println("</td>");
writer.println("<td>");
writer.println("<h1>Sample Application Servlet</h1>");
writer.println("This is the output of a servlet that is part of");
writer.println("the Hello, World application.");
writer.println("</td>");
writer.println("</tr>");
writer.println(make2ColumnRow("foo", "bar"));
writer.println("</table>");
writer.println("</body>");
writer.println("</html>");
} }
@Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
}
private String make2ColumnRow(String one, String two) { private String make2ColumnRow(String one, String two) {
StringBuilder sb = new StringBuilder(); String sb = "<tr>" + "<td>" + one + "</td>" + "<td>" + two + "</td>" + "</tr>";
sb.append("<tr>"); return sb;
sb.append("<td>");
sb.append(one);
sb.append("</td>");
sb.append("<td>");
sb.append(two);
sb.append("</td>");
sb.append("</tr>");
return sb.toString();
} }
@ -151,7 +126,7 @@ public final class ClientServlet extends HttpServlet {
} }
private void sendPostRide() throws IOException { Ride sendPostRide(Ride ride) throws IOException, ServletException {
URL url = new URL(MISP_BRIDGE_URL); URL url = new URL(MISP_BRIDGE_URL);
HttpURLConnection connection = (HttpURLConnection) url.openConnection(); HttpURLConnection connection = (HttpURLConnection) url.openConnection();
@ -162,7 +137,6 @@ public final class ClientServlet extends HttpServlet {
connection.setRequestProperty("Accept-Language", "en-US,en;q=0.5"); connection.setRequestProperty("Accept-Language", "en-US,en;q=0.5");
connection.setRequestProperty("Content-Type", "application/json"); connection.setRequestProperty("Content-Type", "application/json");
Ride ride = new Ride();
availableRides.add(ride); availableRides.add(ride);
@ -190,10 +164,11 @@ public final class ClientServlet extends HttpServlet {
// process // process
availableRides.remove(ride); availableRides.remove(ride);
reservedRides.add(ride); reservedRides.add(ride);
return ride;
} }
private void sendGetRide(Ride ride) throws IOException { Ride sendGetRide(Ride ride) throws IOException {
URL url = new URL(MISP_BRIDGE_URL); URL url = new URL(MISP_BRIDGE_URL);
HttpURLConnection connection = (HttpURLConnection) url.openConnection(); HttpURLConnection connection = (HttpURLConnection) url.openConnection();
@ -205,8 +180,6 @@ public final class ClientServlet extends HttpServlet {
connection.setRequestProperty("Content-Type", "application/json"); connection.setRequestProperty("Content-Type", "application/json");
// send POST // send POST
connection.setDoOutput(true); connection.setDoOutput(true);
DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream()); DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
@ -239,18 +212,16 @@ public final class ClientServlet extends HttpServlet {
newRequests.remove(rideRequest); newRequests.remove(rideRequest);
forwardedRequests.add(rideRequest); forwardedRequests.add(rideRequest);
return ride;
} }
private void sendGetRequest(String request) throws IOException { Ride sendGetRequest(String request) throws IOException {
URL url = new URL(MISP_BRIDGE_URL); URL url = new URL(MISP_BRIDGE_URL);
HttpURLConnection connection = (HttpURLConnection) url.openConnection(); HttpURLConnection connection = (HttpURLConnection) url.openConnection();
// prepare // prepare
connection.setRequestMethod("GET"); connection.setRequestMethod("GET");
connection.setRequestProperty("User-Agent", "USER_AGENT");
connection.setRequestProperty("Accept-Language", "en-US,en;q=0.5");
connection.setRequestProperty("Content-Type", "application/json"); connection.setRequestProperty("Content-Type", "application/json");
@ -285,6 +256,7 @@ public final class ClientServlet extends HttpServlet {
// TODO add checks // TODO add checks
reservedRides.remove(ride); reservedRides.remove(ride);
newRequests.add(ride); newRequests.add(ride);
return ride;
} }

71
mispclient/src/DoClientThings.java
Unescape View File

@ -0,0 +1,71 @@
import javax.servlet.ServletException;
import java.io.IOException;
public class DoClientThings {
public void start(ClientServlet clientServlet) {
// Thread 1
// while AvailableRides < 256 , add Ride to AvailableRides , send POST (Ride) [DONE]
Runnable postRideRunnable = new PostRideRunnable(clientServlet);
Thread postRideThread = new Thread(postRideRunnable);
postRideThread.start();
// Thread 2
// for Rides in ReservedRides, send GET (Ride) [DONE]
Runnable getRideRunnable = new GetRideRunnable(clientServlet);
Thread getRideThread = new Thread(getRideRunnable);
getRideThread.start();
}
/**
* While AvailableRides < 256 ,
* add Ride to AvailableRides ,
* send POST (Ride).
*/
private class PostRideRunnable implements Runnable {
ClientServlet clientServlet;
public PostRideRunnable(ClientServlet clientServlet) {
this.clientServlet = clientServlet;
}
@Override
public void run() {
while (true) {
if (clientServlet.availableRides.size() < 256) {
try {clientServlet.sendPostRide(new Ride());} catch (IOException | ServletException e) { e.printStackTrace(); }
}
try {Thread.sleep(500);} catch (InterruptedException e) { e.printStackTrace(); }
}
}
}
/**
* For Rides in ReservedRides,
* send GET (Ride).
*/
private class GetRideRunnable implements Runnable {
ClientServlet clientServlet;
public GetRideRunnable(ClientServlet clientServlet) {
this.clientServlet = clientServlet;
}
@Override
public void run() {
while (true) {
for (Ride reservedRide : clientServlet.reservedRides) {
try {clientServlet.sendGetRide(reservedRide);} catch (IOException e) { e.printStackTrace(); }
}
try {Thread.sleep(500);} catch (InterruptedException e) { e.printStackTrace(); }
}
}
}
}
Write Preview
Loading…
Cancel
Save