You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2017/05/03 14:30:28 UTC
svn commit: r1793654 -
/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java
Author: justin
Date: Wed May 3 14:30:28 2017
New Revision: 1793654
URL: http://svn.apache.org/viewvc?rev=1793654&view=rev
Log:
SLING-6806 - move tags in HTML output to part of the first column
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java
Modified: sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java?rev=1793654&r1=1793653&r2=1793654&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java Wed May 3 14:30:28 2017
@@ -81,14 +81,22 @@ public class ResultHtmlSerializer {
final DateFormat dfLong = new SimpleDateFormat("yyyy-MM-dd HH:mm");
writer.println("<table id=\"healthCheckResults\" cellspacing=\"0\">");
- writer.println("<thead><tr><th>Health Check</th><th>Tags</th><th>Status</th><th>Log</th><th>Finished At</th><th>Execution Time</th></tr></thead>");
+ writer.println("<thead><tr><th>Health Check</th><th>Status</th><th>Log</th><th>Finished At</th><th>Execution Time</th></tr></thead>");
for (HealthCheckExecutionResult executionResult : executionResults) {
Result result = executionResult.getHealthCheckResult();
- writer.println("<tr class=\"" + getClassForStatus(result.getStatus()) + "\" "
- + "title=\"Tags: " + StringEscapeUtils.escapeHtml(StringUtils.join(executionResult.getHealthCheckMetadata().getTags(), ",")) + "\">");
- writer.println("<td><span title=\"" + StringEscapeUtils.escapeHtml(executionResult.getHealthCheckMetadata().getName()) + "\">"
- + StringEscapeUtils.escapeHtml(executionResult.getHealthCheckMetadata().getTitle()) + "</span></td>");
- writer.println("<td style='font-weight:bold;'>" + StringEscapeUtils.escapeHtml(StringUtils.join(executionResult.getHealthCheckMetadata().getTags(), ", ")) + "</td>");
+ List<String> tags = executionResult.getHealthCheckMetadata().getTags();
+ boolean hasTags = tags != null && tags.size() > 0 && StringUtils.isNotBlank(tags.get(0));
+ writer.print("<tr class=\"" + getClassForStatus(result.getStatus()) + "\" ");
+ if (hasTags) {
+ writer.print("title=\"Tags: " + StringEscapeUtils.escapeHtml(StringUtils.join(tags, ",")) + "\"");
+ }
+ writer.println(">");
+ writer.print("<td><p title=\"" + StringEscapeUtils.escapeHtml(executionResult.getHealthCheckMetadata().getName()) + "\">"
+ + StringEscapeUtils.escapeHtml(executionResult.getHealthCheckMetadata().getTitle()) + "</p>");
+ if (hasTags) {
+ writer.println("<span>Tags: " + StringEscapeUtils.escapeHtml(StringUtils.join(tags, ", ")) + "</span>");
+ }
+ writer.println("</td>");
writer.println("<td style='font-weight:bold;'>" + StringEscapeUtils.escapeHtml(result.getStatus().toString()) + "</td>");
writer.println("<td>");
boolean isFirst = true;