diff --git a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
index fc861e13a..00b595bad 100644
--- a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
+++ b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
@@ -18,7 +18,6 @@
 
 package org.apache.tools.ant.attribute;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java
index b32b4b8ac..0129fbf57 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -936,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(String::length).reversed());
+        keys.sort(Comparator.comparingInt(String::length).reversed());
         return keys.iterator();
     }
 }
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 e82af1df9..83d3f0a0e 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
@@ -150,7 +150,7 @@ public class FailureRecorder extends ProjectComponent implements JUnitResultForm
         super.setProject(project);
         // check if already registered
         // register if needed
-        if (!project.getBuildListeners().stream().anyMatch(FailureRecorder.class::isInstance)) {
+        if (project.getBuildListeners().stream().noneMatch(FailureRecorder.class::isInstance)) {
             verbose("Register FailureRecorder (@" + this.hashCode() + ") as BuildListener");
             project.addBuildListener(this);
         }