From c23ecefed8ec7ca9b5a0327a08ae9006f2a7c039 Mon Sep 17 00:00:00 2001
From: Andre Kurait <akurait@amazon.com>
Date: Wed, 1 May 2024 10:45:28 -0500
Subject: [PATCH] Fill headers before body in ParsedHttpMessagesAsDicts

Signed-off-by: Andre Kurait <akurait@amazon.com>
---
 .../migrations/replay/ParsedHttpMessagesAsDicts.java           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ParsedHttpMessagesAsDicts.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ParsedHttpMessagesAsDicts.java
index f56dd83fcf..6796fa561b 100644
--- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ParsedHttpMessagesAsDicts.java
+++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/ParsedHttpMessagesAsDicts.java
@@ -107,9 +107,8 @@ private static Map<String, Object> fillMap(LinkedHashMap<String, Object> map,
         try (var encodedBufHolder = RefSafeHolder.create(Base64.encode(content, false, Base64Dialect.STANDARD))) {
             var encodedBuf = encodedBufHolder.get();
             assert encodedBuf != null : "Base64.encode should not return null";
-            String base64body = encodedBuf.toString(StandardCharsets.UTF_8);
-            map.put("body", base64body);
             headers.entries().forEach(kvp -> map.put(kvp.getKey(), kvp.getValue()));
+            map.put("body", encodedBuf.toString(StandardCharsets.UTF_8));
             return map;
         }
     }