Improve the layout and design of the coverage columns

plugin/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>5.26.0</version>
+    <version>5.28.0</version>
     <relativePath />
   </parent>
 
@@ -26,14 +26,13 @@
     <trove4j.version>3.0.3</trove4j.version>
     <saxon-he.version>11.3</saxon-he.version>
 
-    <plugin-util-api.version>2.16.0</plugin-util-api.version>
-    <forensics-api.version>1.13.0</forensics-api.version>
+    <forensics-api.version>1.15.1</forensics-api.version>
     <pull-request-monitoring.version>1.7.8</pull-request-monitoring.version>
     <json-unit-assertj.version>2.35.0</json-unit-assertj.version>
     <streamex.version>0.8.1</streamex.version>
     <gson.version>2.9.0</gson.version>
     <jsoup.version>1.15.1</jsoup.version>
-    <prism-api.version>1.26.0-2</prism-api.version>
+    <prism-api.version>1.28.0-2</prism-api.version>
     <docker-fixtures.version>1.11</docker-fixtures.version>
     <testcontainers.version>1.17.2</testcontainers.version>
   </properties>
@@ -123,6 +122,7 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>data-tables-api</artifactId>
+      <version>1.12.1-1</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
@@ -158,9 +158,8 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
-      <version>${plugin-util-api.version}</version>
+      <classifier>tests</classifier>
       <scope>test</scope>
-      <type>test-jar</type>
     </dependency>
     <!-- Test Dependencies -->
     <dependency>
@@ -239,7 +238,7 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>git-forensics</artifactId>
-      <version>1.8.0</version>
+      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -293,6 +292,13 @@
           <entryPointClassPackage>io.jenkins.plugins.coverage.model</entryPointClassPackage>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.revapi</groupId>
+        <artifactId>revapi-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

plugin/src/main/java/io/jenkins/plugins/coverage/model/ChangeCoverageTableModel.java

@@ -0,0 +1,120 @@
+package io.jenkins.plugins.coverage.model;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.math.Fraction;
+
+import hudson.Functions;
+
+import io.jenkins.plugins.datatables.DetailedCell;
+import io.jenkins.plugins.datatables.TableConfiguration;
+import io.jenkins.plugins.datatables.TableConfiguration.SelectStyle;
+
+/**
+ * {@link CoverageTableModel} implementation for visualizing the change coverage.
+ *
+ * @since 3.0.0
+ */
+class ChangeCoverageTableModel extends CoverageTableModel {
+    private final CoverageNode changeRoot;
+
+    /**
+     * Creates a change coverage table model.
+     *
+     * @param id
+     *         The ID of the table
+     * @param root
+     *         The root of the origin coverage tree
+     * @param changeRoot
+     *         The root of the change coverage tree
+     * @param renderer
+     *         the renderer to use for the file names
+     */
+    ChangeCoverageTableModel(final String id, final CoverageNode root, final CoverageNode changeRoot,
+            final RowRenderer renderer) {
+        super(id, root, renderer);
+
+        this.changeRoot = changeRoot;
+    }
+
+    @Override
+    public TableConfiguration getTableConfiguration() {
+        return super.getTableConfiguration().select(SelectStyle.SINGLE);
+    }
+
+    @Override
+    public List<Object> getRows() {
+        Locale browserLocale = Functions.getCurrentLocale();
+        return changeRoot.getAllFileCoverageNodes().stream()
+                .map(file -> new ChangeCoverageRow(
+                        getOriginalNode(file), file, browserLocale, getRenderer()))
+                .collect(Collectors.toList());
+    }
+
+    private FileCoverageNode getOriginalNode(final FileCoverageNode fileNode) {
+        Optional<FileCoverageNode> reference = getRoot().getAllFileCoverageNodes().stream()
+                .filter(node -> node.getPath().equals(fileNode.getPath())
+                        && node.getName().equals(fileNode.getName()))
+                .findFirst();
+        return reference.orElse(fileNode); // return this as fallback to prevent exceptions
+    }
+
+    /**
+     * UI row model for the change coverage details table.
+     *
+     * @since 3.0.0
+     */
+    private static class ChangeCoverageRow extends CoverageRow {
+        private final FileCoverageNode changedFileNode;
+
+        ChangeCoverageRow(final FileCoverageNode root, final FileCoverageNode changedFileNode,
+                final Locale browserLocale, final RowRenderer renderer) {
+            super(root, browserLocale, renderer);
+
+            this.changedFileNode = changedFileNode;
+        }
+
+        @Override
+        public DetailedCell<?> getLineCoverage() {
+            Coverage coverage = changedFileNode.getCoverage(CoverageMetric.LINE);
+            return createColoredCoverageColumn(coverage, "The line change coverage");
+        }
+
+        @Override
+        public DetailedCell<?> getBranchCoverage() {
+            Coverage coverage = changedFileNode.getCoverage(CoverageMetric.BRANCH);
+            return createColoredCoverageColumn(coverage, "The branch change coverage");
+        }
+
+        @Override
+        public DetailedCell<?> getLineCoverageDelta() {
+            return createColoredChangeCoverageDeltaColumn(CoverageMetric.LINE);
+        }
+
+        @Override
+        public DetailedCell<?> getBranchCoverageDelta() {
+            return createColoredChangeCoverageDeltaColumn(CoverageMetric.BRANCH);
+        }
+
+        @Override
+        public int getLoc() {
+            return (int) changedFileNode.getChangedCodeLines().stream()
+                    .filter(line -> changedFileNode.getCoveragePerLine().containsKey(line))
+                    .count();
+        }
+
+        private DetailedCell<?> createColoredChangeCoverageDeltaColumn(final CoverageMetric coverageMetric) {
+            Coverage changeCoverage = changedFileNode.getCoverage(coverageMetric);
+            if (changeCoverage.isSet()) {
+                Fraction delta = changeCoverage.getCoveredFraction()
+                        .subtract(getRoot().getCoverage(coverageMetric).getCoveredFraction());
+                return createColoredCoverageDeltaColumn(CoveragePercentage.valueOf(delta),
+                        "The change coverage within the file against the total file coverage");
+            }
+            return NO_COVERAGE;
+        }
+    }
+}