Format request/response JSON

opengeospatial · Dec 7, 2023 · 684cf27 · 684cf27
1 parent 0f014f2
commit 684cf27
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonFixture.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonFixture.java
@@ -505,10 +505,13 @@ public void addAttributesOnTestFailure(ITestResult result) {
             } else if(rspEntity instanceof String) {
                 response = response.append((String)rspEntity);
             }
+            String responseString = JsonUtils.prettifyString(response.toString());
             if (response.length() > MAX_RSP_ATTR_LENGTH) {
+                response = new StringBuilder();
+                response.append(responseString);
                 response.delete(MAX_RSP_ATTR_LENGTH, response.length());
             }
-            result.setAttribute(RSP_ATTR, response.toString());
+            result.setAttribute(RSP_ATTR, responseString);
         }
     }
 

diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/JsonUtils.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/JsonUtils.java
@@ -22,6 +22,8 @@
 
 import org.apache.commons.io.IOUtils;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.restassured.path.json.JsonPath;
 import io.restassured.response.Response;
 import io.restassured.specification.RequestSpecification;
@@ -31,6 +33,8 @@
  */
 public class JsonUtils {
 
+    private static ObjectMapper objectMapper;
+
     private JsonUtils() {
     }
 
@@ -346,7 +350,26 @@ public static String inputStreamToString(InputStream inputStream) throws IOExcep
         StringWriter writer = new StringWriter();
         String encoding = StandardCharsets.UTF_8.name();
         IOUtils.copy(inputStream, writer, encoding);
-        return writer.toString();
+        return prettifyString(writer.toString());
+    }
+
+    public static String prettifyString(String string) {
+        ObjectMapper objectMapper = getObjectMapper();
+        try {
+            Object jsonObject = objectMapper.readValue(string, Object.class);
+            String prettyJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObject);
+            return prettyJson;
+        } catch (Exception e) {
+            //String was not JSON
+            return string;
+        }
+    }
+
+    private static ObjectMapper getObjectMapper() {
+        if(objectMapper == null) {
+            objectMapper = new ObjectMapper();
+        }
+        return objectMapper;
     }
 
     private static boolean isSameMediaType( String mediaType1, String mediaType2 ) {