From 6840f7cec4fd1c36fb01882c7a9b9baa55e2b340 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 7 May 2025 20:50:10 -0700 Subject: [PATCH] GUACAMOLE-2065: Remove usage of asIterator() (not part of Java 8). --- .../org/apache/guacamole/net/RequestDetails.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/RequestDetails.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/RequestDetails.java index ca55ac9c8..eecebbf51 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/RequestDetails.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/RequestDetails.java @@ -102,14 +102,16 @@ public class RequestDetails { // Headers are case-insensitive Map> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - names.asIterator().forEachRemaining((String name) -> { + while (names.hasMoreElements()) { + + String name = names.nextElement(); @SuppressWarnings("unchecked") // getHeaders() is explicitly documented as returning a Enumeration Enumeration values = (Enumeration) request.getHeaders(name); if (values != null && values.hasMoreElements()) headers.put(name, Collections.unmodifiableList(Collections.list(values))); - }); + } return Collections.unmodifiableMap(headers); @@ -139,13 +141,15 @@ public class RequestDetails { // Unlike headers, parameters are case-sensitive Map> parameters = new HashMap<>(); - names.asIterator().forEachRemaining((String name) -> { + while (names.hasMoreElements()) { + + String name = names.nextElement(); String[] values = request.getParameterValues(name); if (values != null && values.length != 0) parameters.put(name, Collections.unmodifiableList(Arrays.asList(values))); - }); + } return Collections.unmodifiableMap(parameters);