Skip to content

Revert version of j2html to 1.4.0 #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uhafner merged 2 commits into from
Apr 18, 2026
+26 −12
Merged

Revert version of j2html to 1.4.0 #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37dc1a8
Revert version of j2html to 1.4.0
uhafner Apr 18, 2026
e6f1a42
Replace Jackson 2 references with Jackson 3
uhafner Apr 18, 2026
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
4 changes: 3 additions & 1 deletion plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>echarts-api</artifactId>
<version>6.0.0-1279.v4e95ca_f54783</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
Expand All @@ -133,6 +134,7 @@
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>data-tables-api</artifactId>
<version>2.3.7-1556.vb_8e745408397</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
Expand All @@ -141,7 +143,7 @@
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>plugin-util-api</artifactId>
<version>7.1320.v684dd26fca_19</version>
<version>7.1330.v47b_46ee2047a_</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
Expand Down
6 changes: 3 additions & 3 deletions plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageBuildAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import edu.hm.hafner.coverage.Metric;
import edu.hm.hafner.coverage.Node;
import edu.hm.hafner.coverage.Value;
import edu.hm.hafner.echarts.JacksonFacade;
import edu.hm.hafner.util.FilteredLog;
import edu.hm.hafner.util.VisibleForTesting;
import edu.umd.cs.findbugs.annotations.NonNull;
Expand All @@ -24,6 +23,7 @@
import java.util.TreeSet;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import tools.jackson.databind.ObjectMapper;

import org.kohsuke.stapler.StaplerProxy;
import hudson.Functions;
Expand Down Expand Up @@ -697,11 +697,11 @@
}

private String createCoverageModel(final String configuration) {
return new JacksonFacade().toJson(new TrendChartFactory().createChartModel(configuration, this));
return new ObjectMapper().writeValueAsString(new TrendChartFactory().createChartModel(configuration, this));
}

private String createMetricsModel(final String configuration) {
return new JacksonFacade().toJson(new TrendChartFactory().createMetricsModel(configuration, this));
return new ObjectMapper().writeValueAsString(new TrendChartFactory().createMetricsModel(configuration, this));

Check warning on line 704 in plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageBuildAction.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 700-704 are not covered by tests
}

@NonNull
Expand Down
26 changes: 19 additions & 7 deletions plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
package io.jenkins.plugins.coverage.metrics.steps;

import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ObjectNode;
import tools.jackson.core.JacksonException;

import edu.hm.hafner.coverage.Metric;
import edu.hm.hafner.coverage.Value;
import edu.hm.hafner.echarts.ChartModelConfiguration;
import edu.hm.hafner.echarts.JacksonFacade;
import edu.hm.hafner.echarts.line.LinesChartModel;

import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import tools.jackson.core.JacksonException;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ObjectNode;

import io.jenkins.plugins.coverage.metrics.charts.CoverageTrendChart;
import io.jenkins.plugins.coverage.metrics.charts.MetricsTrendChart;
Expand All @@ -27,7 +25,6 @@
* @author Ullrich Hafner
*/
class TrendChartFactory {
private static final JacksonFacade JACKSON = new JacksonFacade();
static final Set<Metric> DEFAULT_TREND_METRICS = Set.of(
Metric.LINE, Metric.BRANCH,
Metric.MUTATION, Metric.TEST_STRENGTH,
Expand Down Expand Up @@ -62,7 +59,22 @@
}

private boolean useLines(final String configuration) {
return JACKSON.getBoolean(configuration, "useLines", false);
return getBoolean(configuration, "useLines", false);
}

private boolean getBoolean(final String json, final String property, final boolean defaultValue) {
try {
var node = new ObjectMapper().readValue(json, ObjectNode.class);
var typeNode = node.get(property);
if (typeNode != null) {

Check warning on line 69 in plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java

View workflow job for this annotation

GitHub Actions / Quality Monitor - Quality gates failed

Partially covered line 

Line 69 is only partially covered, one branch is missing

Check warning on line 69 in plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java

View workflow job for this annotation

GitHub Actions / Quality Monitor - Quality gates failed

Partially covered line 

Line 69 is only partially covered, one branch is missing

Check warning on line 69 in plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line 

Line 69 is only partially covered, one branch is missing
return typeNode.asBoolean(defaultValue);
}
}
catch (JacksonException exception) {

Check warning on line 73 in plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java

View workflow job for this annotation

GitHub Actions / Quality Monitor - Quality gates failed

Not covered lines 

Lines 70-73 are not covered by tests

Check warning on line 73 in plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java

View workflow job for this annotation

GitHub Actions / Quality Monitor - Quality gates failed

Not covered lines 

Lines 70-73 are not covered by tests

Check warning on line 73 in plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/TrendChartFactory.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 70-73 are not covered by tests
// ignore
}

return defaultValue;
}

Set<Metric> getVisibleMetrics(final String configuration) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jvnet.hudson.plugins</groupId>
<artifactId>analysis-pom</artifactId>
<version>12.3140.v667559b_d0470</version>
<version>12.3159.v1734d34dfb_fc</version>
<relativePath/>
</parent>

Expand Down
Loading