GUACAMOLE-2065: Remove usage of asIterator() (not part of Java 8).
This commit is contained in:
1 file changed
+8
-4
@@ -102,14 +102,16 @@ public class RequestDetails {
|
|||||||
|
|
||||||
// Headers are case-insensitive
|
// Headers are case-insensitive
|
||||||
Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
|
Map<String, List<String>> 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<String>
|
@SuppressWarnings("unchecked") // getHeaders() is explicitly documented as returning a Enumeration<String>
|
||||||
Enumeration<String> values = (Enumeration<String>) request.getHeaders(name);
|
Enumeration<String> values = (Enumeration<String>) request.getHeaders(name);
|
||||||
if (values != null && values.hasMoreElements())
|
if (values != null && values.hasMoreElements())
|
||||||
headers.put(name, Collections.unmodifiableList(Collections.list(values)));
|
headers.put(name, Collections.unmodifiableList(Collections.list(values)));
|
||||||
|
|
||||||
});
|
}
|
||||||
|
|
||||||
return Collections.unmodifiableMap(headers);
|
return Collections.unmodifiableMap(headers);
|
||||||
|
|
||||||
@@ -139,13 +141,15 @@ public class RequestDetails {
|
|||||||
|
|
||||||
// Unlike headers, parameters are case-sensitive
|
// Unlike headers, parameters are case-sensitive
|
||||||
Map<String, List<String>> parameters = new HashMap<>();
|
Map<String, List<String>> parameters = new HashMap<>();
|
||||||
names.asIterator().forEachRemaining((String name) -> {
|
while (names.hasMoreElements()) {
|
||||||
|
|
||||||
|
String name = names.nextElement();
|
||||||
|
|
||||||
String[] values = request.getParameterValues(name);
|
String[] values = request.getParameterValues(name);
|
||||||
if (values != null && values.length != 0)
|
if (values != null && values.length != 0)
|
||||||
parameters.put(name, Collections.unmodifiableList(Arrays.asList(values)));
|
parameters.put(name, Collections.unmodifiableList(Arrays.asList(values)));
|
||||||
|
|
||||||
});
|
}
|
||||||
|
|
||||||
return Collections.unmodifiableMap(parameters);
|
return Collections.unmodifiableMap(parameters);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user