From 515f7054a53942e0f7be1e5637bafdacf583b814 Mon Sep 17 00:00:00 2001
From: Ivan Olexyn <ivan@olexyn.com>
Date: Tue, 21 Apr 2020 20:49:23 +0200
Subject: [PATCH] + remove (Ride)(Request) from GET(Request) to App.

---
 mispclient/src/core/ClientServlet.java | 9 ++++-----
 mispmock/src/actor/AppMock.java        | 8 ++------
 mispmock/src/core/ClientMock.java      | 7 +++----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/mispclient/src/core/ClientServlet.java b/mispclient/src/core/ClientServlet.java
index 8b155e2..de74189 100644
--- a/mispclient/src/core/ClientServlet.java
+++ b/mispclient/src/core/ClientServlet.java
@@ -83,9 +83,8 @@ public class ClientServlet extends HttpServlet {
      */
     final void sendGetRequest(Ride ride) throws IOException, ServletException, InterruptedException {
 
-        Ride parsedRide = doSendGetRequest(ride);
 
-        ride.setData(parsedRide.getData());
+        ride.setData(doSendGetRequest(ride.getRequest()));
 
         synchronized (booked) {
             booked.remove(ride.getID());
@@ -102,18 +101,18 @@ public class ClientServlet extends HttpServlet {
      * Send GET (Request) to App.
      * Parse response.
      */
-    protected Ride doSendGetRequest(Ride ride) throws IOException, InterruptedException {
+    protected String doSendGetRequest(String request) throws IOException, InterruptedException {
 
         // send GET (Ride)
         final HttpURLConnection connection = ConnectionHelper.make("GET", APP_URL);
 
         connection.setDoOutput(true);
         DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
-        outputStream.writeBytes(ride.getRequest());
+        outputStream.writeBytes(request);
         outputStream.flush();
         outputStream.close();
 
-        return ConnectionHelper.parseRide(connection);
+        return ConnectionHelper.parseString(connection);
     }
 
 
diff --git a/mispmock/src/actor/AppMock.java b/mispmock/src/actor/AppMock.java
index 2a76b3e..c8b6b2e 100644
--- a/mispmock/src/actor/AppMock.java
+++ b/mispmock/src/actor/AppMock.java
@@ -36,16 +36,12 @@ public class AppMock extends ActorRunnable {
 
         synchronized (exchange) {
             String parsedRequest = IOUtils.toString(request.getReader());
-            JSONObject obj = new JSONObject(parsedRequest);
-            parsedRequest = obj.getString("request");
-
+            
             String dataString = "DATA-" + parsedRequest.split("-")[1];
-            JSONObject dataObj = new JSONObject();
-            dataObj.put("data", dataString);
 
             exchange.response.setStatus(200);
             PrintWriter writer = exchange.response.getWriter();
-            writer.write(dataObj.toString());
+            writer.write(dataString);
             writer.flush();
             writer.close();
 
diff --git a/mispmock/src/core/ClientMock.java b/mispmock/src/core/ClientMock.java
index 0f4ea77..87e0e66 100644
--- a/mispmock/src/core/ClientMock.java
+++ b/mispmock/src/core/ClientMock.java
@@ -51,14 +51,13 @@ public class ClientMock extends ClientServlet {
      * Parse response.
      */
     @Override
-    protected Ride doSendGetRequest(Ride ride) throws IOException, InterruptedException {
+    protected String doSendGetRequest(String request) throws IOException, InterruptedException {
 
         // Mock Exchange
         final ExchangeMock exchange = new ExchangeMock();
 
         exchange.request.setMethod("GET");
-        exchange.request.setContentType("application/json");
-        exchange.request.setContent(ride.json().getBytes());
+        exchange.request.setContent(request.getBytes());
 
         synchronized (exchange) {
             // Mock GET (Request)
@@ -69,7 +68,7 @@ public class ClientMock extends ClientServlet {
             exchange.notify();
         }
 
-        return new Ride(exchange.response.getContentAsString());
+        return exchange.response.getContentAsString();
     }