From 374c7ec72d1e3447cbc90f0176938de75ba6141a Mon Sep 17 00:00:00 2001 From: Arturo Bernal Date: Tue, 31 Aug 2021 21:09:09 +0200 Subject: [PATCH] Replace Lambda with method reference. --- .../org/apache/tools/ant/property/LocalPropertyStack.java | 5 +++-- .../ant/taskdefs/optional/junitlauncher/LauncherSupport.java | 5 ++--- .../taskdefs/optional/junitlauncher/StandaloneLauncher.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/org/apache/tools/ant/property/LocalPropertyStack.java b/src/main/org/apache/tools/ant/property/LocalPropertyStack.java index 95b301f42..3b639318f 100644 --- a/src/main/org/apache/tools/ant/property/LocalPropertyStack.java +++ b/src/main/org/apache/tools/ant/property/LocalPropertyStack.java @@ -17,6 +17,7 @@ */ package org.apache.tools.ant.property; +import java.util.AbstractCollection; import java.util.Collections; import java.util.Deque; import java.util.HashSet; @@ -159,8 +160,8 @@ public class LocalPropertyStack { */ public Set getPropertyNames() { final Set names = stack.stream().map(Map::keySet) - .collect(Collector.of(() -> new HashSet(), - (ns, ks) -> ns.addAll(ks), + .collect(Collector.of(HashSet::new, + AbstractCollection::addAll, (ns1, ns2) -> { ns1.addAll(ns2); return ns1; }, Collector.Characteristics.UNORDERED, Collector.Characteristics.IDENTITY_FINISH)); return Collections.unmodifiableSet(names); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LauncherSupport.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LauncherSupport.java index fa92393b8..79f9bfcd9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LauncherSupport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LauncherSupport.java @@ -653,9 +653,8 @@ public class LauncherSupport { @Override public void executionStarted(final TestIdentifier testIdentifier) { super.executionStarted(testIdentifier); - AbstractJUnitResultFormatter.isTestClass(testIdentifier).ifPresent(testClass -> { - this.originalSysOut.println("Running " + testClass.getClassName()); - }); + AbstractJUnitResultFormatter.isTestClass(testIdentifier).ifPresent(testClass -> + this.originalSysOut.println("Running " + testClass.getClassName())); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/StandaloneLauncher.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/StandaloneLauncher.java index 9ff6cb834..11416eff1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/StandaloneLauncher.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/StandaloneLauncher.java @@ -146,11 +146,11 @@ public class StandaloneLauncher { } final String includeTags = reader.getAttributeValue(null, LD_XML_ATTR_INCLUDE_TAGS); if (includeTags != null) { - Stream.of(includeTags.split(",")).forEach(i -> forkedLaunch.addIncludeTag(i)); + Stream.of(includeTags.split(",")).forEach(forkedLaunch::addIncludeTag); } final String excludeTags = reader.getAttributeValue(null, LD_XML_ATTR_EXCLUDE_TAGS); if (excludeTags != null) { - Stream.of(excludeTags.split(",")).forEach(e -> forkedLaunch.addExcludeTag(e)); + Stream.of(excludeTags.split(",")).forEach(forkedLaunch::addExcludeTag); } final String printSummary = reader.getAttributeValue(null, LD_XML_ATTR_PRINT_SUMMARY); if (printSummary != null) {