commit 75cd4e69c65e2f9ea0312b383de73aa84940e229
author georg.henzler <georg.henzler@netcentric.biz> Fri Jul 03 03:28:04 2020 +0200
committer georg.henzler <georg.henzler@netcentric.biz> Fri Jul 03 07:43:53 2020 +0200
tree 399071966cb94be798102dfe04f20a5752917b6b
parent da6061d2d76b5926b77b82a65b8d344b30b66346

FELIX-6246 null check for escapeHtml and better tooltip

healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java

diff --git a/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java b/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java
index 8b0477c..6b5c7bb 100644
--- a/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java
+++ b/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultHtmlSerializer.java
@@ -23,6 +23,7 @@
 import java.io.StringWriter;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -30,8 +31,12 @@
 import org.apache.felix.hc.api.Result;
 import org.apache.felix.hc.api.ResultLog.Entry;
 import org.apache.felix.hc.api.execution.HealthCheckExecutionResult;
+import org.apache.felix.hc.api.execution.HealthCheckMetadata;
 import org.apache.felix.hc.core.impl.servlet.HealthCheckExecutorServlet.Param;
 import org.apache.felix.hc.core.impl.util.lang.StringUtils;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentConstants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 
@@ -70,7 +75,8 @@
             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()) + "\">");
-            writer.print("<td><p title=\"" + escapeHtml(executionResult.getHealthCheckMetadata().getName()) + "\">"
+            String tooltipHint = getTooltipHint(executionResult.getHealthCheckMetadata());
+            writer.print("<td><p title=\"" + escapeHtml(tooltipHint) + "\">"
                     + escapeHtml(executionResult.getHealthCheckMetadata().getTitle()) + "");
             if (hasTags) {
                 writer.println("<br/><span style='color:gray'>" + escapeHtml(String.join(", ", tags)) + "</span>");
@@ -127,6 +133,20 @@
 
     }
 
+    private String getTooltipHint(HealthCheckMetadata healthCheckMetadata) {
+        List<String> hints = new ArrayList<>();
+        ServiceReference<?> serviceReference = healthCheckMetadata.getServiceReference();
+        Object compName = serviceReference.getProperty(ComponentConstants.COMPONENT_NAME);
+        if(compName != null) {
+            hints.add("Component Name: "+compName);
+        }
+        Bundle bundle = serviceReference.getBundle();
+        if(bundle != null) {
+            hints.add("Bundle: "+bundle.getSymbolicName());
+        }
+        return String.join(" ", hints);
+    }
+
     private String getClassForStatus(final Result.Status status) {
         return "status" + status.name();
     }
@@ -164,6 +184,9 @@
     }
 
     private String escapeHtml(String text) {
+        if(text == null) {
+            return null;
+        }
         return text
                 .replace("&", "&amp;")
                 .replace("\"", "&quot;")