Tidy up the code

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) {

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;

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<String> getOrderedIterator(Properties props) {
         List<String> keys = new ArrayList<>(props.stringPropertyNames());
-        keys.sort(Comparator.<String>comparingInt(s -> s.length()).reversed());
+        keys.sort(Comparator.<String>comparingInt(String::length).reversed());
         return keys.iterator();
     }
 }

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;
 

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;
 

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);
         }

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);
         }
     }

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;
         }