Trivial refactoring: avoid redundant method calls
diff --git a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
index a2233bd..fdfce7f 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
@@ -74,7 +74,6 @@
import java.util.Optional;
import java.util.Queue;
import java.util.Set;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import static java.util.stream.Collectors.toList;
@@ -664,8 +663,7 @@
? sourceUnits.stream() // no need to build AST with parallel stream when we just have one/no source unit
: sourceUnits.parallelStream();
- // DON'T replace `collect(Collectors.counting())` with `count()` here, otherwise peek will NOT be triggered
- sourceUnitStream.peek(SourceUnit::buildAST).collect(Collectors.counting());
+ sourceUnitStream.forEach(SourceUnit::buildAST);
}
private void processPhaseOperations(final int phase) {
diff --git a/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java b/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
index f638cdd..c819234 100644
--- a/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
+++ b/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
@@ -75,7 +75,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.stream.Collectors;
import static org.apache.groovy.ast.tools.ConstructorNodeUtils.getFirstIfSpecialConstructorCall;
import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpec;
@@ -1038,8 +1037,7 @@
}
public void clean() {
- // DON'T replace `collect(Collectors.counting())` with `count()` here, otherwise peek will NOT be triggered
- javaStubCompilationUnitSet.stream().peek(FileObject::delete).collect(Collectors.counting());
+ javaStubCompilationUnitSet.stream().forEach(FileObject::delete);
javaStubCompilationUnitSet.clear();
}
