improved json display and validation

cip4 · Oct 11, 2024 · 7fcc159 · 7fcc159
1 parent de48c2b
commit 7fcc159
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/src/main/java/org/cip4/tools/jdfeditor/EditorDocument.java b/src/main/java/org/cip4/tools/jdfeditor/EditorDocument.java
@@ -770,20 +770,28 @@ String getJSONString(final KElement root, final int indent)
 		final List<JSONObject> l = jw.splitConvert(root);
 		for (final JSONObject o : l)
 		{
-			final JSONIndentWalker iw = new JSONIndentWalker(new JSONObjHelper(o));
-			iw.setSingleIndent(indent);
-			iw.setSorted(true);
-			final ByteArrayIOStream ios = new ByteArrayIOStream();
-			try
+			if (indent > 0)
 			{
-				iw.writeStream(ios);
+				final JSONIndentWalker iw = new JSONIndentWalker(new JSONObjHelper(o));
+				iw.setSingleIndent(indent);
+				iw.setSorted(true);
+				iw.setRetainNull(true);
+				final ByteArrayIOStream ios = new ByteArrayIOStream();
+				try
+				{
+					iw.writeStream(ios);
+				}
+				catch (final IOException e)
+				{
+					continue;
+				}
+				final String s = new String(ios.toByteArray());
+				return s.trim();
 			}
-			catch (final IOException e)
+			else
 			{
-				continue;
+				return o.toJSONString();
 			}
-			final String s = new String(ios.toByteArray());
-			return s;
 		}
 		return null;
 	}