From 0f8a549495fb83608ec7233fe464de93fc7b9bc3 Mon Sep 17 00:00:00 2001 From: JFronny Date: Sat, 20 Apr 2024 15:19:49 +0200 Subject: [PATCH] fix(serialize-json): port comment post processing from xml to remove empty comments --- .../gitlab/jfronny/commons/serialize/json/JsonWriter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonWriter.java b/commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonWriter.java index db44b56..32496c0 100644 --- a/commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonWriter.java +++ b/commons-serialize-json/src/main/java/io/gitlab/jfronny/commons/serialize/json/JsonWriter.java @@ -183,9 +183,11 @@ public class JsonWriter extends SerializeWriter impleme if (!deferredComments.isEmpty()) { if (newline.isEmpty()) { out.append("/* ") - .append(String.join(" / ", deferredComments) - .replace("*/", "#/")) - .append(" */"); + .append(String.join(" / ", deferredComments.stream() + .filter(s -> s != null && !s.isBlank()) + .map(s -> s.replace("/*", "#/")) + .toList()) + ).append(" */"); } else { boolean first = true; for (String s : deferredComments) {