From c069b5007f243464c90461c5b478d192f5dff945 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Fri, 18 May 2018 06:33:57 +0200 Subject: [PATCH] Tidy up the code --- .../org/apache/tools/ant/taskdefs/DependSet.java | 3 +-- .../org/apache/tools/ant/taskdefs/Recorder.java | 1 - src/main/org/apache/tools/ant/taskdefs/Replace.java | 3 +-- .../org/apache/tools/ant/taskdefs/condition/Or.java | 2 -- .../apache/tools/ant/taskdefs/condition/Xor.java | 2 -- .../taskdefs/optional/junit/FailureRecorder.java | 4 +--- .../org/apache/tools/ant/types/AbstractFileSet.java | 13 +++++-------- .../org/apache/tools/ant/types/Commandline.java | 6 +++--- 8 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java index 45c82749d..721dbfbbb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java @@ -264,8 +264,7 @@ public class DependSet extends MatchingTask { } private Resource getXest(ResourceCollection rc, ResourceComparator c) { - return StreamUtils.iteratorAsStream(rc.iterator()) - .min(c::compare).orElse(null); + return StreamUtils.iteratorAsStream(rc.iterator()).min(c).orElse(null); } private Resource getOldest(ResourceCollection rc) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java index 8a7d8213a..66152d37d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java +++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java @@ -18,7 +18,6 @@ package org.apache.tools.ant.taskdefs; import java.util.Hashtable; -import java.util.Map; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 2cfaa8bb1..b32b4b8ac 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -33,7 +33,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; import java.util.List; -import java.util.Objects; import java.util.Properties; import org.apache.tools.ant.BuildException; @@ -937,7 +936,7 @@ public class Replace extends MatchingTask { */ private Iterator getOrderedIterator(Properties props) { List keys = new ArrayList<>(props.stringPropertyNames()); - keys.sort(Comparator.comparingInt(s -> s.length()).reversed()); + keys.sort(Comparator.comparingInt(String::length).reversed()); return keys.iterator(); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java index 65c64be4b..8f05d18d3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java @@ -18,8 +18,6 @@ package org.apache.tools.ant.taskdefs.condition; -import java.util.Collections; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.StreamUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java b/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java index 7e31633e8..ec3e213fe 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java @@ -17,8 +17,6 @@ */ package org.apache.tools.ant.taskdefs.condition; -import java.util.Collections; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.StreamUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java index 20d9825d1..e82af1df9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java @@ -149,10 +149,8 @@ public class FailureRecorder extends ProjectComponent implements JUnitResultForm // store project reference for logging super.setProject(project); // check if already registered - boolean alreadyRegistered = project.getBuildListeners().stream() - .anyMatch(FailureRecorder.class::isInstance); // register if needed - if (!alreadyRegistered) { + if (!project.getBuildListeners().stream().anyMatch(FailureRecorder.class::isInstance)) { verbose("Register FailureRecorder (@" + this.hashCode() + ") as BuildListener"); project.addBuildListener(this); } diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index 9a585bb3c..7c0651af9 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -903,8 +903,8 @@ public abstract class AbstractFileSet extends DataType try { AbstractFileSet fs = (AbstractFileSet) super.clone(); fs.defaultPatterns = (PatternSet) defaultPatterns.clone(); - fs.additionalPatterns = additionalPatterns.stream().map( - PatternSet::clone).map(PatternSet.class::cast).collect(Collectors.toList()); + fs.additionalPatterns = additionalPatterns.stream().map(PatternSet::clone) + .map(PatternSet.class::cast).collect(Collectors.toList()); fs.selectors = new ArrayList<>(selectors); return fs; } catch (CloneNotSupportedException e) { @@ -963,12 +963,9 @@ public abstract class AbstractFileSet extends DataType if (isReference()) { super.dieOnCircularReference(stk, p); } else { - selectors.stream().filter(DataType.class::isInstance).forEach(fileSelector -> - pushAndInvokeCircularReferenceCheck((DataType) fileSelector, stk, p) - ); - for (PatternSet ps : additionalPatterns) { - pushAndInvokeCircularReferenceCheck(ps, stk, p); - } + selectors.stream().filter(DataType.class::isInstance).map(DataType.class::cast) + .forEach(type -> pushAndInvokeCircularReferenceCheck(type, stk, p)); + additionalPatterns.forEach(ps -> pushAndInvokeCircularReferenceCheck(ps, stk, p)); setChecked(true); } } diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java index 2fe0d52f8..81440fad6 100644 --- a/src/main/org/apache/tools/ant/types/Commandline.java +++ b/src/main/org/apache/tools/ant/types/Commandline.java @@ -224,9 +224,9 @@ public class Commandline implements Cloneable { */ public int getPosition() { if (realPos == -1) { - realPos = (executable == null ? 0 : 1) + (int) - arguments.stream().limit(position).map(Argument::getParts) - .flatMap(Stream::of).count(); + realPos = (executable == null ? 0 : 1) + + (int) arguments.stream().limit(position) + .map(Argument::getParts).flatMap(Stream::of).count(); } return realPos; }