MID-7747: replace illegal characters in report output file name on wi…

…ndows
Evolveum · Mar 18, 2022 · 690f6e8 · 690f6e8
1 parent eb9686e
commit 690f6e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/SaveReportFileSupport.java b/...-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/SaveReportFileSupport.java
@@ -159,9 +159,10 @@ private String getDestinationFileName(ReportType reportType,
             ReportDataWriter<? extends ExportedReportDataRow, ? extends ExportedReportHeaderRow> dataWriter) {
         File exportDir = ReportSupportUtil.getOrCreateExportDir();
 
-        String fileNamePrefix = reportType.getName().getOrig() + "-EXPORT " + getDateTime();
+        String reportName = StringUtils.replace(reportType.getName().getOrig(), File.separator, "_");
+        String fileNamePrefix = reportName + "-EXPORT " + getDateTime();
         String fileName = fileNamePrefix + dataWriter.getTypeSuffix();
-        return MiscUtil.replaceColonsInFileNameOnWindows(new File(exportDir, fileName).getPath());
+        return MiscUtil.replaceIllegalCharInFileNameOnWindows(new File(exportDir, fileName).getPath());
     }
 
     static String getNameOfExportedReportData(ReportType reportType, String type) {

diff --git a/model/report-impl/src/test/java/com/evolveum/midpoint/report/EmptyReportIntegrationTest.java b/model/report-impl/src/test/java/com/evolveum/midpoint/report/EmptyReportIntegrationTest.java
@@ -197,7 +197,7 @@ List<String> getLinesOfOutputFile(PrismObject<ReportType> report) throws IOExcep
     File findOutputFile(PrismObject<ReportType> report) throws ParseException {
         // We should use a more robust way of finding the file names, e.g. by looking at ReportDataType repo objects.
         String expectedFilePrefix =
-                MiscUtil.replaceColonsInFileNameOnWindows(
+                MiscUtil.replaceIllegalCharInFileNameOnWindows(
                         report.getName().getOrig());
         File[] matchingFiles = EXPORT_DIR.listFiles((dir, name) -> name.startsWith(expectedFilePrefix));
         if (matchingFiles == null || matchingFiles.length == 0) {