You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by eb...@apache.org on 2020/12/04 12:00:10 UTC
[tomcat] 07/12: Replace loops with Collection.removeIf() when
possible
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 389e1f3582c6d86389acb11f4fa00dff68d5ba69
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Dec 2 01:34:34 2020 +0100
Replace loops with Collection.removeIf() when possible
---
java/org/apache/catalina/core/ApplicationPushBuilder.java | 9 +--------
java/org/apache/catalina/ssi/SSIMediator.java | 9 +--------
java/org/apache/catalina/startup/WebappServiceLoader.java | 8 +-------
.../tomcat/buildutil/translate/BackportTranslations.java | 10 +---------
java/org/apache/tomcat/util/descriptor/web/WebXml.java | 8 +-------
.../tomcat/util/modeler/BaseNotificationBroadcaster.java | 9 +--------
6 files changed, 6 insertions(+), 47 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationPushBuilder.java b/java/org/apache/catalina/core/ApplicationPushBuilder.java
index cc81243..805d32c 100644
--- a/java/org/apache/catalina/core/ApplicationPushBuilder.java
+++ b/java/org/apache/catalina/core/ApplicationPushBuilder.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -147,13 +146,7 @@ public class ApplicationPushBuilder implements PushBuilder {
if (responseCookie.getMaxAge() < 0) {
// Path information not available so can only remove based on
// name.
- Iterator<Cookie> cookieIterator = cookies.iterator();
- while (cookieIterator.hasNext()) {
- Cookie cookie = cookieIterator.next();
- if (cookie.getName().equals(responseCookie.getName())) {
- cookieIterator.remove();
- }
- }
+ cookies.removeIf(cookie -> cookie.getName().equals(responseCookie.getName()));
} else {
cookies.add(new Cookie(responseCookie.getName(), responseCookie.getValue()));
}
diff --git a/java/org/apache/catalina/ssi/SSIMediator.java b/java/org/apache/catalina/ssi/SSIMediator.java
index 1a1c892..3de7bd5 100644
--- a/java/org/apache/catalina/ssi/SSIMediator.java
+++ b/java/org/apache/catalina/ssi/SSIMediator.java
@@ -21,7 +21,6 @@ import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Set;
import java.util.TimeZone;
@@ -127,13 +126,7 @@ public class SSIMediator {
variableNames.add("LAST_MODIFIED");
ssiExternalResolver.addVariableNames(variableNames);
//Remove any variables that are reserved by this class
- Iterator<String> iter = variableNames.iterator();
- while (iter.hasNext()) {
- String name = iter.next();
- if (isNameReserved(name)) {
- iter.remove();
- }
- }
+ variableNames.removeIf(this::isNameReserved);
return variableNames;
}
diff --git a/java/org/apache/catalina/startup/WebappServiceLoader.java b/java/org/apache/catalina/startup/WebappServiceLoader.java
index 73394ac..4e250b4 100644
--- a/java/org/apache/catalina/startup/WebappServiceLoader.java
+++ b/java/org/apache/catalina/startup/WebappServiceLoader.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -124,12 +123,7 @@ public class WebappServiceLoader<T> {
// Filter the discovered container SCIs if required
if (containerSciFilterPattern != null) {
- Iterator<String> iter = containerServiceClassNames.iterator();
- while (iter.hasNext()) {
- if (containerSciFilterPattern.matcher(iter.next()).find()) {
- iter.remove();
- }
- }
+ containerServiceClassNames.removeIf(s -> containerSciFilterPattern.matcher(s).find());
}
// Obtaining the application provided configuration files is a little
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
index 1da15de..cb20a01 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportTranslations.java
@@ -17,8 +17,6 @@
package org.apache.tomcat.buildutil.translate;
import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
import java.util.Properties;
/**
@@ -63,13 +61,7 @@ public class BackportTranslations extends BackportBase {
}
// Remove translated values for keys that have been removed
- Iterator<Map.Entry<Object,Object>> iter = targetTranslated.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry<Object,Object> entry = iter.next();
- if (!targetEnglish.containsKey(entry.getKey())) {
- iter.remove();
- }
- }
+ targetTranslated.entrySet().removeIf(entry -> !targetEnglish.containsKey(entry.getKey()));
Utils.export(language, targetTranslated, storageDir);
}
}
diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index ed40733..741b1c2 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -2388,13 +2388,7 @@ public class WebXml extends XmlEncodingBase implements DocumentProperties.Charse
names.add(fragment.getName());
}
for (WebXml fragment : group) {
- Iterator<String> after = fragment.getAfterOrdering().iterator();
- while (after.hasNext()) {
- String entry = after.next();
- if (!names.contains(entry)) {
- after.remove();
- }
- }
+ fragment.getAfterOrdering().removeIf(entry -> !names.contains(entry));
}
}
private static void orderFragments(Set<WebXml> orderedFragments,
diff --git a/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java b/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
index 9795cf8..0b82be0 100644
--- a/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
+++ b/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
@@ -20,7 +20,6 @@ package org.apache.tomcat.util.modeler;
import java.util.ArrayList;
-import java.util.Iterator;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanNotificationInfo;
@@ -135,13 +134,7 @@ public class BaseNotificationBroadcaster implements NotificationBroadcaster {
throws ListenerNotFoundException {
synchronized (entries) {
- Iterator<BaseNotificationBroadcasterEntry> items =
- entries.iterator();
- while (items.hasNext()) {
- BaseNotificationBroadcasterEntry item = items.next();
- if (item.listener == listener)
- items.remove();
- }
+ entries.removeIf(item -> item.listener == listener);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org