Improve JSON for HTTP headers with a single value

phax · Nov 13, 2024 · 546fca8 · 546fca8
1 parent 9cab722
commit 546fca8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/phase4-lib/src/main/java/com/helger/phase4/incoming/AS4IncomingHelper.java b/phase4-lib/src/main/java/com/helger/phase4/incoming/AS4IncomingHelper.java
@@ -20,6 +20,7 @@
 import javax.annotation.concurrent.Immutable;
 
 import com.helger.commons.annotation.Nonempty;
+import com.helger.commons.collection.impl.ICommonsList;
 import com.helger.commons.datetime.PDTWebDateHelper;
 import com.helger.commons.string.StringHelper;
 import com.helger.json.IJsonArray;
@@ -89,8 +90,13 @@ public static IJsonObject getIncomingMetadataAsJson (@Nonnull final IAS4Incoming
       final IJsonArray aArray = new JsonArray ();
       for (final var aHeader : aMessageMetadata.getAllHttpHeaders ())
       {
+        final ICommonsList <String> aHeaderValues = aHeader.getValue ();
+
         final IJsonObject aObj = new JsonObject ();
-        aObj.add (aHeader.getKey (), new JsonArray ().addAll (aHeader.getValue ()));
+        if (aHeaderValues.size () != 1)
+          aObj.add (aHeader.getKey (), new JsonArray ().addAll (aHeaderValues));
+        else
+          aObj.add (aHeader.getKey (), aHeaderValues.getFirstOrNull ());
         aArray.add (aObj);
       }
       if (aArray.isNotEmpty ())