uses collections addAll instead of forEach interaction
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e5563468 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e5563468 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e5563468 Branch: refs/heads/master Commit: e5563468dbc7dd583fb9ddd3969f609d1e6c64a3 Parents: b06bd4e Author: Otavio Santana <[email protected]> Authored: Tue Dec 4 11:34:19 2018 -0200 Committer: Otavio Santana <[email protected]> Committed: Tue Dec 4 11:34:19 2018 -0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/BeanContext.java | 8 ++----- .../openejb/assembler/classic/Assembler.java | 24 +++++--------------- .../assembler/classic/ValidatorBuilder.java | 4 +--- .../openejb/config/ConfigurationFactory.java | 8 ++----- .../org/apache/openejb/util/ReferencesTest.java | 4 +--- 5 files changed, 12 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/e5563468/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java index 778c3f3..89f42a6 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java @@ -691,13 +691,9 @@ public class BeanContext extends DeploymentContext { final ArrayList<Class> classes = new ArrayList<>(); - for (final Class local : businessRemotes) { - classes.add(local); - } + classes.addAll(businessRemotes); - for (final Class local : businessLocals) { - classes.add(local); - } + classes.addAll(businessLocals); classes.add(this.beanClass); http://git-wip-us.apache.org/repos/asf/tomee/blob/e5563468/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index 12cae0b..f10ce76 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -1416,18 +1416,10 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A final List<CommonInfoObject> vfs = new ArrayList<>( appInfo.clients.size() + appInfo.connectors.size() + appInfo.ejbJars.size() + appInfo.webApps.size()); - for (final ClientInfo clientInfo : appInfo.clients) { - vfs.add(clientInfo); - } - for (final ConnectorInfo connectorInfo : appInfo.connectors) { - vfs.add(connectorInfo); - } - for (final EjbJarInfo ejbJarInfo : appInfo.ejbJars) { - vfs.add(ejbJarInfo); - } - for (final WebAppInfo webAppInfo : appInfo.webApps) { - vfs.add(webAppInfo); - } + vfs.addAll(appInfo.clients); + vfs.addAll(appInfo.connectors); + vfs.addAll(appInfo.ejbJars); + vfs.addAll(appInfo.webApps); return vfs; } @@ -2422,12 +2414,8 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A final List<String> clientIds = new ArrayList<>(); for (final ClientInfo clientInfo : appInfo.clients) { clientIds.add(clientInfo.moduleId); - for (final String className : clientInfo.localClients) { - clientIds.add(className); - } - for (final String className : clientInfo.remoteClients) { - clientIds.add(className); - } + clientIds.addAll(clientInfo.localClients); + clientIds.addAll(clientInfo.remoteClients); } for (final WebContext webContext : appContext.getWebContexts()) { http://git-wip-us.apache.org/repos/asf/tomee/blob/e5563468/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java index 0513f00..f55d165 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java @@ -96,9 +96,7 @@ public final class ValidatorBuilder { for (final PropertyType p : config.getProperty()) { info.propertyTypes.put(p.getName(), p.getValue()); } - for (final String element : config.getConstraintMapping()) { - info.constraintMappings.add(element); - } + info.constraintMappings.addAll(config.getConstraintMapping()); } return info; } http://git-wip-us.apache.org/repos/asf/tomee/blob/e5563468/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java index cdc19c5..b6a6f1f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java @@ -1711,15 +1711,11 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory { final OpenEjbConfiguration runningConfig = getRunningConfig(); if (runningConfig != null) { - for (final ContainerInfo containerInfo : runningConfig.containerSystem.containers) { - containers.add(containerInfo); - } + containers.addAll(runningConfig.containerSystem.containers); } if (sys != null) { - for (final ContainerInfo containerInfo : sys.containerSystem.containers) { - containers.add(containerInfo); - } + containers.addAll(sys.containerSystem.containers); } return containers; } http://git-wip-us.apache.org/repos/asf/tomee/blob/e5563468/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java index 24f23be..b8284eb 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java @@ -240,9 +240,7 @@ public class ReferencesTest extends TestCase { public Bean(final String name, final String... refs) { this.name = name; this.refs = new LinkedHashSet<>(refs.length); - for (final String s : refs) { - this.refs.add(s); - } + this.refs.addAll(Arrays.asList(refs)); } public String toString() {
