+ dummy (core) pkg.

mispbridge/src/core/BridgeServlet.java

@@ -1,3 +1,5 @@
+package core;
+
 import org.apache.commons.io.IOUtils;
 
 import javax.servlet.ServletException;

mispclient/src/core/ClientServlet.java

@@ -1,4 +1,4 @@
-
+package core;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;

misphelper/src/core/ConnectionHelper.java

@@ -1,3 +1,5 @@
+package core;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

misphelper/src/core/Ride.java

@@ -1,3 +1,5 @@
+package core;
+
 import java.util.Objects;
 
 public class Ride {

misphelper/src/core/RideMapHelper.java

@@ -1,9 +1,12 @@
-import java.util.List;
+package core;
+
+import core.Ride;
+
 import java.util.Map;
 
 public class RideMapHelper {
 
-    public Map<Long,Ride> rideMap;
+    public Map<Long, Ride> rideMap;
 
 
     RideMapHelper(Map<Long,Ride> rideMap){

misphelper/src/core/State.java

@@ -1,3 +1,5 @@
+package core;
+
 public enum State {
     AVAILABLE, BOOKED, LOADED
 }

mispmock/src/actor/ActorRunnable.java

@@ -1,4 +1,4 @@
-
+package actor;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -7,6 +7,9 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import core.MockSet;
+import exchange.ExchangeMock;
+
 /**
  * Generic Runnable.
  * Serves as basis for Actors that are not Servlets.
@@ -14,7 +17,7 @@ import java.util.List;
 public abstract class ActorRunnable implements Runnable {
 
 
-    List<HttpServletResponse> responses = new ArrayList<>();
+    List<ExchangeMock> exchanges = new ArrayList<>();
     List<HttpServletRequest> requests = new ArrayList<>();
 
     protected MockSet mockSet;

mispmock/src/actor/AppMock.java

@@ -1,9 +1,13 @@
+package actor;
 
+import actor.ActorRunnable;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
+import core.MockSet;
+
 public class AppMock extends ActorRunnable {
 
     public AppMock(MockSet mockSet){

mispmock/src/actor/UserMock.java

@@ -1,7 +1,11 @@
+package actor;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
+import core.MockSet;
+
 public class UserMock extends ActorRunnable {
 
 

mispmock/src/core/BridgeMock.java

@@ -1,3 +1,5 @@
+package core;
+
 import exchange.ExchangeMock;
 import exchange.RequestMock;
 import org.apache.commons.io.IOUtils;
@@ -154,7 +156,7 @@ public class BridgeMock extends BridgeServlet {
             synchronized (ride) {
                 rideMap.put(ride.getID(), ride.setState(State.AVAILABLE));
 
-                while (ride.getState()==State.AVAILABLE) {
+                while (ride.getState() == State.AVAILABLE) {
                     ride.notify();
                     Thread.sleep(100);
                     ride.wait();

mispmock/src/core/BridgeRunnable.java

@@ -1,4 +1,6 @@
+package core;
 
+import core.BridgeMock;
 
 /**
  * Pass the MockSet.

mispmock/src/core/ClientMock.java

@@ -1,3 +1,5 @@
+package core;
+
 import exchange.ExchangeMock;
 
 import javax.servlet.ServletException;
@@ -8,7 +10,7 @@ import java.net.HttpURLConnection;
 /**
  * Wraps a ClientServlet so it can be debugged easily, i.e. without running Tomcat.
  */
-public class ClientMock extends ClientServlet  {
+public class ClientMock extends ClientServlet {
 
     private MockSet mockSet;
 
@@ -55,7 +57,7 @@ public class ClientMock extends ClientServlet  {
     @Override
     void sendGetRequest(Ride ride) throws IOException {
 
-        HttpURLConnection connection = ConnectionHelper.make("GET", APP_URL);
+        HttpURLConnection connection = ConnectionHelper.make("GET", ClientServlet.APP_URL);
 
         // send GET (Request)
         connection.setDoOutput(true);
@@ -88,7 +90,7 @@ public class ClientMock extends ClientServlet  {
     @Override
     void sendGetRideRequestData(Ride ride) throws IOException {
 
-        HttpURLConnection connection = ConnectionHelper.make("GET", MISP_BRIDGE_URL);
+        HttpURLConnection connection = ConnectionHelper.make("GET", ClientServlet.MISP_BRIDGE_URL);
 
         // send GET (Ride)(Request)(Data)
         connection.setDoOutput(true);

mispmock/src/core/ClientRunnable.java

@@ -1,4 +1,6 @@
+package core;
 
+import core.ClientMock;
 
 /**
  * Pass the MockSet.

mispmock/src/core/Main.java

@@ -1,3 +1,11 @@
+package core;
+
+import actor.AppMock;
+import actor.UserMock;
+import core.BridgeRunnable;
+import core.ClientRunnable;
+import core.MockSet;
+
 public class Main {
 
 

mispmock/src/core/MockSet.java

@@ -1,3 +1,10 @@
+package core;
+
+import actor.AppMock;
+import actor.UserMock;
+import core.BridgeMock;
+import core.ClientMock;
+
 public class MockSet {
     UserMock userMock;
     BridgeMock bridgeMock;