From 1ff11e9b960be7bdd3794f0aabab430c2ece2074 Mon Sep 17 00:00:00 2001 From: Wout Feys Date: Fri, 28 Feb 2025 13:03:34 +0100 Subject: [PATCH] Simplify cookie extraction --- .../agent/wrappers/spring/SpringMVCWrapper.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/agent/src/main/java/dev/aikido/agent/wrappers/spring/SpringMVCWrapper.java b/agent/src/main/java/dev/aikido/agent/wrappers/spring/SpringMVCWrapper.java index d60b3921..f39aad2c 100644 --- a/agent/src/main/java/dev/aikido/agent/wrappers/spring/SpringMVCWrapper.java +++ b/agent/src/main/java/dev/aikido/agent/wrappers/spring/SpringMVCWrapper.java @@ -18,6 +18,7 @@ import dev.aikido.agent_api.helpers.logging.Logger; import java.lang.reflect.Executable; +import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; import java.util.List; @@ -73,15 +74,11 @@ public static Object interceptOnEnter( Cookie[] cookies = request.getCookies(); if (cookies != null) { for (Cookie cookie : cookies) { - List newValue; - // If the cookie is already inside the map, add the value to the existing list - if (cookiesMap.containsKey(cookie.getName())) { - newValue = cookiesMap.get(cookie.getName()); - newValue.add(cookie.getValue()); - } else { - newValue = List.of(cookie.getValue()); + // If no entry exists, create a new empty entry + if (!cookiesMap.containsKey(cookie.getName())) { + cookiesMap.put(cookie.getName(), new ArrayList<>()); } - cookiesMap.put(cookie.getName(), newValue); + cookiesMap.get(cookie.getName()).add(cookie.getValue()); } }