diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java index a6a3735eae9f..90f51ebed5dd 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java @@ -235,7 +235,7 @@ public AttributeNormalizer(Resource baseResource) Collections.sort(paths,attrComparator); Collections.sort(uris,attrComparator); - Stream.concat(paths.stream(),uris.stream()).forEach(a->attributes.put(a.key,a)); + Stream.concat(paths.stream(),uris.parallelStream()).forEach(a->attributes.put(a.key,a)); if (LOG.isDebugEnabled()) { diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java index 69bcad311d9d..a972c4a8c19c 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java @@ -82,8 +82,8 @@ public Modules(BaseHome basehome, StartArgs args) public void dump(List tags) { - Set exclude = tags.stream().filter(t->t.startsWith("-")).map(t->t.substring(1)).collect(Collectors.toSet()); - Set include = tags.stream().filter(t->!t.startsWith("-")).collect(Collectors.toSet()); + Set exclude = tags.parallelStream().filter(t->t.startsWith("-")).map(t->t.substring(1)).collect(Collectors.toSet()); + Set include = tags.parallelStream().filter(t->!t.startsWith("-")).collect(Collectors.toSet()); boolean all = include.contains("*") || include.isEmpty(); AtomicReference tag = new AtomicReference<>(); @@ -246,7 +246,7 @@ public String toString() public List getEnabled() { - List enabled = _modules.stream().filter(m->{return m.isEnabled();}).collect(Collectors.toList()); + List enabled = _modules.parallelStream().filter(m->{return m.isEnabled();}).collect(Collectors.toList()); TopologicalSort sort = new TopologicalSort<>(); for (Module module: enabled) @@ -357,14 +357,14 @@ private void enable(Set newlyEnabled, Module module, String enabledFrom, if (providers==null || providers.isEmpty()) throw new UsageException("Module %s does not provide %s",_baseHome.toShortForm(file),dependsOn); - enable(newlyEnabled,providers.stream().findFirst().get(),"dynamic dependency of "+module.getName(),true); + enable(newlyEnabled,providers.parallelStream().findFirst().get(),"dynamic dependency of "+module.getName(),true); continue; } throw new UsageException("No module found to provide %s for %s",dependsOn,module); } // If a provider is already enabled, then add a transitive enable - if (providers.stream().filter(Module::isEnabled).count()>0) + if (providers.parallelStream().filter(Module::isEnabled).count()>0) providers.stream().filter(m->m.isEnabled()&&!m.equals(module)).forEach(m->enable(newlyEnabled,m,"transitive provider of "+dependsOn+" for "+module.getName(),true)); else {