diff --git a/core/src/main/java/nl/tudelft/ewi/auta/core/model/Report.java b/core/src/main/java/nl/tudelft/ewi/auta/core/model/Report.java index 6844e6883fd49918e03d43d9c3d886a34f7ee13c..267836c93da9ede87d2247b9b6f376bfee3abe85 100644 --- a/core/src/main/java/nl/tudelft/ewi/auta/core/model/Report.java +++ b/core/src/main/java/nl/tudelft/ewi/auta/core/model/Report.java @@ -59,52 +59,44 @@ public class Report extends HashMap<String, Object> { */ @SuppressWarnings("unchecked") public String toPrettyString() { - try { - var staticReport = new StringBuilder(); - var staticResults = (List<Map<String, Object>>) this.get("static"); - - for (var files : staticResults) { - StringBuilder metricString = new StringBuilder(); - StringBuilder warningString = new StringBuilder(); - StringBuilder failureString = new StringBuilder(); - - var fileName = (String) files.get("filename"); - var fileReport = (List<Map<String, Object>>) files.get("report"); - - for (var metric : fileReport) { - if (metric.containsKey("error")) { - continue; - } - warningString.append(this.getWarningOrFailureString("warnings", metric)); - failureString.append(this.getWarningOrFailureString("failures", metric)); - } + var staticReport = new StringBuilder(); + var staticResults = (List<Map<String, Object>>) this.get("static"); - //Only append metric results if there are failures or warnings - if (warningString.length() + failureString.length() > 0) { - staticReport.append("<pre style='background-color:#fff; line-height:10px'>") - .append(fileName).append('\n'); - if (warningString.length() > 0) { - staticReport.append(" <b>warnings:</b>") - .append('\n') - .append(warningString); - } - if (failureString.length() > 0) { - staticReport.append(" <b>failures:</b>") - .append('\n') - .append(failureString); - } - staticReport.append(metricString).append("</pre>"); - } + for (var files : staticResults) { + StringBuilder metricString = new StringBuilder(); + StringBuilder warningString = new StringBuilder(); + StringBuilder failureString = new StringBuilder(); + var fileName = (String) files.get("filename"); + var fileReport = (List<Map<String, Object>>) files.get("report"); + + for (var metric : fileReport) { + if (metric.containsKey("error")) { + continue; + } + warningString.append(this.getWarningOrFailureString("warnings", metric)); + failureString.append(this.getWarningOrFailureString("failures", metric)); } - return staticReport.toString(); - } catch (NullPointerException ex) { - logger.error("NullPointer exception occurred while printing report", ex); - if (this.get("static") != null) { - return this.get("static").toString(); + + //Only append metric results if there are failures or warnings + if (warningString.length() + failureString.length() > 0) { + staticReport.append("<pre style='background-color:#fff; line-height:10px'>") + .append(fileName).append('\n'); + if (warningString.length() > 0) { + staticReport.append(" <b>warnings:</b>") + .append('\n') + .append(warningString); + } + if (failureString.length() > 0) { + staticReport.append(" <b>failures:</b>") + .append('\n') + .append(failureString); + } + staticReport.append(metricString).append("</pre>"); } - return "Invalid report"; + } + return staticReport.toString(); } /**