From e9355280bc0ed656d890f786526c3f743b9e68a3 Mon Sep 17 00:00:00 2001
From: Ivan Olexyn <ivan@olexyn.com>
Date: Sun, 19 Apr 2020 17:11:24 +0200
Subject: [PATCH] + use org.json.

---
 misphelper/src/core/Ride.java     | 59 +++++++++++++++----------------
 mispmock/src/core/BridgeMock.java |  4 ++-
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/misphelper/src/core/Ride.java b/misphelper/src/core/Ride.java
index 4d87ad2..a15f85d 100644
--- a/misphelper/src/core/Ride.java
+++ b/misphelper/src/core/Ride.java
@@ -1,5 +1,8 @@
 package core;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.Objects;
 
 public class Ride {
@@ -20,13 +23,21 @@ public class Ride {
         id = count++;
     }
 
-    public Ride(String json) {
-        json = json.replace("{", "").replace("}", "");
-        String[] split = json.split(",");
-        String idString = unbrace(split[0].split(":")[1]);
-        id = Long.parseLong(idString);
-        request = unbrace(split[1].split(":")[1]);
-        data = unbrace(split[2].split(":")[1]);
+    public Ride(String jsonString) {
+        JSONObject obj = new JSONObject(jsonString);
+        id = obj.getLong("id");
+        try{
+            request = obj.getString("request");
+        } catch (JSONException e){
+            request = null;
+        }
+        try{
+            data = obj.getString("data");
+        }catch (JSONException e){
+            data = null;
+        }
+
+
     }
 
 
@@ -39,7 +50,10 @@ public class Ride {
     }
 
 
-    public Ride setState(State state){ this.state = state; return this;}
+    public Ride setState(State state) {
+        this.state = state;
+        return this;
+    }
 
     public String getRequest() {
         return this.request;
@@ -53,33 +67,20 @@ public class Ride {
         return this.id;
     }
 
-    public State getState(){return this.state;}
+    public State getState() {return this.state;}
 
     private String brace(String foo) {
         return "\"" + foo + "\"";
     }
 
-    private String unbrace(String foo){ return foo.replace("\"","");    }
+    private String unbrace(String foo) { return foo.replace("\"", ""); }
 
     public String json() {
-        String[] keys = {"rideID",
-                         "request",
-                         "data"};
-        String[] values = {"" + id,
-                           request,
-                           data};
-        StringBuilder sb = new StringBuilder();
-        sb.append("{");
-        for (int i = 0; i < keys.length; i++) {
-            sb.append(brace(keys[i]));
-            sb.append(":");
-            sb.append(brace(values[i]));
-            if (i + 1 < keys.length) {
-                sb.append(",");
-            }
-        }
-        sb.append("}");
-        return sb.toString();
+        JSONObject obj = new JSONObject();
+        obj.put("id", id);
+        obj.put("request", request);
+        obj.put("data",data);
+        return obj.toString();
     }
 
 
@@ -97,8 +98,6 @@ public class Ride {
     }
 
 
-
-
 }
 
 
diff --git a/mispmock/src/core/BridgeMock.java b/mispmock/src/core/BridgeMock.java
index a7b22f2..dd0c5f6 100644
--- a/mispmock/src/core/BridgeMock.java
+++ b/mispmock/src/core/BridgeMock.java
@@ -3,6 +3,7 @@ package core;
 import exchange.ExchangeMock;
 import exchange.RequestMock;
 import org.apache.commons.io.IOUtils;
+import org.json.JSONObject;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 import javax.servlet.ServletException;
@@ -47,7 +48,8 @@ public class BridgeMock extends BridgeServlet {
 
         synchronized (exchange) {
             String parsedRequest = IOUtils.toString(request.getReader());
-
+            JSONObject obj = new JSONObject(parsedRequest) ;
+            parsedRequest = obj.getString("request");