REST API option to add report data in CDATA blocks or not.

Author: costas80

jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/rest/RestValidationController.java

@@ -85,7 +85,8 @@ public ResponseEntity<StreamingResponseBody> validate(
                     if (MediaType.APPLICATION_JSON.equals(reportType)) {
                         writeReportAsJson(outputStream, report, domainConfig);
                     } else {
-                        fileManager.saveReport(report, outputStream, domainConfig);
+                        var wrapInputInCDATA = Objects.requireNonNullElse(in.getWrapReportDataInCDATA(), true);
+                        fileManager.saveReport(report, outputStream, domainConfig, wrapInputInCDATA);
                     }
                 });
     }
@@ -154,7 +155,8 @@ public Output[] validateMultiple(
             Output output = new Output();
             var report = executeValidationProcess(input, domainConfig);
             try (var bos = new ByteArrayOutputStream()) {
-                fileManager.saveReport(report, bos, domainConfig);
+                var wrapInputInCDATA = Objects.requireNonNullElse(input.getWrapReportDataInCDATA(), true);
+                fileManager.saveReport(report, bos, domainConfig, wrapInputInCDATA);
                 output.setReport(Base64.getEncoder().encodeToString(bos.toByteArray()));
                 outputs.add(output);
             } catch (IOException e) {

jsonvalidator-service/src/main/java/eu/europa/ec/itb/json/rest/model/Input.java

@@ -29,6 +29,8 @@ public class Input {
     private Boolean locationAsPointer;
     @Schema(description = "Whether to include the validated input in the resulting report's context section.", defaultValue = "false")
     private Boolean addInputToReport;
+    @Schema(description = "Whether to wrap the input (see addInputToReport) in a CDATA block if producing an XML report. False results in adding the input via XML escaping.", defaultValue = "true")
+    private Boolean wrapReportDataInCDATA;
     @Schema(description = "Locale (language code) to use for reporting of results. If the provided locale is not supported by the validator the default locale will be used instead (e.g. 'fr', 'fr_FR').")
     private String locale;
 
@@ -124,6 +126,20 @@ public void setAddInputToReport(Boolean addInputToReport) {
         this.addInputToReport = addInputToReport;
     }
 
+    /**
+     * @return Whether to wrap the input (see addInputToReport) in a CDATA block if producing an XML report. False results in adding the input via XML escaping.
+     */
+    public Boolean getWrapReportDataInCDATA() {
+        return wrapReportDataInCDATA;
+    }
+
+    /**
+     * @param wrapReportDataInCDATA Whether to wrap the input (see addInputToReport) in a CDATA block if producing an XML report. False results in adding the input via XML escaping.
+     */
+    public void setWrapReportDataInCDATA(Boolean wrapReportDataInCDATA) {
+        this.wrapReportDataInCDATA = wrapReportDataInCDATA;
+    }
+
     /**
      * @return The locale string.
      */