From da8e05dd351e819828f08bb4b624bf5dd53c8952 Mon Sep 17 00:00:00 2001 From: Raffi Khatchadourian Date: Mon, 20 Aug 2018 16:49:13 -0400 Subject: [PATCH 1/4] Apply Optimize Java 8 Stream refactoring. See https://github.com/ponder-lab/Optimize-Java-8-Streams-Refactoring. --- .../jetty/quickstart/AttributeNormalizer.java | 2 +- .../main/java/org/eclipse/jetty/start/Modules.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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..2a73024517e9 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,20 +357,20 @@ 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 { // Is there an obvious default? Optional dftProvider = (providers.size()==1) - ?providers.stream().findFirst() + ?providers.parallelStream().findFirst() :providers.stream().filter(m->m.getName().equals(dependsOn)).findFirst(); if (dftProvider.isPresent()) From 7ca06b347aa3663d7d05b3f65b9a43e7929d2a18 Mon Sep 17 00:00:00 2001 From: Raffi Khatchadourian Date: Mon, 20 Aug 2018 16:51:19 -0400 Subject: [PATCH 2/4] Remove spurious refactoring. This is a manual step. --- jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2a73024517e9..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 @@ -370,7 +370,7 @@ private void enable(Set newlyEnabled, Module module, String enabledFrom, { // Is there an obvious default? Optional dftProvider = (providers.size()==1) - ?providers.parallelStream().findFirst() + ?providers.stream().findFirst() :providers.stream().filter(m->m.getName().equals(dependsOn)).findFirst(); if (dftProvider.isPresent()) From fbb0d0e779c7509d4dc7b1993f0bf53571ad4d9c Mon Sep 17 00:00:00 2001 From: Raffi Khatchadourian Date: Mon, 20 Aug 2018 16:49:13 -0400 Subject: [PATCH 3/4] Apply Optimize Java 8 Stream refactoring. See https://github.com/ponder-lab/Optimize-Java-8-Streams-Refactoring. Signed-off-by: Raffi Khatchadourian --- .../jetty/quickstart/AttributeNormalizer.java | 2 +- .../main/java/org/eclipse/jetty/start/Modules.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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..2a73024517e9 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,20 +357,20 @@ 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 { // Is there an obvious default? Optional dftProvider = (providers.size()==1) - ?providers.stream().findFirst() + ?providers.parallelStream().findFirst() :providers.stream().filter(m->m.getName().equals(dependsOn)).findFirst(); if (dftProvider.isPresent()) From 628a521a237802ce84d99642492ac47a345843c4 Mon Sep 17 00:00:00 2001 From: Raffi Khatchadourian Date: Mon, 20 Aug 2018 16:51:19 -0400 Subject: [PATCH 4/4] Remove spurious refactoring. This is a manual step. Signed-off-by: Raffi Khatchadourian --- jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2a73024517e9..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 @@ -370,7 +370,7 @@ private void enable(Set newlyEnabled, Module module, String enabledFrom, { // Is there an obvious default? Optional dftProvider = (providers.size()==1) - ?providers.parallelStream().findFirst() + ?providers.stream().findFirst() :providers.stream().filter(m->m.getName().equals(dependsOn)).findFirst(); if (dftProvider.isPresent())