SECURITY-2836

src/main/java/com/aspectsecurity/contrast/contrastjenkins/VulnerabilityFrequencyAction.java

@@ -5,6 +5,9 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+import java.util.Map;
+
 @Getter
 @Setter
 public class VulnerabilityFrequencyAction implements Action {
@@ -37,8 +40,16 @@ public String getReport() {
         return "Vulnerability Report";
     }
 
-    public String getResultString() {
-        return result.toString();
+    public Map<String, Integer> getTraceResult() {
+        return result.getTraceResult();
+    }
+
+    public Map<String, Integer> getSeverityResult() {
+        return result.getSeverityResult();
+    }
+
+    public List<String> getSeverities() {
+        return VulnerabilityTrendHelper.SEVERITIES;
     }
 
     @Override

src/main/java/com/aspectsecurity/contrast/contrastjenkins/VulnerabilityTrendResult.java

@@ -16,27 +16,4 @@ public VulnerabilityTrendResult(Map<String, Integer> traceResult, Map<String, In
         this.traceResult = traceResult;
         this.severityResult = severityResult;
     }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("<b>Vulnerability Rule Count</b>");
-
-        for (Map.Entry<String, Integer> entry : traceResult.entrySet()) {
-            sb.append("<p>");
-            sb.append(entry.getKey()).append(": ").append(entry.getValue());
-            sb.append("</p>");
-        }
-
-        sb.append("<br/ ><b>Vulnerability Severity Count</b>");
-
-        for (String severity: VulnerabilityTrendHelper.SEVERITIES) {
-            sb.append("<p>");
-            sb.append(severity).append(": ").append(severityResult.get(severity));
-            sb.append("</p>");
-        }
-
-        return sb.toString();
-    }
 }

src/main/resources/com/aspectsecurity/contrast/contrastjenkins/VulnerabilityFrequencyAction/index.jelly

@@ -1,10 +1,22 @@
-<?jelly escape-by-default='false'?>
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <l:layout title="Vulnerability Report">
         <l:main-panel>
             <h1>Vulnerability Report</h1>
             <div>
-                ${it.resultString}
+                <b>Vulnerability Rule Count</b>
+                <ul style="list-style: none;">
+                    <j:forEach var="trace" items="${it.traceResult}">
+                        <li>${trace.key} : ${trace.value}</li>
+                    </j:forEach>
+                </ul>
+                <br/>
+                <b>Vulnerability Severity Count</b>
+                <ul style="list-style: none;">
+                    <j:forEach var="severity" items="${it.severities}">
+                        <li>${severity} : ${it.severityResult.get(severity)}</li>
+                    </j:forEach>
+                </ul>
             </div>
         </l:main-panel>
     </l:layout>

src/main/resources/com/aspectsecurity/contrast/contrastjenkins/VulnerabilityTrendProjectAction/index.jelly

@@ -1,11 +1,3 @@
-<?jelly escape-by-default='false'?>
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-    <l:layout title="Vulnerability Report">
-        <l:main-panel>
-            <h1>Vulnerability Report</h1>
-            <div>
-                ${it.resultString}
-            </div>
-        </l:main-panel>
-    </l:layout>
 </j:jelly>