Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Use predefined sources of modules to search for source code #603

Merged
merged 1 commit into from
Mar 28, 2023
Merged

Use predefined sources of modules to search for source code #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<testcontainers.version>1.17.6</testcontainers.version>
<job-dsl.version>1.83</job-dsl.version>

<coverage-model.version>0.19.0</coverage-model.version>
<coverage-model.version>0.19.1</coverage-model.version>
<git-forensics.version>2.0.0</git-forensics.version>
<prism-api.version>1.29.0-3</prism-api.version>
<pull-request-monitoring.version>1.7.8</pull-request-monitoring.version>
Expand Down
13 changes: 12 additions & 1 deletion plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

import org.apache.commons.lang3.StringUtils;

import edu.hm.hafner.coverage.Metric;
import edu.hm.hafner.coverage.ModuleNode;
import edu.hm.hafner.coverage.Node;
import edu.hm.hafner.util.FilteredLog;
Expand Down Expand Up @@ -392,8 +394,17 @@ private void perform(final Run<?, ?> run, final FilePath workspace, final TaskLi
if (!results.isEmpty()) {
CoverageReporter reporter = new CoverageReporter();
var rootNode = Node.merge(results);
// TODO: move code to coverage model
var sources = rootNode.getAll(Metric.MODULE)
.stream()
.filter(ModuleNode.class::isInstance)
.map(ModuleNode.class::cast)
.map(ModuleNode::getSources)
.flatMap(Collection::stream)
.collect(Collectors.toSet());
sources.addAll(getSourceDirectoriesPaths());
var action = reporter.publishAction(getActualId(), getName(), getIcon(), rootNode, run,
workspace, taskListener, getQualityGates(), getScm(), getSourceDirectoriesPaths(),
workspace, taskListener, getQualityGates(), getScm(), sources,
getSourceCodeEncoding(), getSourceCodeRetention(), resultHandler);
if (!skipPublishingChecks) {
var checksPublisher = new CoverageChecksPublisher(action, rootNode, getChecksName(), getChecksAnnotationScope());
Expand Down