svn commit: r1853163 - in /felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet: ResultJsonSerializer.java ResultTxtVerboseSerializer.java

[ghenzler]

Author: ghenzler
Date: Thu Feb  7 21:52:07 2019
New Revision: 1853163

URL: http://svn.apache.org/viewvc?rev=1853163&view=rev
Log:
FELIX-6054 use getTitle() for json and verbose.txt serializers (same as html 
serializer is already doing)

Modified:
    
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializer.java
    
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java

Modified: 
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializer.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializer.java?rev=1853163&r1=1853162&r2=1853163&view=diff
==============================================================================
--- 
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializer.java
 (original)
+++ 
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultJsonSerializer.java
 Thu Feb  7 21:52:07 2019
@@ -57,7 +57,7 @@ public class ResultJsonSerializer {
                 writeResult(healthCheckResult, includeDebug, jsonWriter);
             }
             jsonWriter.endArray();
-            jsonWriter.endObject();            
+            jsonWriter.endObject();
         } catch(IOException e) {
             LOG.error("Could not serialise health check result: e="+e, e);
             writer.write("{error:'"+e.getMessage()+"'}");
@@ -75,7 +75,7 @@ public class ResultJsonSerializer {
     private void writeResult(final HealthCheckExecutionResult 
healthCheckResult, boolean includeDebug, JSONWriter jsonWriter) throws 
IOException {
 
         jsonWriter.object()
-            
.key("name").value(healthCheckResult.getHealthCheckMetadata().getName())
+            
.key("name").value(healthCheckResult.getHealthCheckMetadata().getTitle())
             
.key("status").value(healthCheckResult.getHealthCheckResult().getStatus().toString())
 
             .key("timeInMs").value(healthCheckResult.getElapsedTimeInMs())
             .key("finishedAt").value(new 
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").format(healthCheckResult.getFinishedAt()))
 ;

Modified: 
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java?rev=1853163&r1=1853162&r2=1853163&view=diff
==============================================================================
--- 
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java
 (original)
+++ 
felix/trunk/healthcheck/core/src/main/java/org/apache/felix/hc/core/impl/servlet/ResultTxtVerboseSerializer.java
 Thu Feb  7 21:52:07 2019
@@ -92,7 +92,7 @@ public class ResultTxtVerboseSerializer
     private void appendVerboseTxtForResult(StringBuilder resultStr, 
HealthCheckExecutionResult healthCheckResult, boolean includeDebug,
             DateFormat dfShort) {
 
-        String wrappedName = 
WordUtils.wrap(healthCheckResult.getHealthCheckMetadata().getName(), 
colWidthName);
+        String wrappedName = 
WordUtils.wrap(healthCheckResult.getHealthCheckMetadata().getTitle(), 
colWidthName);
 
         String relevantNameStringForPadding = 
StringUtils.contains(wrappedName, "\n") ? 
StringUtils.substringAfterLast(wrappedName, "\n")
                 : wrappedName;