From 0ba30c0b17a3b551d29276884f1f1e69e81c1918 Mon Sep 17 00:00:00 2001
From: RayDNoper <alar.floren@bpw-consulting.com>
Date: Fri, 22 Dec 2023 11:12:51 +0200
Subject: [PATCH] Update cookie to ordered map

---
 .../ruuter/domain/steps/ReturnStep.java           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ee/buerokratt/ruuter/domain/steps/ReturnStep.java b/src/main/java/ee/buerokratt/ruuter/domain/steps/ReturnStep.java
index c225ecb..e1453cf 100644
--- a/src/main/java/ee/buerokratt/ruuter/domain/steps/ReturnStep.java
+++ b/src/main/java/ee/buerokratt/ruuter/domain/steps/ReturnStep.java
@@ -49,16 +49,17 @@ private Map<String, String> formatHeaders(DslInstance di) {
 
     private Map.Entry<String, Object> addDefaultCookies(Map.Entry<String, Object> entry, DslInstance di) {
         if ("Set-Cookie".equals(entry.getKey())) {
-            if (!((HashMap<String, Object>) entry.getValue()).containsKey("Path"))
-                ((HashMap<String, Object>) entry.getValue()).put("Path", "/" );
+            LinkedHashMap<String, Object> cookie = new LinkedHashMap<>((HashMap<String, Object>) entry.getValue());
+            if (!cookie.containsKey("Path"))
+                cookie.put("Path", "/" );
 
-            if (!((HashMap<String, Object>) entry.getValue()).containsKey("HttpOnly"))
-                ((HashMap<String, Object>) entry.getValue()).put("HttpOnly", true);
-
-            if (!((HashMap<String, Object>) entry.getValue()).containsKey("SetSecure"))
-                ((HashMap<String, Object>) entry.getValue()).put("Secure", true);
+            if (!cookie.containsKey("HttpOnly"))
+                cookie.put("HttpOnly", true);
 
+            if (!cookie.containsKey("SetSecure"))
+                cookie.put("Secure", true);
 
+            entry.setValue(cookie);
         }
         return entry;
     }