From 7e137ef10c32071de0424ed7301e39eed10f3ea0 Mon Sep 17 00:00:00 2001 From: Ivan Olexyn Date: Sun, 19 Apr 2020 16:14:46 +0200 Subject: [PATCH] + dummy (core) pkg. --- mispbridge/src/{ => core}/BridgeServlet.java | 2 ++ mispclient/src/{ => core}/ClientServlet.java | 2 +- misphelper/src/{ => core}/ConnectionHelper.java | 2 ++ misphelper/src/{ => core}/Ride.java | 2 ++ misphelper/src/{ => core}/RideMapHelper.java | 7 +++++-- misphelper/src/{ => core}/State.java | 2 ++ mispmock/src/{ => actor}/ActorRunnable.java | 7 +++++-- mispmock/src/{ => actor}/AppMock.java | 4 ++++ mispmock/src/{ => actor}/UserMock.java | 4 ++++ mispmock/src/{ => core}/BridgeMock.java | 4 +++- mispmock/src/{ => core}/BridgeRunnable.java | 2 ++ mispmock/src/{ => core}/ClientMock.java | 8 +++++--- mispmock/src/{ => core}/ClientRunnable.java | 2 ++ mispmock/src/{ => core}/Main.java | 8 ++++++++ mispmock/src/{ => core}/MockSet.java | 7 +++++++ 15 files changed, 54 insertions(+), 9 deletions(-) rename mispbridge/src/{ => core}/BridgeServlet.java (99%) rename mispclient/src/{ => core}/ClientServlet.java (99%) rename misphelper/src/{ => core}/ConnectionHelper.java (98%) rename misphelper/src/{ => core}/Ride.java (99%) rename misphelper/src/{ => core}/RideMapHelper.java (94%) rename misphelper/src/{ => core}/State.java (77%) rename mispmock/src/{ => actor}/ActorRunnable.java (92%) rename mispmock/src/{ => actor}/AppMock.java (89%) rename mispmock/src/{ => actor}/UserMock.java (92%) rename mispmock/src/{ => core}/BridgeMock.java (98%) rename mispmock/src/{ => core}/BridgeRunnable.java (88%) rename mispmock/src/{ => core}/ClientMock.java (95%) rename mispmock/src/{ => core}/ClientRunnable.java (89%) rename mispmock/src/{ => core}/Main.java (83%) rename mispmock/src/{ => core}/MockSet.java (52%) diff --git a/mispbridge/src/BridgeServlet.java b/mispbridge/src/core/BridgeServlet.java similarity index 99% rename from mispbridge/src/BridgeServlet.java rename to mispbridge/src/core/BridgeServlet.java index 2875a52..e432e27 100644 --- a/mispbridge/src/BridgeServlet.java +++ b/mispbridge/src/core/BridgeServlet.java @@ -1,3 +1,5 @@ +package core; + import org.apache.commons.io.IOUtils; import javax.servlet.ServletException; diff --git a/mispclient/src/ClientServlet.java b/mispclient/src/core/ClientServlet.java similarity index 99% rename from mispclient/src/ClientServlet.java rename to mispclient/src/core/ClientServlet.java index b37c336..9d8c71b 100644 --- a/mispclient/src/ClientServlet.java +++ b/mispclient/src/core/ClientServlet.java @@ -1,4 +1,4 @@ - +package core; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/misphelper/src/ConnectionHelper.java b/misphelper/src/core/ConnectionHelper.java similarity index 98% rename from misphelper/src/ConnectionHelper.java rename to misphelper/src/core/ConnectionHelper.java index 66159ff..11013a3 100644 --- a/misphelper/src/ConnectionHelper.java +++ b/misphelper/src/core/ConnectionHelper.java @@ -1,3 +1,5 @@ +package core; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/misphelper/src/Ride.java b/misphelper/src/core/Ride.java similarity index 99% rename from misphelper/src/Ride.java rename to misphelper/src/core/Ride.java index 4b7bb45..4d87ad2 100644 --- a/misphelper/src/Ride.java +++ b/misphelper/src/core/Ride.java @@ -1,3 +1,5 @@ +package core; + import java.util.Objects; public class Ride { diff --git a/misphelper/src/RideMapHelper.java b/misphelper/src/core/RideMapHelper.java similarity index 94% rename from misphelper/src/RideMapHelper.java rename to misphelper/src/core/RideMapHelper.java index 8d5d142..cd31df1 100644 --- a/misphelper/src/RideMapHelper.java +++ b/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 rideMap; + public Map rideMap; RideMapHelper(Map rideMap){ diff --git a/misphelper/src/State.java b/misphelper/src/core/State.java similarity index 77% rename from misphelper/src/State.java rename to misphelper/src/core/State.java index 5a49087..5dd1ad7 100644 --- a/misphelper/src/State.java +++ b/misphelper/src/core/State.java @@ -1,3 +1,5 @@ +package core; + public enum State { AVAILABLE, BOOKED, LOADED } diff --git a/mispmock/src/ActorRunnable.java b/mispmock/src/actor/ActorRunnable.java similarity index 92% rename from mispmock/src/ActorRunnable.java rename to mispmock/src/actor/ActorRunnable.java index 4b28c1e..b914989 100644 --- a/mispmock/src/ActorRunnable.java +++ b/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 responses = new ArrayList<>(); + List exchanges = new ArrayList<>(); List requests = new ArrayList<>(); protected MockSet mockSet; diff --git a/mispmock/src/AppMock.java b/mispmock/src/actor/AppMock.java similarity index 89% rename from mispmock/src/AppMock.java rename to mispmock/src/actor/AppMock.java index e94d5aa..a09e311 100644 --- a/mispmock/src/AppMock.java +++ b/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){ diff --git a/mispmock/src/UserMock.java b/mispmock/src/actor/UserMock.java similarity index 92% rename from mispmock/src/UserMock.java rename to mispmock/src/actor/UserMock.java index b0ff300..c1252cc 100644 --- a/mispmock/src/UserMock.java +++ b/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 { diff --git a/mispmock/src/BridgeMock.java b/mispmock/src/core/BridgeMock.java similarity index 98% rename from mispmock/src/BridgeMock.java rename to mispmock/src/core/BridgeMock.java index 3bd5d46..a7b22f2 100644 --- a/mispmock/src/BridgeMock.java +++ b/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(); diff --git a/mispmock/src/BridgeRunnable.java b/mispmock/src/core/BridgeRunnable.java similarity index 88% rename from mispmock/src/BridgeRunnable.java rename to mispmock/src/core/BridgeRunnable.java index ff56645..630f13b 100644 --- a/mispmock/src/BridgeRunnable.java +++ b/mispmock/src/core/BridgeRunnable.java @@ -1,4 +1,6 @@ +package core; +import core.BridgeMock; /** * Pass the MockSet. diff --git a/mispmock/src/ClientMock.java b/mispmock/src/core/ClientMock.java similarity index 95% rename from mispmock/src/ClientMock.java rename to mispmock/src/core/ClientMock.java index 9538f7b..0e27490 100644 --- a/mispmock/src/ClientMock.java +++ b/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); diff --git a/mispmock/src/ClientRunnable.java b/mispmock/src/core/ClientRunnable.java similarity index 89% rename from mispmock/src/ClientRunnable.java rename to mispmock/src/core/ClientRunnable.java index 8159af7..56c7446 100644 --- a/mispmock/src/ClientRunnable.java +++ b/mispmock/src/core/ClientRunnable.java @@ -1,4 +1,6 @@ +package core; +import core.ClientMock; /** * Pass the MockSet. diff --git a/mispmock/src/Main.java b/mispmock/src/core/Main.java similarity index 83% rename from mispmock/src/Main.java rename to mispmock/src/core/Main.java index 5343dff..295e7e8 100644 --- a/mispmock/src/Main.java +++ b/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 { diff --git a/mispmock/src/MockSet.java b/mispmock/src/core/MockSet.java similarity index 52% rename from mispmock/src/MockSet.java rename to mispmock/src/core/MockSet.java index bf38ad1..a28f431 100644 --- a/mispmock/src/MockSet.java +++ b/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;