From a5a1ce3050960ed51718c64c3307c0f8a55bce71 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 18 May 2024 04:24:55 +0200 Subject: [PATCH] IDEMPIERE-6144 Can't export a report if the name has less than 3 characters (#2363) --- org.adempiere.base/src/org/compiere/tools/FileUtil.java | 6 ++---- .../org/idempiere/ui/zk/report/CSVReportViewerRenderer.java | 5 +---- .../idempiere/ui/zk/report/HTMLReportViewerRenderer.java | 2 -- .../org/idempiere/ui/zk/report/PDFReportViewerRenderer.java | 2 -- .../org/idempiere/ui/zk/report/XLSReportViewerRenderer.java | 2 -- .../idempiere/ui/zk/report/XLSXReportViewerRenderer.java | 5 +---- .../zk/datatable/DatatableReportViewerRenderer.java | 2 -- .../org/idempiere/zk/pivot/PivotReportVieweRenderer.java | 2 -- 8 files changed, 4 insertions(+), 22 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/tools/FileUtil.java b/org.adempiere.base/src/org/compiere/tools/FileUtil.java index 2188602115..f60aceeafd 100644 --- a/org.adempiere.base/src/org/compiere/tools/FileUtil.java +++ b/org.adempiere.base/src/org/compiere/tools/FileUtil.java @@ -467,10 +467,8 @@ public class FileUtil public static File createTempFile(String prefix, String suffix, File directory) throws IOException { - if (prefix.length() < 3) { - throw new IllegalArgumentException("Prefix string \"" + prefix + - "\" too short: length must be at least 3"); - } + if (Util.isEmpty(prefix)) + throw new IllegalArgumentException("Prefix is required"); prefix = Util.setFilenameCorrect(prefix); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/CSVReportViewerRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/CSVReportViewerRenderer.java index a00f763ace..2b95c5c5c2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/CSVReportViewerRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/CSVReportViewerRenderer.java @@ -87,10 +87,7 @@ public class CSVReportViewerRenderer implements IReportViewerRenderer { try { String path = System.getProperty("java.io.tmpdir"); String prefix = makePrefix(reportEngine.getName()); - if (log.isLoggable(Level.FINE)) - { - log.log(Level.FINE, "Path="+path + " Prefix="+prefix); - } + if (log.isLoggable(Level.FINE)) log.log(Level.FINE, "Path="+path + " Prefix="+prefix); File file = FileUtil.createTempFile(prefix, "."+getFileExtension(), new File(path)); IReportRenderer renderer = Core.getReportRenderer(getId()); CSVReportRendererConfiguration config = new CSVReportRendererConfiguration() diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/HTMLReportViewerRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/HTMLReportViewerRenderer.java index 58060493d9..9563304f06 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/HTMLReportViewerRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/HTMLReportViewerRenderer.java @@ -88,8 +88,6 @@ public class HTMLReportViewerRenderer implements IReportViewerRenderer { try { String path = System.getProperty("java.io.tmpdir"); String prefix = makePrefix(reportEngine.getName()); - if (prefix.length() < 3) - prefix += "_".repeat(3-prefix.length()); if (log.isLoggable(Level.FINE)) log.log(Level.FINE, "Path="+path + " Prefix="+prefix); File file = FileUtil.createTempFile(prefix, "."+getFileExtension(), new File(path)); String contextPath = Executions.getCurrent().getContextPath(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/PDFReportViewerRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/PDFReportViewerRenderer.java index 354c0228ea..535036221f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/PDFReportViewerRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/PDFReportViewerRenderer.java @@ -86,8 +86,6 @@ public class PDFReportViewerRenderer implements IReportViewerRenderer { try { String path = System.getProperty("java.io.tmpdir"); String prefix = makePrefix(reportEngine.getName()); - if (prefix.length() < 3) - prefix += "_".repeat(3-prefix.length()); if (log.isLoggable(Level.FINE)) log.log(Level.FINE, "Path="+path + " Prefix="+prefix); File file = FileUtil.createTempFile(prefix, "."+getFileExtension(), new File(path)); IReportRenderer renderer = Core.getReportRenderer(getId()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSReportViewerRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSReportViewerRenderer.java index 56e1464964..4e50f2f83d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSReportViewerRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSReportViewerRenderer.java @@ -86,8 +86,6 @@ public class XLSReportViewerRenderer implements IReportViewerRenderer { try { String path = System.getProperty("java.io.tmpdir"); String prefix = makePrefix(reportEngine.getName()); - if (prefix.length() < 3) - prefix += "_".repeat(3-prefix.length()); if (log.isLoggable(Level.FINE)) log.log(Level.FINE, "Path="+path + " Prefix="+prefix); File file = FileUtil.createTempFile(prefix, "."+getFileExtension(), new File(path)); IReportRenderer renderer = Core.getReportRenderer(getId()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSXReportViewerRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSXReportViewerRenderer.java index 9254e2e855..510e950d93 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSXReportViewerRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/report/XLSXReportViewerRenderer.java @@ -86,10 +86,7 @@ public class XLSXReportViewerRenderer implements IReportViewerRenderer { try { String path = System.getProperty("java.io.tmpdir"); String prefix = makePrefix(reportEngine.getName()); - if (log.isLoggable(Level.FINE)) - { - log.log(Level.FINE, "Path=" + path + " Prefix=" + prefix); - } + if (log.isLoggable(Level.FINE)) log.log(Level.FINE, "Path=" + path + " Prefix=" + prefix); File file = FileUtil.createTempFile(prefix, "."+getFileExtension(), new File(path)); IReportRenderer renderer = Core.getReportRenderer(getId()); XLSXReportRendererConfiguration config = new XLSXReportRendererConfiguration() diff --git a/org.idempiere.zk.datatable/src/org/idempiere/zk/datatable/DatatableReportViewerRenderer.java b/org.idempiere.zk.datatable/src/org/idempiere/zk/datatable/DatatableReportViewerRenderer.java index dbc7812510..c0c2f8552d 100644 --- a/org.idempiere.zk.datatable/src/org/idempiere/zk/datatable/DatatableReportViewerRenderer.java +++ b/org.idempiere.zk.datatable/src/org/idempiere/zk/datatable/DatatableReportViewerRenderer.java @@ -83,8 +83,6 @@ public class DatatableReportViewerRenderer implements IReportViewerRenderer { try { String path = System.getProperty("java.io.tmpdir"); String prefix = makePrefix(reportEngine.getName()); - if (prefix.length() < 3) - prefix += "_".repeat(3-prefix.length()); if (log.isLoggable(Level.FINE)) log.log(Level.FINE, "Path="+path + " Prefix="+prefix); File file = FileUtil.createTempFile(prefix, "."+getFileExtension(), new File(path)); String contextPath = Executions.getCurrent().getContextPath(); diff --git a/org.idempiere.zk.pivot/src/org/idempiere/zk/pivot/PivotReportVieweRenderer.java b/org.idempiere.zk.pivot/src/org/idempiere/zk/pivot/PivotReportVieweRenderer.java index ba1c85102f..6be2e6160e 100644 --- a/org.idempiere.zk.pivot/src/org/idempiere/zk/pivot/PivotReportVieweRenderer.java +++ b/org.idempiere.zk.pivot/src/org/idempiere/zk/pivot/PivotReportVieweRenderer.java @@ -81,8 +81,6 @@ public class PivotReportVieweRenderer implements IReportViewerRenderer { try { String path = System.getProperty("java.io.tmpdir"); String prefix = makePrefix(reportEngine.getName()); - if (prefix.length() < 3) - prefix += "_".repeat(3-prefix.length()); if (log.isLoggable(Level.FINE)) log.log(Level.FINE, "Path="+path + " Prefix="+prefix); File file = FileUtil.createTempFile(prefix, "."+getFileExtension(), new File(path)); IReportRenderer renderer = Core.getReportRenderer(getId());