Skip to content

Commit 236f857

Browse files
authored
Merge pull request #580 from jenkinsci/dependabot/maven/org.jvnet.hudson.plugins-analysis-pom-11.2958.v63511c4c1160
Bump org.jvnet.hudson.plugins:analysis-pom from 11.2934.va_a_d795c46a_7b_ to 11.2958.v63511c4c1160
2 parents 7d9a234 + 0a5cf46 commit 236f857

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ public Optional<Delta> calculateCodeDeltaToReference(final Run<?, ?> referenceBu
9595
*/
9696
public Set<FileChanges> getCoverageRelevantChanges(final Delta delta) {
9797
return delta.getFileChangesMap().values().stream()
98-
.filter(fileChange -> fileChange.getFileEditType().equals(FileEditType.MODIFY)
99-
|| fileChange.getFileEditType().equals(FileEditType.ADD)
100-
|| fileChange.getFileEditType().equals(FileEditType.RENAME))
98+
.filter(fileChange -> fileChange.getFileEditType() == FileEditType.MODIFY
99+
|| fileChange.getFileEditType() == FileEditType.ADD
100+
|| fileChange.getFileEditType() == FileEditType.RENAME)
101101
.collect(Collectors.toSet());
102102
}
103103

@@ -156,7 +156,7 @@ public Map<String, String> createOldPathMapping(final Node root, final Node refe
156156
Set<String> oldReportPaths = new HashSet<>(referenceRoot.getFiles());
157157
// mapping between reference and current file paths which initially contains the SCM paths with renamings
158158
Map<String, String> oldPathMapping = changes.entrySet().stream()
159-
.filter(entry -> FileEditType.RENAME.equals(entry.getValue().getFileEditType()))
159+
.filter(entry -> FileEditType.RENAME == entry.getValue().getFileEditType())
160160
.collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getOldFileName()));
161161
// the SCM paths and the coverage report paths from the reference
162162
Map<String, String> oldScmToOldReportPathMapping
@@ -246,7 +246,8 @@ private void removeMissingReferences(final Map<String, String> oldPathMapping, f
246246
.map(Entry::getKey)
247247
.collect(Collectors.toSet());
248248
if (!pathsWithEmptyReferences.isEmpty()) {
249-
pathsWithEmptyReferences.forEach(oldPathMapping::remove); // remove entries which represent missing reference files
249+
pathsWithEmptyReferences.forEach(
250+
oldPathMapping::remove); // remove entries which represent missing reference files
250251
var skippedFiles = pathsWithEmptyReferences.stream()
251252
.limit(20) // prevent log overflows
252253
.collect(Collectors.joining("," + System.lineSeparator()));
@@ -282,7 +283,8 @@ static void verifyOldPathMapping(final Map<String, String> oldPathMapping, final
282283
.limit(20) // prevent log overflows
283284
.map(entry -> "new: '%s' - former: '%s'".formatted(entry.getKey(), entry.getValue()))
284285
.collect(Collectors.joining("," + System.lineSeparator()));
285-
var errorMessage = CODE_DELTA_TO_COVERAGE_DATA_MISMATCH_ERROR_TEMPLATE + System.lineSeparator() + mismatches;
286+
var errorMessage =
287+
CODE_DELTA_TO_COVERAGE_DATA_MISMATCH_ERROR_TEMPLATE + System.lineSeparator() + mismatches;
286288
throw new IllegalStateException(errorMessage);
287289
}
288290
log.logInfo("Successfully verified that the coverage data matches with the code delta");

plugin/src/test/java/io/jenkins/plugins/coverage/metrics/color/ColorProviderFactoryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ void shouldCreateColorProviderWithJenkinsColors() {
3333

3434
for (CoverageColorPalette color : CoverageColorPalette.values()) {
3535
assertThat(colorProvider.containsColorId(color.getColorId())).isTrue();
36-
if (!color.getColorId().equals(ColorId.BLACK) && !color.getColorId()
37-
.equals(ColorId.WHITE)) { // skip set default color
36+
if (color.getColorId() != ColorId.BLACK
37+
&& color.getColorId() != ColorId.WHITE) { // skip set default color
3838
assertThat(colorProvider.getDisplayColorsOf(color.getColorId()))
3939
.satisfies(displayColor -> assertThat(displayColor.getFillColor()).isEqualTo(TEST_COLOR));
4040
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,14 +241,14 @@ private void verifyModifiedLinesCoverage(final CoverageBuildAction action) {
241241

242242
private void verifyIndirectCoverageChanges(final CoverageBuildAction action) {
243243
assertThat(action.getAllValues(Baseline.INDIRECT))
244-
.filteredOn(coverage -> coverage.getMetric().equals(LINE))
244+
.filteredOn(coverage -> coverage.getMetric() == LINE)
245245
.first()
246246
.isInstanceOfSatisfying(Coverage.class, coverage -> {
247247
assertThat(coverage.getCovered()).isEqualTo(4);
248248
assertThat(coverage.getMissed()).isEqualTo(0);
249249
});
250250
assertThat(action.getAllValues(Baseline.INDIRECT))
251-
.filteredOn(coverage -> coverage.getMetric().equals(BRANCH))
251+
.filteredOn(coverage -> coverage.getMetric() == BRANCH)
252252
.isEmpty();
253253
}
254254

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jvnet.hudson.plugins</groupId>
77
<artifactId>analysis-pom</artifactId>
8-
<version>11.2934.va_a_d795c46a_7b_</version>
8+
<version>11.2958.v63511c4c1160</version>
99
<relativePath/>
1010
</parent>
1111

0 commit comments

Comments
 (0)