Cb 4430 file extension for export (#2405)

* CB-4430. Fixed file extention for export file json * CB-4430. Fixed file extention for export file json * CB-4430. Fixed checkstyle * CB-4430. Refactor after review --------- Co-authored-by: DenisSinelnikov <[email protected]> Co-authored-by: Evgenia Bezborodova <[email protected]>
dbeaver · Feb 23, 2024 · 0877d07 · 0877d07
1 parent 8c2b2e5
commit 0877d07
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/...e.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java b/...e.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java
@@ -34,6 +34,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Map;
 
 public class WebDataTransferServlet extends WebServiceServletBase {
 
@@ -67,7 +68,7 @@ protected void processServiceRequest(WebSession session, HttpServletRequest requ
         }
         String fileName = taskInfo.getExportFileName();
         if (!CommonUtils.isEmpty(fileName)) {
-            fileName += "." + WebDataTransferUtils.getProcessorFileExtension(processor);
+            fileName += "." + WebDataTransferUtils.getProcessorFileExtension(processor, taskInfo.getParameters().getProcessorProperties());
         } else {
             fileName = taskInfo.getDataFileId();
         }

diff --git a/...ice.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferUtils.java b/...ice.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferUtils.java
@@ -23,9 +23,12 @@
 import org.jkiss.dbeaver.tools.transfer.registry.DataTransferProcessorDescriptor;
 import org.jkiss.utils.CommonUtils;
 
+import java.util.Map;
+
 class WebDataTransferUtils {
 
     private static final Log log = Log.getLog(WebDataTransferUtils.class);
+    public static final String EXTENSION = "extension";
 
 
     public static String getProcessorFileExtension(DataTransferProcessorDescriptor processor) {
@@ -34,6 +37,14 @@ public static String getProcessorFileExtension(DataTransferProcessorDescriptor p
         return CommonUtils.isEmpty(ext) ? "data" : ext;
     }
 
+    public static String getProcessorFileExtension(DataTransferProcessorDescriptor processor, Map<String, Object> processorProperties) {
+        if (processorProperties != null && processorProperties.get(EXTENSION) != null) {
+            return CommonUtils.toString(processorProperties.get(EXTENSION), "data");
+        }
+
+        return getProcessorFileExtension(processor);
+    }
+
     public static String normalizeFileName(
         @NotNull String fileName,
         @NotNull WebDataTransferOutputSettings outputSettings

diff --git a/...e.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java b/...e.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
@@ -107,7 +107,15 @@ public WebAsyncTaskInfo dataTransferExportDataFromContainer(
     }
 
     @NotNull
-    private String makeUniqueFileName(WebSQLProcessor sqlProcessor, DataTransferProcessorDescriptor processor) {
+    private String makeUniqueFileName(
+            WebSQLProcessor sqlProcessor,
+            DataTransferProcessorDescriptor processor,
+            Map<String, Object> processorProperties
+    ) {
+        if (processorProperties != null && processorProperties.get(StreamConsumerSettings.PROP_FILE_EXTENSION) != null) {
+            return sqlProcessor.getWebSession().getSessionId() + "_" + UUID.randomUUID() +
+                    "." + processorProperties.get(StreamConsumerSettings.PROP_FILE_EXTENSION);
+        }
         return sqlProcessor.getWebSession().getSessionId() + "_" + UUID.randomUUID() + "." + WebDataTransferUtils.getProcessorFileExtension(processor);
     }
 
@@ -157,7 +165,8 @@ public void run(DBRProgressMonitor monitor) throws InvocationTargetException {
                 monitor.beginTask("Export data", 1);
                 try {
                     monitor.subTask("Export data using " + processor.getName());
-                    Path exportFile = dataExportFolder.resolve(makeUniqueFileName(sqlProcessor, processor));
+                    Path exportFile = dataExportFolder.resolve(
+                            makeUniqueFileName(sqlProcessor, processor, parameters.getProcessorProperties()));
                     try {
                         exportData(monitor, processor, dataContainer, parameters, resultsInfo, exportFile);
                     } catch (Exception e) {