Skip to content

Commit deb2842

Browse files
uhafneruhafner
committed
Fix some warnings.
1 parent df77c07 commit deb2842

File tree

6 files changed

+30
-39
lines changed

6 files changed

+30
-39
lines changed

‎plugin/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>io.jenkins.plugins</groupId>
1313
<artifactId>coverage</artifactId>
14-
<version>${revision}${changelist}</version>
14+
<version>2.0.0-SNAPSHOT</version>
1515
<packaging>hpi</packaging>
1616

1717
<name>Coverage Plugin</name>
@@ -20,16 +20,14 @@
2020
<url>https://github.com/jenkinsci/coverage-plugin</url>
2121

2222
<properties>
23-
<revision>2.0.0</revision>
24-
<changelist>-SNAPSHOT</changelist>
2523
<gitHubRepo>jenkinsci/coverage-plugin</gitHubRepo>
2624

2725
<!-- Library Dependencies Versions -->
2826
<coverage-model.version>0.53.0</coverage-model.version>
2927
<jsoup.version>1.18.3</jsoup.version>
3028

3129
<!-- Jenkins Plug-in Dependencies Versions -->
32-
<git-forensics.version>2.2.1</git-forensics.version>
30+
<git-forensics.version>3.1.0</git-forensics.version>
3331

3432
<!-- Test Library Dependencies Versions -->
3533
<xmlunit.version>2.10.0</xmlunit.version>

‎plugin/src/main/java/io/jenkins/plugins/coverage/metrics/charts/CoverageSeriesBuilder.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.jenkins.plugins.coverage.metrics.charts;
22

3-
import java.util.HashMap;
4-
import java.util.Map;
5-
63
import edu.hm.hafner.coverage.Metric;
74
import edu.hm.hafner.echarts.line.SeriesBuilder;
85

6+
import java.util.HashMap;
7+
import java.util.Map;
8+
99
import io.jenkins.plugins.coverage.metrics.model.Baseline;
1010
import io.jenkins.plugins.coverage.metrics.model.CoverageStatistics;
1111

@@ -34,8 +34,8 @@ protected Map<String, Double> computeSeries(final CoverageStatistics statistics)
3434
add(statistics, Metric.MCDC_PAIR, MCDC_PAIR_COVERAGE, series);
3535
add(statistics, Metric.FUNCTION_CALL, FUNCTION_CALL_COVERAGE, series);
3636

37-
if (statistics.containsValue(Baseline.PROJECT, Metric.MCDC_PAIR)
38-
|| statistics.containsValue(Baseline.PROJECT, Metric.FUNCTION_CALL)) {
37+
if (statistics.containsValue(Metric.MCDC_PAIR, Baseline.PROJECT)
38+
|| statistics.containsValue(Metric.FUNCTION_CALL, Baseline.PROJECT)) {
3939
// Method coverage is only relevant if MC/DC pair or function call coverage is available
4040
add(statistics, Metric.METHOD, METHOD_COVERAGE, series);
4141
}
@@ -45,7 +45,7 @@ protected Map<String, Double> computeSeries(final CoverageStatistics statistics)
4545

4646
private void add(final CoverageStatistics statistics, final Metric metric, final String chartId,
4747
final Map<String, Double> series) {
48-
if (statistics.containsValue(Baseline.PROJECT, metric)) {
48+
if (statistics.containsValue(metric, Baseline.PROJECT)) {
4949
series.put(chartId, statistics.roundValue(Baseline.PROJECT, metric));
5050
}
5151
}

‎plugin/src/main/java/io/jenkins/plugins/coverage/metrics/model/CoverageStatistics.java

+8-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package io.jenkins.plugins.coverage.metrics.model;
22

3-
import java.util.List;
4-
import java.util.NavigableMap;
5-
import java.util.NoSuchElementException;
6-
import java.util.Optional;
7-
83
import edu.hm.hafner.coverage.Difference;
94
import edu.hm.hafner.coverage.Metric;
105
import edu.hm.hafner.coverage.Value;
116

7+
import java.util.List;
8+
import java.util.NoSuchElementException;
9+
import java.util.Optional;
10+
1211
/**
1312
* Provides statistics for values and differences for all Base the different mappings of coverage metric and baseline to actual values.
1413
*/
@@ -110,21 +109,17 @@ public double roundValue(final Metric metric) {
110109
return roundValue(Baseline.PROJECT, metric);
111110
}
112111

113-
private Optional<Value> getValue(final Metric metric, final NavigableMap<Metric, Difference> mapping) {
114-
return Optional.ofNullable(mapping.get(metric));
115-
}
116-
117112
/**
118113
* Returns whether a value for the specified metric and baseline is available.
119114
*
120-
* @param baseline
121-
* the baseline of the value
122115
* @param metric
123116
* the metric of the value
117+
* @param baseline
118+
* the baseline of the value
124119
*
125120
* @return {@code true}, if a value is available, {@code false} otherwise
126121
*/
127-
public boolean containsValue(final Baseline baseline, final Metric metric) {
122+
public boolean containsValue(final Metric metric, final Baseline baseline) {
128123
return getValue(baseline, metric).isPresent();
129124
}
130125

@@ -136,8 +131,7 @@ public boolean containsValue(final Baseline baseline, final Metric metric) {
136131
*
137132
* @return {@code true}, if a value is available, {@code false} otherwise
138133
*/
139-
// FIXME: reoder overloaded name
140134
public boolean containsValue(final Metric metric) {
141-
return containsValue(Baseline.PROJECT, metric);
135+
return containsValue(metric, Baseline.PROJECT);
142136
}
143137
}

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

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import edu.hm.hafner.util.FilteredLog;
1313
import edu.hm.hafner.util.VisibleForTesting;
1414
import edu.umd.cs.findbugs.annotations.NonNull;
15+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1516

1617
import java.io.Serial;
1718
import java.util.ArrayList;
@@ -78,6 +79,7 @@ public final class CoverageBuildAction extends BuildAction<Node> implements Stap
7879

7980
/** The delta of this build's coverages with respect to the reference build. */
8081
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
82+
@SuppressFBWarnings(value = "NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", justification = "Not used anymore")
8183
private transient NavigableMap<Metric, Difference> difference;
8284
private /* almost final */ List<Difference> differences; // since 2.0.0
8385

@@ -86,6 +88,7 @@ public final class CoverageBuildAction extends BuildAction<Node> implements Stap
8688

8789
/** The coverage delta of the associated change request with respect to the reference build. */
8890
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
91+
@SuppressFBWarnings(value = "NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", justification = "Not used anymore")
8992
private transient NavigableMap<Metric, Difference> modifiedLinesCoverageDifference;
9093
private /* almost final */ List<Difference> modifiedLinesDifferences; // since 2.0.0
9194

@@ -94,6 +97,7 @@ public final class CoverageBuildAction extends BuildAction<Node> implements Stap
9497

9598
/** The coverage delta of the modified lines. */
9699
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
100+
@SuppressFBWarnings(value = "NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", justification = "Not used anymore")
97101
private transient NavigableMap<Metric, Difference> modifiedFilesCoverageDifference;
98102
private /* almost final */ List<Difference> modifiedFilesDifferences; // since 2.0.0
99103

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package io.jenkins.plugins.coverage.metrics.steps;
22

3-
import java.util.List;
4-
import java.util.Optional;
5-
import java.util.Set;
6-
3+
import edu.hm.hafner.coverage.Coverage;
74
import edu.hm.hafner.coverage.Difference;
85
import edu.hm.hafner.coverage.FileNode;
96
import edu.hm.hafner.coverage.Metric;
107
import edu.hm.hafner.coverage.Node;
118
import edu.hm.hafner.coverage.Value;
129
import edu.hm.hafner.util.FilteredLog;
1310

11+
import java.util.List;
12+
import java.util.Optional;
13+
import java.util.Set;
14+
1415
import hudson.FilePath;
1516
import hudson.model.Run;
1617
import hudson.model.TaskListener;
@@ -197,7 +198,7 @@ private boolean hasModifiedLinesCoverage(final Node modifiedLinesCoverageRoot) {
197198
}
198199

199200
private boolean hasLineCoverageSet(final Value value) {
200-
return ((edu.hm.hafner.coverage.Coverage) value).isSet();
201+
return value instanceof Coverage coverage && coverage.isSet();
201202
}
202203

203204
private Optional<CoverageBuildAction> getReferenceBuildAction(final Run<?, ?> build, final String id,

‎plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/CoverageXmlStreamITest.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.jenkins.plugins.coverage.metrics.steps;
1+
package io.jenkins.plugins.coverage.metrics.steps; // NOPMD
22

33
import org.apache.commons.lang3.StringUtils;
44
import org.junit.jupiter.api.Test;
@@ -69,15 +69,9 @@ void shouldRestoreAction() throws IOException {
6969
Assertions.assertThat(restored).isInstanceOfSatisfying(CoverageBuildAction.class,
7070
a -> Assertions.assertThat(a.getAllValues(Baseline.PROJECT))
7171
.map(Object::toString).containsExactlyInAnyOrder("MODULE: 100.00% (1/1)",
72-
"PACKAGE: 75.00% (3/4)",
73-
"FILE: 100.00% (32/32)",
74-
"CLASS: 94.23% (49/52)",
75-
"METHOD: 95.79% (569/594)",
76-
"LINE: 96.35% (2164/2246)",
77-
"BRANCH: 92.92% (932/1003)",
78-
"INSTRUCTION: 96.44% (10534/10923)",
79-
"TESTS: 305",
80-
"CYCLOMATIC_COMPLEXITY: 1105",
72+
"PACKAGE: 75.00% (3/4)", "FILE: 100.00% (32/32)", "CLASS: 94.23% (49/52)",
73+
"METHOD: 95.79% (569/594)", "LINE: 96.35% (2164/2246)", "BRANCH: 92.92% (932/1003)",
74+
"INSTRUCTION: 96.44% (10534/10923)", "TESTS: 305", "CYCLOMATIC_COMPLEXITY: 1105",
8175
"LOC: 2246"));
8276
}
8377

0 commit comments

Comments
 (0)