This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 154cb384d6 Simplify removal loops with Collection.removeIf
154cb384d6 is described below
commit 154cb384d67a89732b4f2b3784b6724dcbb90fbe
Author: Martin Wiesner <[email protected]>
AuthorDate: Sun Mar 1 19:57:36 2026 +0100
Simplify removal loops with Collection.removeIf
---
.../java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java | 8 +-------
.../apache/tomee/catalina/deployment/TomcatWebappDeployer.java | 7 +------
.../src/main/java/org/apache/tomee/embedded/Container.java | 9 ++-------
.../src/main/java/org/apache/tomee/loader/filter/Filters.java | 8 +-------
.../apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java | 8 +-------
.../apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java | 8 +-------
6 files changed, 7 insertions(+), 41 deletions(-)
diff --git
a/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
b/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
index aef91166e5..7b289d6451 100644
---
a/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
+++
b/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoEndpoint.java
@@ -91,13 +91,7 @@ public class PojoEndpoint extends CxfEndpoint {
service = doServiceCreate();
{ // cleanup jax-ws injections
- final Iterator<Injection> injections =
port.getInjections().iterator();
- while (injections.hasNext()) {
- final Injection next = injections.next();
- if (WebServiceContext.class.equals(type(loader, next))) {
- injections.remove();
- }
- }
+ port.getInjections().removeIf(next ->
WebServiceContext.class.equals(type(loader, next)));
}
ResourceInjector injector = null;
diff --git
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
index 2806241132..d97d6b6256 100644
---
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
+++
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
@@ -62,12 +62,7 @@ public class TomcatWebappDeployer implements WebAppDeployer {
if (info == null) { // try another time doing a diff with apps before
deployment and apps after
final Collection<String> deployedNow =
tomcatWebAppBuilder.availableApps();
- final Iterator<String> it = deployedNow.iterator();
- while (it.hasNext()) {
- if (alreadyDeployed.contains(it.next())) {
- it.remove();
- }
- }
+ deployedNow.removeIf(alreadyDeployed::contains);
if (deployedNow.size() == 1) {
info = contextInfo(new File(deployedNow.iterator().next()));
diff --git
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index 84cafb6721..3093ebeb63 100644
---
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -359,13 +359,8 @@ public class Container implements AutoCloseable {
// we don't care of these
callers.remove("org.apache.tomee.embedded.Container");
callers.remove("org.apache.tomee.gradle.embedded.TomEEEmbeddedTask");
- final Iterator<String> callerIt = callers.iterator();
- while (callerIt.hasNext()) { // TomEEEmbeddedMojo is also used with
some anonymous classes (TomEEEmbeddedMojo$x)
- if
(callerIt.next().startsWith("org.apache.openejb.maven.plugins.TomEEEmbeddedMojo"))
{
- callerIt.remove();
- // no break since we remove anonymous class+the mojo itself
- }
- }
+ // TomEEEmbeddedMojo is also used with some anonymous classes
(TomEEEmbeddedMojo$x)
+ callers.removeIf(s ->
s.startsWith("org.apache.openejb.maven.plugins.TomEEEmbeddedMojo"));
if (additionalCallers != null && additionalCallers.length > 0) {
callers.addAll(asList(additionalCallers));
}
diff --git
a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java
b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java
index 01432364ae..dd3a89a1c5 100644
---
a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java
+++
b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java
@@ -96,13 +96,7 @@ public class Filters {
}
if (unwrapped.size() > 1) {
- final Iterator<Filter> iterator = unwrapped.iterator();
- while (iterator.hasNext()) {
- final Filter filter = iterator.next();
- if (filter == NONE) {
- iterator.remove();
- }
- }
+ unwrapped.removeIf(filter -> filter == NONE);
}
if (unwrapped.isEmpty()) {
diff --git
a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java
b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java
index 1db267d83e..857eb389d4 100644
---
a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java
+++
b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProvider.java
@@ -125,13 +125,7 @@ public class TomEEFacesConfigResourceProvider extends
DefaultFacesConfigResource
try {
if (AppFinder.findAppContextOrWeb(
Thread.currentThread().getContextClassLoader(),
AppFinder.WebBeansContextTransformer.INSTANCE) == null) {
- final Iterator<URL> toFilter = urlSet.iterator();
- while (toFilter.hasNext()) {
- final URL url = toFilter.next();
- if (TomEEMyFacesContainerInitializer.isOwb(url)) {
- toFilter.remove();
- }
- }
+ urlSet.removeIf(TomEEMyFacesContainerInitializer::isOwb);
}
} catch (final Throwable th) {
// no-op
diff --git
a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
index edfe6ebf33..52aeeda143 100644
---
a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
+++
b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
@@ -162,13 +162,7 @@ public class TomEEMyFacesContainerInitializer implements
ServletContainerInitial
}
// remove our internal faces-config.xml
- final Iterator<URL> it = metaInfFacesConfigUrls.iterator();
- while (it.hasNext()) {
- final URL next = it.next();
- if (isOwb(next)) {
- it.remove();
- }
- }
+
metaInfFacesConfigUrls.removeIf(TomEEMyFacesContainerInitializer::isOwb);
return !metaInfFacesConfigUrls.isEmpty();
} catch (final Exception e) {
