Changed string build up for reporting

2 files changed, 6 insertions, 6 deletions

diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java
index 03013881de9..570a74a63fa 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSender.java
@@ -19,10 +19,10 @@ public class ReportSender {
         ObjectMapper om = new ObjectMapper();
         String report;
         if (hardwareDivergenceReport.isHardwareDivergenceReportEmpty()){
-            report = "{\"hardwareDivergence\": null}";
+            report = "null";
         }
         else {
-            report = "{\"hardwareDivergence\": " + om.writeValueAsString(hardwareDivergenceReport) + "}";
+            report = om.writeValueAsString(hardwareDivergenceReport);
         }
         System.out.print(report);
     }
@@ -42,7 +42,7 @@ public class ReportSender {
     private static HardwareDivergenceReport generateHardwareDivergenceReport(ArrayList<URL> nodeInfoUrls) throws IOException {
         NodeRepoJsonModel nodeRepoJsonModel = NodeRepoInfoRetriever.retrieve(nodeInfoUrls);
         ObjectMapper om = new ObjectMapper();
-        if (nodeRepoJsonModel.getHardwareDivergence() == null) {
+        if (nodeRepoJsonModel.getHardwareDivergence() == null || nodeRepoJsonModel.getHardwareDivergence().equals("null")) {
             return new HardwareDivergenceReport();
         }
         try {
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSenderTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSenderTest.java
index 1d0999f9463..48a90082417 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSenderTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/report/ReportSenderTest.java
@@ -41,7 +41,7 @@ public class ReportSenderTest {
         double memoryReadSpeedGBs = 0.1;
         benchmarkReport.setCpuCyclesPerSec(cpuCyclesPerSec);
         benchmarkReport.setMemoryReadSpeedGBs(memoryReadSpeedGBs);
-        String expectedReport = "{\"hardwareDivergence\": {\"benchmarkReport\":{\"cpuCyclesPerSec\":0.3,\"memoryReadSpeedGBs\":0.1}}}";
+        String expectedReport = "{\"benchmarkReport\":{\"cpuCyclesPerSec\":0.3,\"memoryReadSpeedGBs\":0.1}}";
         ReportSender.reportBenchmarkResults(benchmarkReport,nodeInfoUrls);
         assertEquals(expectedReport, println.toString());
     }
@@ -49,7 +49,7 @@ public class ReportSenderTest {
     @Test
     public void reportBenchmarkResults_should_should_update_already_existing_hardwareDivergence_prints_null_when_empty_benchmarkReport() throws Exception {
         BenchmarkReport benchmarkReport = new BenchmarkReport();
-        String expectedReport = "{\"hardwareDivergence\": null}";
+        String expectedReport = "null";
         ReportSender.reportBenchmarkResults(benchmarkReport, nodeInfoUrls);
         assertEquals(expectedReport, println.toString());
     }
@@ -61,7 +61,7 @@ public class ReportSenderTest {
         boolean actualIpv6Connection = false;
         specVerificationReport.setActualDiskSpaceAvailable(actualDiskSpaceAvailable);
         specVerificationReport.setActualIpv6Connection(actualIpv6Connection);
-        String expectedReport = "{\"hardwareDivergence\": {\"specVerificationReport\":{\"actualDiskSpaceAvailable\":150.0,\"actualIpv6Connection\":false},\"benchmarkReport\":{\"cpuCyclesPerSec\":0.5}}}";
+        String expectedReport = "{\"specVerificationReport\":{\"actualDiskSpaceAvailable\":150.0,\"actualIpv6Connection\":false},\"benchmarkReport\":{\"cpuCyclesPerSec\":0.5}}";
         ReportSender.reportSpecVerificationResults(specVerificationReport, nodeInfoUrls);
         assertEquals(expectedReport, println.toString());
     }