From df7701d46bd5b870d958ba8ed8b436246b973a5d Mon Sep 17 00:00:00 2001
From: Nikita Akilov <nikita.n.akilov@gmail.com>
Date: Wed, 30 Sep 2020 14:56:28 +0300
Subject: [PATCH] #9540 add warning message and intoduce DataTransferNode
 validation

---
 .../transfer/ui/internal/DTUIMessages.java    |  1 +
 .../ui/internal/DTUIMessages.properties       |  1 +
 .../stream/StreamProducerPageSettings.java    | 35 +++++++------------
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.java b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.java
index 6ddee808fc..20580e5ddf 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.java
@@ -102,6 +102,7 @@ public class DTUIMessages extends NLS {
 	public static String stream_consumer_page_settings_title;
 	public static String stream_consumer_page_settings_description;
 	public static String stream_consumer_page_settings_item_text_none;
+	public static String stream_consumer_page_warning_not_enough_sources_chosen;
 
 	public static String data_transfer_task_configurator_group_label_export_tables;
 	public static String data_transfer_task_configurator_group_label_import_into;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.properties b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.properties
index e9ff89fc10..440f53efee 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.properties
+++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages.properties
@@ -73,6 +73,7 @@ stream_consumer_page_output_tooltip_process_command_line = Process command line
 stream_consumer_page_settings_title = Format settings
 stream_consumer_page_settings_description = File format settings
 stream_consumer_page_settings_item_text_none = <none>
+stream_consumer_page_warning_not_enough_sources_chosen = Not enough source files chosen
 data_transfer_task_configurator_group_label_export_tables = Export tables
 data_transfer_task_configurator_group_label_import_into = Import into
 data_transfer_task_configurator_table_column_text_object = Object
diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamProducerPageSettings.java b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamProducerPageSettings.java
index 5963ce57ab..f093bfdcdb 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamProducerPageSettings.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamProducerPageSettings.java
@@ -16,6 +16,7 @@
  */
 package org.jkiss.dbeaver.tools.transfer.ui.pages.stream;
 
+import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -36,10 +37,7 @@ import org.jkiss.dbeaver.model.struct.DBSDataManipulator;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.properties.PropertySourceCustom;
-import org.jkiss.dbeaver.tools.transfer.DataTransferPipe;
-import org.jkiss.dbeaver.tools.transfer.DataTransferSettings;
-import org.jkiss.dbeaver.tools.transfer.IDataTransferConsumer;
-import org.jkiss.dbeaver.tools.transfer.IDataTransferSettings;
+import org.jkiss.dbeaver.tools.transfer.*;
 import org.jkiss.dbeaver.tools.transfer.database.DatabaseConsumerSettings;
 import org.jkiss.dbeaver.tools.transfer.database.DatabaseMappingContainer;
 import org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferConsumer;
@@ -184,7 +182,7 @@ public class StreamProducerPageSettings extends ActiveWizardPage<DataTransferWiz
 
     private void updateMultiConsumers(DBRProgressMonitor monitor, DataTransferPipe pipe, File[] files) {
         final StreamProducerSettings producerSettings = getWizard().getPageSettings(this, StreamProducerSettings.class);
-        IDataTransferConsumer originalConsumer = pipe.getConsumer();
+        IDataTransferConsumer<?, ?> originalConsumer = pipe.getConsumer();
 
         DataTransferSettings dtSettings = getWizard().getSettings();
         List<DataTransferPipe> newPipes = new ArrayList<>(dtSettings.getDataPipes());
@@ -192,7 +190,7 @@ public class StreamProducerPageSettings extends ActiveWizardPage<DataTransferWiz
 
         for (File file : files) {
             StreamTransferProducer producer = new StreamTransferProducer(new StreamEntityMapping(file));
-            IDataTransferConsumer consumer = new DatabaseTransferConsumer();
+            IDataTransferConsumer<?, ?> consumer = new DatabaseTransferConsumer();
 
             DataTransferPipe singlePipe = new DataTransferPipe(producer, consumer);
             try {
@@ -230,14 +228,14 @@ public class StreamProducerPageSettings extends ActiveWizardPage<DataTransferWiz
     }
 
     private void updateItemData(TableItem item, DataTransferPipe pipe) {
-        if (pipe.getProducer() == null || pipe.getProducer().getObjectName() == null) {
+        if (isInvalidDataTransferNode(pipe.getProducer())) {
             item.setImage(0, null);
             item.setText(0, DTUIMessages.stream_consumer_page_settings_item_text_none);
         } else {
             item.setImage(0, DBeaverIcons.getImage(getProducerProcessor().getIcon()));
             item.setText(0, String.valueOf(pipe.getProducer().getObjectName()));
         }
-        if (pipe.getConsumer() == null) {
+        if (isInvalidDataTransferNode(pipe.getConsumer())) {
             item.setImage(1, null);
             item.setText(1, DTUIMessages.stream_consumer_page_settings_item_text_none);
         } else {
@@ -246,6 +244,10 @@ public class StreamProducerPageSettings extends ActiveWizardPage<DataTransferWiz
         }
     }
 
+    private boolean isInvalidDataTransferNode(final IDataTransferNode<?> node) {
+        return node == null || node.getObjectName() == null;
+    }
+
     @Override
     public void activatePage() {
         // Initialize property editor
@@ -313,25 +315,14 @@ public class StreamProducerPageSettings extends ActiveWizardPage<DataTransferWiz
 
     @Override
     protected boolean determinePageCompletion() {
-        int producerCount = 0;
-        int consumerCount = 0;
         for (int i = 0; i < filesTable.getItemCount(); i++) {
             final DataTransferPipe pipe = (DataTransferPipe) filesTable.getItem(i).getData();
-            if (pipe.getProducer() != null && pipe.getProducer().getObjectName() != null) {
-                producerCount++;
-            }
-            if (pipe.getConsumer() != null) {
-                consumerCount++;
-            }
-        }
-        if (producerCount != consumerCount) {
-            return false;
-        }
-        for (DataTransferPipe pipe : getWizard().getSettings().getDataPipes()) {
-            if (pipe.getConsumer() == null || pipe.getProducer() == null) {
+            if (isInvalidDataTransferNode(pipe.getConsumer()) || isInvalidDataTransferNode(pipe.getProducer())) {
+                setMessage(DTUIMessages.stream_consumer_page_warning_not_enough_sources_chosen, IMessageProvider.WARNING);
                 return false;
             }
         }
+        setMessage(null);
         return true;
     }
 
-- 
GitLab