From 1189ccc936e751d9c72e15f0be37a739fe15d05e Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Mon, 23 Jul 2018 20:48:55 +0200 Subject: [PATCH 1/2] Use Collection.removeIf() where possible See gh-13871 --- .../boot/actuate/trace/http/HttpExchangeTracer.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java index 13789c4ce24..99cc2b08db5 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java @@ -18,7 +18,6 @@ package org.springframework.boot.actuate.trace.http; import java.net.URI; import java.security.Principal; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -103,12 +102,7 @@ public class HttpExchangeTracer { return new LinkedHashMap<>(); } Map> headers = headersSupplier.get(); - Iterator keys = headers.keySet().iterator(); - while (keys.hasNext()) { - if (!headerPredicate.test(keys.next())) { - keys.remove(); - } - } + headers.keySet().removeIf(s -> !headerPredicate.test(s)); return headers; } From 1a0afc6bbe193a98ed5d9d7d4ab461a24cbbb5fd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 24 Jul 2018 09:38:51 +0200 Subject: [PATCH 2/2] Polish "Use Collection.removeIf() where possible" Closes gh-13871 --- .../boot/actuate/trace/http/HttpExchangeTracer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java index 99cc2b08db5..2257149aa9e 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java @@ -102,7 +102,7 @@ public class HttpExchangeTracer { return new LinkedHashMap<>(); } Map> headers = headersSupplier.get(); - headers.keySet().removeIf(s -> !headerPredicate.test(s)); + headers.keySet().removeIf((header) -> !headerPredicate.test(header)); return headers; }