Skip to content

Commit fe85198

Browse files
committed
PR review changes
1 parent d153e7b commit fe85198

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/AgentSourceFilesFetcher.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -89,27 +89,27 @@ private static String formatDirectoryList(Set<String> sourceDirectories) {
8989
}
9090

9191
private AgentSourceFilesList buildSourceFilesList(String workspacePath, Set<String> sourceDirectories) {
92-
// Populate search stack with source directories
93-
final Stack<File> stack = new Stack<>();
92+
// Populate search directory stack with source directories
93+
final Stack<File> directoryStack = new Stack<>();
9494
sourceDirectories.stream()
9595
.map(File::new)
9696
.filter(f -> f.exists() && f.isDirectory())
97-
.forEach(stack::push);
97+
.forEach(directoryStack::push);
9898

9999
// If no source directories are found in the workspace, use workspace root as search starting point
100-
if (stack.isEmpty()) {
101-
stack.push(new File(workspacePath));
100+
if (directoryStack.isEmpty()) {
101+
directoryStack.push(new File(workspacePath));
102102
}
103103

104104
// Walk all directories and subdirectories and create a mapping for each file found
105105
ArrayList<String> sourceFilesList = new ArrayList<>();
106-
while (!stack.empty() && stack.peek() != null) {
107-
File f = stack.pop();
106+
while (!directoryStack.empty() && directoryStack.peek() != null) {
107+
File f = directoryStack.pop();
108108
File[] fileList = f.listFiles();
109109
if (fileList == null) continue;
110-
for (File child : Objects.requireNonNull(f.listFiles())) {
110+
for (File child : fileList) {
111111
if (child.isDirectory()) {
112-
stack.push(child);
112+
directoryStack.push(child);
113113
} else { // child.isFile()
114114
sourceFilesList.add(child.getAbsolutePath());
115115
}

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/ModuleCoverageDataSourceFilesSet.java

+9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@
88
import java.util.Map;
99
import java.util.Set;
1010

11+
/**
12+
* Collects and dispenses the set of source-files referenced in the coverage data.
13+
*/
1114
public class ModuleCoverageDataSourceFilesSet {
15+
16+
/**
17+
* Build map by module of <code>ModuleCoverageDataSourceFilesSet</code>.
18+
* @param rootNode the root node of the coverage data.
19+
* @return
20+
*/
1221
public static Map<String, ModuleCoverageDataSourceFilesSet> constructModuleMap(Node rootNode) {
1322
Map<String, ModuleCoverageDataSourceFilesSet> moduleSourceFilesSetMap = new HashMap<>();
1423
for (Node child: rootNode.getChildren()) {

0 commit comments

Comments
 (0)