Uses removeIf method instead of use iterator.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7ad09234 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7ad09234 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7ad09234 Branch: refs/heads/master Commit: 7ad09234c545aacb507b8b1171542ea59b8842a2 Parents: 3a613ff Author: Otavio Santana <[email protected]> Authored: Thu Dec 20 08:37:03 2018 -0200 Committer: Otavio Santana <[email protected]> Committed: Thu Dec 20 08:37:03 2018 -0200 ---------------------------------------------------------------------- .../org/apache/openejb/OpenEjbContainer.java | 7 +------ .../assembler/classic/MethodInfoUtil.java | 8 +------ .../classloader/ClassLoaderConfigurer.java | 7 +------ .../apache/openejb/config/DeploymentLoader.java | 9 ++------ .../apache/openejb/config/NewLoaderLogic.java | 22 +++----------------- .../config/PersistenceUnitLinkResolver.java | 7 +------ .../config/rules/CheckRestMethodArePublic.java | 8 +------ .../jdbc/pool/PoolDataSourceCreator.java | 8 +------ .../openejb/core/ivm/naming/IvmContextTest.java | 6 +----- .../apache/openejb/jee/oejb3/EjbDeployment.java | 7 +------ 10 files changed, 13 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java index 6713824..cf7c2e3 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java @@ -414,12 +414,7 @@ public final class OpenEjbContainer extends EJBContainer { if (modules instanceof String) { moduleLocations = configurationFactory.getModulesFromClassPath(null, classLoader); - for (final Iterator<File> i = moduleLocations.iterator(); i.hasNext(); ) { - final File file = i.next(); - if (!match((String) modules, file)) { - i.remove(); - } - } + moduleLocations.removeIf(file -> !match((String) modules, file)); } else if (modules instanceof String[]) { http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java index 67e807d..c3b5bf4 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java @@ -468,13 +468,7 @@ public class MethodInfoUtil { } // Remove methods that cannot be controlled by the user - final Iterator<Method> iterator = methods.iterator(); - while (iterator.hasNext()) { - final Method method = iterator.next(); - if (containerMethod(method)) { - iterator.remove(); - } - } + methods.removeIf(MethodInfoUtil::containerMethod); return methods; } http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java b/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java index 7db485b..65e85fd 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/classloader/ClassLoaderConfigurer.java @@ -33,12 +33,7 @@ public interface ClassLoaderConfigurer { } public static void configure(final Collection<URL> urls, final ClassLoaderConfigurer configurer) { - final Iterator<URL> it = urls.iterator(); - while (it.hasNext()) { - if (!configurer.accept(it.next())) { - it.remove(); - } - } + urls.removeIf(url -> !configurer.accept(url)); urls.addAll(Arrays.asList(configurer.additionalURLs())); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java index 1611740..1f55797 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java @@ -1532,13 +1532,8 @@ public class DeploymentLoader implements DeploymentFilterable { // find the nested jar files final HashMap<String, URL> rarLibs = new HashMap<>(); scanDir(rarFile, rarLibs, ""); - for (final Iterator<Map.Entry<String, URL>> iterator = rarLibs.entrySet().iterator(); iterator.hasNext(); ) { - // remove all non jars from the rarLibs - final Map.Entry<String, URL> fileEntry = iterator.next(); - if (!fileEntry.getKey().endsWith(".jar")) { - iterator.remove(); - } - } + // remove all non jars from the rarLibs + rarLibs.entrySet().removeIf(fileEntry -> !fileEntry.getKey().endsWith(".jar")); // create the class loader final List<URL> classPath = new ArrayList<>(rarLibs.values()); http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java index 845fc94..bbd864e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java @@ -155,12 +155,7 @@ public class NewLoaderLogic { "sun.reflect." ); - final Iterator<String> classes = callers.iterator(); - while (classes.hasNext()) { - if (unwanted.accept(classes.next())) { - classes.remove(); - } - } + callers.removeIf(unwanted::accept); } return callers; @@ -221,13 +216,7 @@ public class NewLoaderLogic { getExclusions(); // force init final List<URL> urls = urlSet.getUrls(); - final Iterator<URL> iterator = urls.iterator(); - while (iterator.hasNext()) { - final URL url = iterator.next(); - if (skip(url, includeFilter, excludeFilter)) { - iterator.remove(); - } - } + urls.removeIf(url -> skip(url, includeFilter, excludeFilter)); return new UrlSet(urls); } @@ -332,12 +321,7 @@ public class NewLoaderLogic { if (ADDITIONAL_INCLUDE != null) { // include = not excluded for (final String rawInclude : ADDITIONAL_INCLUDE.split("[ \t\n\n]*,[ \t\n\n]*")) { final String include = rawInclude.trim(); - final Iterator<String> excluded = excludes.iterator(); - while (excluded.hasNext()) { - if (excluded.next().startsWith(include)) { - excluded.remove(); - } - } + excludes.removeIf(s -> s.startsWith(include)); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java index 52d41a4..1a7de56 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java @@ -50,12 +50,7 @@ public class PersistenceUnitLinkResolver extends UniqueDefaultLinkResolver<Persi final WebModule war = extractWebApp(moduleUri); if (war != null) { // keep only values related to this war - final Iterator<PersistenceUnit> it = values.iterator(); - while (it.hasNext()) { - if (!isIn(it.next(), war)) { - it.remove(); - } - } + values.removeIf(persistenceUnit -> !isIn(persistenceUnit, war)); return values; } http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java index 6751143..43a9a35 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckRestMethodArePublic.java @@ -93,13 +93,7 @@ public class CheckRestMethodArePublic implements ValidationRule { } // try to avoid to valid twice the same classes - final Iterator<String> it = classes.iterator(); - while (it.hasNext()) { - final String current = it.next(); - if (standAloneClasses.contains(current)) { - it.remove(); - } - } + classes.removeIf(standAloneClasses::contains); // valid for (final String classname : classes) { http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java index 270cc09..6645e2f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/PoolDataSourceCreator.java @@ -42,13 +42,7 @@ public abstract class PoolDataSourceCreator implements DataSourceCreator { protected void cleanProperty(final Object ds, final String name) { final Map<String, Object> unsetProperties = recipes.get(ds).getUnsetProperties(); - final Iterator<Map.Entry<String, Object>> iterator = unsetProperties.entrySet().iterator(); - while (iterator.hasNext()) { - final Map.Entry<String, Object> entry = iterator.next(); - if (entry.getKey().equalsIgnoreCase(name)) { - iterator.remove(); - } - } + unsetProperties.entrySet().removeIf(entry -> entry.getKey().equalsIgnoreCase(name)); } @Override http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java index c38bc74..ce93e36 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/IvmContextTest.java @@ -97,11 +97,7 @@ public class IvmContextTest extends TestCase { final Map<String, Object> map = Debug.contextToMap(context); // Prune the context entries out - final Iterator<Map.Entry<String, Object>> iterator = map.entrySet().iterator(); - while (iterator.hasNext()) { - final Map.Entry<String, Object> entry = iterator.next(); - if (entry.getValue() instanceof Context) iterator.remove(); - } + map.entrySet().removeIf(entry -> entry.getValue() instanceof Context); return map; } http://git-wip-us.apache.org/repos/asf/tomee/blob/7ad09234/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java ---------------------------------------------------------------------- diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java index e6249fd..271892b 100644 --- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java +++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java @@ -165,12 +165,7 @@ public class EjbDeployment { } public void removeResourceLink(final String resRefName) { - for (final Iterator<ResourceLink> iterator = resourceLink.iterator(); iterator.hasNext(); ) { - final ResourceLink link = iterator.next(); - if (resRefName.equals(link.getResRefName())) { - iterator.remove(); - } - } + resourceLink.removeIf(link -> resRefName.equals(link.getResRefName())); } public void addEjbLink(final EjbLink ejbLink) {
