Fixed JSON formatting by adding the new "prettyPrint" format setting

lvca · lvca · commit 1fb45af083d6 · 2013-08-12T18:15:47.000+02:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/fetch/OFetchHelper.java b/core/src/main/java/com/orientechnologies/orient/core/fetch/OFetchHelper.java
@@ -345,7 +345,8 @@ private static void processRecord(final ORecordSchemaAware<?> record, final Obje
         // EMBEDDED, GO DEEPER
         fetch = true;
 
-      if (iFormat.contains("shallow") || fieldValue == null
+      if (iFormat.contains("shallow")
+          || fieldValue == null
           || (!fetch && fieldValue instanceof OIdentifiable)
           || !(fieldValue instanceof OIdentifiable)
           && (!(fieldValue instanceof ORecordLazyMultiValue) || !((ORecordLazyMultiValue) fieldValue).rawIterator().hasNext() || !(((ORecordLazyMultiValue) fieldValue)
diff --git a/core/src/main/java/com/orientechnologies/orient/core/fetch/json/OJSONFetchContext.java b/core/src/main/java/com/orientechnologies/orient/core/fetch/json/OJSONFetchContext.java
@@ -84,7 +84,6 @@ public void onAfterArray(final ORecordSchemaAware<?> iRootRecord, final String i
 
   public void onBeforeCollection(final ORecordSchemaAware<?> iRootRecord, final String iFieldName, final Object iUserObject,
       final Collection<?> iCollection) {
-    settings.indentLevel++;
     try {
       manageTypes(iFieldName, iCollection);
       jsonWriter.beginCollection(settings.indentLevel, true, iFieldName);
@@ -101,7 +100,6 @@ public void onAfterCollection(final ORecordSchemaAware<?> iRootRecord, final Str
     } catch (IOException e) {
       throw new OFetchException("Error writing collection field " + iFieldName + " of record " + iRootRecord.getIdentity(), e);
     }
-    settings.indentLevel--;
   }
 
   public void onBeforeMap(final ORecordSchemaAware<?> iRootRecord, final String iFieldName, final Object iUserObject) {
@@ -178,9 +176,6 @@ private void appendType(final StringBuilder iBuffer, final String iFieldName, fi
   public void writeSignature(final OJSONWriter json, final ORecordInternal<?> record) throws IOException {
     boolean firstAttribute = true;
 
-    if (settings.indentLevel > -1)
-      settings.indentLevel++;
-
     if (settings.includeType) {
       json.writeAttribute(firstAttribute ? settings.indentLevel : 0, firstAttribute, ODocumentHelper.ATTRIBUTE_TYPE, ""
           + (char) record.getRecordType());
diff --git a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/OJSONWriter.java b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/OJSONWriter.java
@@ -51,6 +51,8 @@ public OJSONWriter(final Writer out) {
   public OJSONWriter(final Writer out, final String iJsonFormat) {
     this.out = out;
     this.format = iJsonFormat;
+    if (iJsonFormat.contains("prettyPrint"))
+      prettyPrint = true;
   }
 
   public OJSONWriter beginObject() throws IOException {
diff --git a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerJSON.java b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerJSON.java
@@ -77,9 +77,10 @@ public class FormatSettings {
     public boolean attribSameRow;
     public boolean alwaysFetchEmbeddedDocuments;
     public int     indentLevel;
-    public String  fetchPlan  = null;
+    public String  fetchPlan   = null;
     public boolean keepTypes;
-    public boolean dateAsLong = false;
+    public boolean dateAsLong  = false;
+    public boolean prettyPrint = false;
 
     public FormatSettings(final String iFormat) {
       if (iFormat == null) {
@@ -88,7 +89,7 @@ public FormatSettings(final String iFormat) {
         includeId = true;
         includeClazz = true;
         attribSameRow = true;
-        indentLevel = 0;
+        indentLevel = 1;
         fetchPlan = "";
         keepTypes = true;
         alwaysFetchEmbeddedDocuments = true;
@@ -99,7 +100,7 @@ public FormatSettings(final String iFormat) {
         includeClazz = false;
         attribSameRow = false;
         alwaysFetchEmbeddedDocuments = false;
-        indentLevel = 0;
+        indentLevel = 1;
         keepTypes = true;
 
         final String[] format = iFormat.split(",");
@@ -124,6 +125,8 @@ else if (f.startsWith("alwaysFetchEmbedded"))
             alwaysFetchEmbeddedDocuments = true;
           else if (f.startsWith("dateAsLong"))
             dateAsLong = true;
+          else if (f.startsWith("prettyPrint"))
+            prettyPrint = true;
       }
     }
   }
@@ -569,7 +572,7 @@ public StringBuilder toString(final ORecordInternal<?> iRecord, final StringBuil
       final OJSONWriter json = new OJSONWriter(buffer, iFormat);
       final FormatSettings settings = new FormatSettings(iFormat);
 
-      json.beginObject(settings.indentLevel);
+      json.beginObject();
       OJSONFetchContext context = new OJSONFetchContext(json, settings);
       context.writeSignature(json, iRecord);
 
@@ -592,7 +595,7 @@ public StringBuilder toString(final ORecordInternal<?> iRecord, final StringBuil
         throw new OSerializationException("Error on marshalling record of type '" + iRecord.getClass()
             + "' to JSON. The record type cannot be exported to JSON");
 
-      json.endObject(settings.indentLevel);
+      json.endObject(0, true);
 
       iOutput.append(buffer);
       return iOutput;

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ public OJSONWriter(final Writer out) {`
`51`	`51`	`public OJSONWriter(final Writer out, final String iJsonFormat) {`
`52`	`52`	`this.out = out;`
`53`	`53`	`this.format = iJsonFormat;`
	`54`	`+ if (iJsonFormat.contains("prettyPrint"))`
	`55`	`+ prettyPrint = true;`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`public OJSONWriter beginObject() throws IOException {`