BODY # rawBody

authorjapps · Dec 20, 2017 · 0037523 · 0037523
1 parent 33cb0d2
commit 0037523
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/main/java/org/jsmart/simulator/deserializers/ApiSpecDeserializer.java b/src/main/java/org/jsmart/simulator/deserializers/ApiSpecDeserializer.java
@@ -45,11 +45,11 @@ public ApiSpec deserialize(final JsonParser jp, final DeserializationContext ctx
             final JsonNode jsonBodyNode = apiNode.get("response").get("body");
             String responseBody = jsonBodyNode != null? jsonBodyNode.toString() : null;
 
-            final JsonNode stringBodyNode = apiNode.get("response").get("stringBody");
+            final JsonNode rawBodyNode = apiNode.get("response").get("rawBody");
             // ------------------------------------------------------------
             // Do not read as JSONNode and then toString etc. Not the same
             // ------------------------------------------------------------
-            String stringBody = stringBodyNode != null? stringBodyNode.asText() : null;
+            String rawBody = rawBodyNode != null? rawBodyNode.asText() : null;
 
             final JsonNode xmlBodyNode = apiNode.get("response").get("xmlBody");
             String xmlBody = xmlBodyNode != null ? xmlBodyNode.asText() : null; //TODO- Think how to handle for SOAP xml response
@@ -58,7 +58,7 @@ public ApiSpec deserialize(final JsonParser jp, final DeserializationContext ctx
             String responseHeaders = (null != jsonHeaderNode) ? jsonHeaderNode.toString() : "";
 
             Api api = new Api(apiName, operation, url, body, ignoreBody, headers,
-                            new RestResponse(responseHeaders, responseStatus, responseBody, stringBody,  xmlBody));
+                            new RestResponse(responseHeaders, responseStatus, responseBody, rawBody,  xmlBody));
             apis.add(api);
         }
 

diff --git a/src/main/java/org/jsmart/simulator/domain/RestResponse.java b/src/main/java/org/jsmart/simulator/domain/RestResponse.java
@@ -7,14 +7,14 @@ public class RestResponse {
     private final String headers;
     private final int status;
     private final String body; //JSON body
-    private final String stringBody; //non-json body
+    private final String rawBody; //non-json body
     private final String xmlBody; //TODO- For SOAP responses
 
-    public RestResponse(String headers, int status, String body, String stringBody, String xmlBody) {
+    public RestResponse(String headers, int status, String body, String rawBody, String xmlBody) {
         this.headers = headers;
         this.status = status;
         this.body = body;
-        this.stringBody = stringBody;
+        this.rawBody = rawBody;
         this.xmlBody = xmlBody;
     }
 
@@ -30,8 +30,8 @@ public String getBody() {
         return body;
     }
 
-    public String getStringBody() {
-        return stringBody;
+    public String getrawBody() {
+        return rawBody;
     }
 
     public String getXmlBody() {
@@ -44,7 +44,7 @@ public String toString() {
                "headers='" + headers + '\'' +
                ", status=" + status +
                ", body='" + body + '\'' +
-               ", stringBody='" + stringBody + '\'' +
+               ", rawBody='" + rawBody + '\'' +
                ", xmlBody='" + xmlBody + '\'' +
                '}';
     }

diff --git a/src/main/java/org/jsmart/simulator/impl/JsonBasedSimulator.java b/src/main/java/org/jsmart/simulator/impl/JsonBasedSimulator.java
@@ -180,8 +180,8 @@ private void matchRequestHeaders(CharSequence headerCharSequence, String apiHead
     }
 
     private String responseBodyFromInputJson(RestResponse response) {
-        if (!StringUtils.isEmpty(response.getStringBody())) {
-            return response.getStringBody();
+        if (!StringUtils.isEmpty(response.getrawBody())) {
+            return response.getrawBody();
 
         } else if (!StringUtils.isEmpty(response.getXmlBody())) {
             return response.getXmlBody();

diff --git a/src/main/resources/simulators/customers-simulator.json b/src/main/resources/simulators/customers-simulator.json
@@ -53,7 +53,7 @@
       "url": "/nonjson/1",
       "response": {
         "status": 200,
-        "stringBody": "non-json-123{}"
+        "rawBody": "non-json-123{}"
       }
     },
     {

diff --git a/src/test/java/org/jsmart/simulator/JsonBasedSimulatorTest.java b/src/test/java/org/jsmart/simulator/JsonBasedSimulatorTest.java
@@ -567,7 +567,7 @@ public void willRespondToPOSTAndIgnoreTheRequestBodyAsTrue() throws ClientProtoc
     }
 
     @Test
-    public void willRespondToGet_nonJsonStringBody() throws IOException, SAXException {
+    public void willRespondToGet_nonJsonrawBody() throws IOException, SAXException {
         String endpoint = "/nonjsontest";
         Boolean ignoreBody = true;
         Api api = new Api(
@@ -600,7 +600,7 @@ public void willRespondToGet_nonJsonStringBody() throws IOException, SAXExceptio
     }
 
     @Test
-    public void willRespondWith_nonJsonSTringBody() throws  Exception {
+    public void willRespondWith_nonJsonrawBody() throws  Exception {
         String url = String.format("http://localhost:%d/nonjson/1", simulator.getPort());
 
         HttpClient client = new DefaultHttpClient();

diff --git a/src/test/java/org/jsmart/simulator/deserializers/ApiSpecDeserializerTest.java b/src/test/java/org/jsmart/simulator/deserializers/ApiSpecDeserializerTest.java
@@ -183,7 +183,7 @@ public final void willDeserializeAndReadResponseJsonUsingJsonPath() throws  Exce
     }
 
     @Test
-    public final void willDeserializeNonJsonResponse_StringBody() throws  Exception {
+    public final void willDeserializeNonJsonResponse_rawBody() throws  Exception {
         final String json = "{\n"
                             + "          \"name\": \"Micro-Service-Function-Simulator\",\n"
                             + "          \"apis\": [{\n"
@@ -193,7 +193,7 @@ public final void willDeserializeNonJsonResponse_StringBody() throws  Exception
                             + "            \"response\": {\n"
                             + "              \"header\": {},\n"
                             + "              \"status\": 200,\n"
-                            + "              \"stringBody\": \"non-json{}\"\n"
+                            + "              \"rawBody\": \"non-json{}\"\n"
                             + "            }\n"
                             + "          }]\n"
                             + "        }";
@@ -205,7 +205,7 @@ public final void willDeserializeNonJsonResponse_StringBody() throws  Exception
 
         final ApiSpec readValue = mapper.readValue(json, ApiSpec.class);
 
-        assertThat(readValue.getApis().get(0).getResponse().getStringBody(), is("non-json{}"));
+        assertThat(readValue.getApis().get(0).getResponse().getrawBody(), is("non-json{}"));
     }
 
     @Test