Revert "dbeaver/dbeaver-ee#1523 restructure notifications (#15947)"

This reverts commit 63c83096

plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/sql/task/SQLScriptExecuteHandler.java

@@ -59,7 +59,8 @@ public class SQLScriptExecuteHandler implements DBTTaskHandler {
         @NotNull Locale locale,
         @NotNull Log log,
         @NotNull PrintStream logStream,
-        @NotNull DBTTaskExecutionListener listener) throws DBException
+        @NotNull DBTTaskExecutionListener listener,
+        boolean showNotifications) throws DBException
     {
         SQLScriptExecuteSettings settings = new SQLScriptExecuteSettings();
         settings.loadConfiguration(runnableContext, task.getProperties());
@@ -89,7 +90,7 @@ public class SQLScriptExecuteHandler implements DBTTaskHandler {
         if (error != null) {
             log.error(error);
         }
-        listener.taskFinished(task, null, error, settings);
+        listener.taskFinished(settings, null, error);
 
         log.debug("SQL script execute completed");
     }

plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/DataTransferJob.java

@@ -87,11 +87,12 @@ public class DataTransferJob implements DBRRunnableWithProgress {
                     hasErrors = true;
                 }
             } catch (Exception e) {
+                listener.subTaskFinished(e);
                 throw new InvocationTargetException(e);
             }
         }
         monitor.done();
-//        listener.subTaskFinished(task, null);
+        listener.subTaskFinished(null);
         elapsedTime = System.currentTimeMillis() - startTime;
     }
 

plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/task/DTTaskHandlerTransfer.java

@@ -55,7 +55,8 @@ public class DTTaskHandlerTransfer implements DBTTaskHandler {
         @NotNull Locale locale,
         @NotNull Log log,
         @NotNull PrintStream logStream,
-        @NotNull DBTTaskExecutionListener listener) throws DBException
+        @NotNull DBTTaskExecutionListener listener,
+        boolean showNotifications) throws DBException
     {
         DataTransferSettings[] settings = new DataTransferSettings[1];
         try {
@@ -81,7 +82,7 @@ public class DTTaskHandlerTransfer implements DBTTaskHandler {
         try {
             indexOfLastPipeWithDisabledReferentialIntegrity = initializePipes(runnableContext, settings);
             Throwable error = runDataTransferJobs(runnableContext, task, locale, log, listener, settings);
-            listener.taskFinished(task, null, error, settings);
+            listener.taskFinished(settings, null, error);
         } catch (InvocationTargetException e) {
             DBWorkbench.getPlatformUI().showError(
                 DTMessages.data_transfer_task_handler_unexpected_error_title,
@@ -150,6 +151,7 @@ public class DTTaskHandlerTransfer implements DBTTaskHandler {
             } catch (InterruptedException e) {
                 break;
             }
+            listener.subTaskFinished(error);
         }
         return error;
     }

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLNativeToolHandler.java

@@ -42,9 +42,9 @@ public abstract class MySQLNativeToolHandler<SETTINGS extends AbstractNativeTool
     private File config;
 
     @Override
-    protected boolean doExecute(DBRProgressMonitor monitor, DBTTask task, SETTINGS settings, Log log) throws DBException, InterruptedException {
+    protected boolean doExecute(DBRProgressMonitor monitor, DBTTask task, SETTINGS settings, Log log, boolean showNotifications) throws DBException, InterruptedException {
         try {
-            return super.doExecute(monitor, task, settings, log);
+            return super.doExecute(monitor, task, settings, log, showNotifications);
         } finally {
             if (config != null && !config.delete()) {
                 log.debug("Failed to delete configuration file");

plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/task/SQLToolExecuteHandler.java

@@ -59,7 +59,8 @@ public abstract class SQLToolExecuteHandler<OBJECT_TYPE extends DBSObject, SETTI
         @NotNull Locale locale,
         @NotNull Log log,
         @NotNull PrintStream logStream,
-        @NotNull DBTTaskExecutionListener listener) throws DBException
+        @NotNull DBTTaskExecutionListener listener,
+        boolean showNotifications) throws DBException
     {
         SETTINGS settings = createToolSettings();
         settings.loadConfiguration(runnableContext, task.getProperties());
@@ -209,7 +210,7 @@ public abstract class SQLToolExecuteHandler<OBJECT_TYPE extends DBSObject, SETTI
         } finally {
             monitor.done();
         }
-        listener.taskFinished(task, null, lastError, settings);
+        listener.taskFinished(settings, null, lastError);
 
         outLog.println("Tool execution finished");
         outLog.flush();

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/task/DBTTaskExecutionListener.java

@@ -26,8 +26,8 @@ public interface DBTTaskExecutionListener {
 
     void taskStarted(@NotNull Object task);
 
-    void taskFinished(@NotNull DBTTask task, @Nullable Object result, @Nullable Throwable error, @Nullable Object settings);
+    void taskFinished(@NotNull Object task, @Nullable Object result, @Nullable Throwable error);
 
-    void subTaskFinished(@NotNull DBTTask task, @Nullable Throwable error, @Nullable Object settings);
+    void subTaskFinished(@Nullable Throwable error);
 
 }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/task/DBTTaskHandler.java

@@ -36,7 +36,8 @@ public interface DBTTaskHandler {
         @NotNull Locale locale,
         @NotNull Log log,
         @NotNull PrintStream logStream,
-        @NotNull DBTTaskExecutionListener listener)
+        @NotNull DBTTaskExecutionListener listener,
+        boolean showNotifications)
         throws DBException;
 
 

plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/task/TaskRunJob.java

@@ -23,7 +23,6 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.runtime.*;
-import org.jkiss.dbeaver.model.task.DBTTask;
 import org.jkiss.dbeaver.model.task.DBTTaskExecutionListener;
 import org.jkiss.dbeaver.model.task.DBTTaskHandler;
 import org.jkiss.dbeaver.model.task.DBTTaskRunStatus;
@@ -124,7 +123,7 @@ public class TaskRunJob extends AbstractJob implements DBRRunnableContext {
     private DBTTaskRunStatus executeTask(DBRProgressMonitor monitor, PrintStream logWriter) throws DBException {
         activeMonitor = monitor;
         DBTTaskHandler taskHandler = task.getType().createHandler();
-        return taskHandler.executeTask(this, task, locale, taskLog, logWriter, executionListener);
+        return taskHandler.executeTask(this, task, locale, taskLog, logWriter, executionListener, true);
     }
 
     @Override
@@ -165,15 +164,15 @@ public class TaskRunJob extends AbstractJob implements DBRRunnableContext {
         }
 
         @Override
-        public void taskFinished(@NotNull DBTTask task, @Nullable Object result, @Nullable Throwable error, @Nullable Object settings) {
-            parent.taskFinished(task, result, error, settings);
+        public void taskFinished(@NotNull Object task, @Nullable Object result, @Nullable Throwable error) {
+            parent.taskFinished(task, result, error);
             elapsedTime = System.currentTimeMillis() - startTime;
             taskError = error;
         }
 
         @Override
-        public void subTaskFinished(@NotNull DBTTask task, @Nullable Throwable error, @Nullable Object settings) {
-            parent.subTaskFinished(task, error, settings);
+        public void subTaskFinished(@Nullable Throwable error) {
+            parent.subTaskFinished(error);
         }
     }
 

plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractNativeToolHandler.java

@@ -60,7 +60,8 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
         @NotNull Locale locale,
         @NotNull Log log,
         @NotNull PrintStream logStream,
-        @NotNull DBTTaskExecutionListener listener) throws DBException {
+        @NotNull DBTTaskExecutionListener listener,
+        boolean showNotifications) throws DBException {
         SETTINGS settings = createTaskSettings(runnableContext, task);
         settings.setLogWriter(logStream);
         if (!validateTaskParameters(task, settings, log)) {
@@ -75,11 +76,11 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
                 listener.taskStarted(task);
                 Throwable error = null;
                 try {
-                    doExecute(monitor, task, settings, log);
+                    doExecute(monitor, task, settings, log, showNotifications);
                 } catch (Exception e) {
                     error = e;
                 } finally {
-                    listener.taskFinished(task, null, error, settings);
+                    listener.taskFinished(settings, null, error);
                     Log.setLogWriter(null);
 
                     monitor.worked(1);
@@ -241,7 +242,27 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
         }
     }
 
-    protected boolean doExecute(DBRProgressMonitor monitor, DBTTask task, SETTINGS settings, Log log) throws DBException, InterruptedException {
+    protected void onSuccess(DBTTask task, SETTINGS settings, long workTime) {
+
+        StringBuilder message = new StringBuilder();
+        message.append("Task [").append(task.getName()).append("] is completed (").append(workTime).append("ms)");
+        List<String> objNames = new ArrayList<>();
+        for (BASE_OBJECT obj : settings.getDatabaseObjects()) {
+            objNames.add(obj.getName());
+        }
+        message.append("\nObject(s) processed: ").append(String.join(",", objNames));
+        DBWorkbench.getPlatformUI().showNotification(task.getName(), message.toString(), false);
+
+    }
+
+    protected void onError(DBTTask task, SETTINGS settings, long workTime) {
+//        DBWorkbench.getPlatformUI().showError(
+//            taskTitle,
+//            errorMessage == null ? "Internal error" : errorMessage,
+//            SWT.ICON_ERROR);
+    }
+
+    protected boolean doExecute(DBRProgressMonitor monitor, DBTTask task, SETTINGS settings, Log log, boolean showNotifications) throws DBException, InterruptedException {
         validateClientHome(monitor, settings);
 
         long startTime = System.currentTimeMillis();
@@ -277,6 +298,14 @@ public abstract class AbstractNativeToolHandler<SETTINGS extends AbstractNativeT
 
         long workTime = System.currentTimeMillis() - startTime;
         notifyToolFinish(task.getType().getName() + " - " + task.getName() + " has finished", workTime);
+        if (isSuccess) {
+            if (showNotifications) {
+                onSuccess(task, settings, workTime);
+            }
+        } else {
+            onError(task, settings, workTime);
+        }
+
         return isSuccess;
     }
 

plugins/org.jkiss.dbeaver.tasks.ui/META-INF/MANIFEST.MF

@@ -21,8 +21,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.registry,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ui.navigator,
- org.jkiss.dbeaver.ui.editors.base,
- org.jkiss.dbeaver.tasks.native
+ org.jkiss.dbeaver.ui.editors.base
 Export-Package: org.jkiss.dbeaver.tasks.ui,
  org.jkiss.dbeaver.tasks.ui.registry,
  org.jkiss.dbeaver.tasks.ui.wizard,

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/wizard/TaskProcessorUI.java

@@ -25,20 +25,16 @@ import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBPMessageType;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
-import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.task.DBTTask;
 import org.jkiss.dbeaver.model.task.DBTTaskExecutionListener;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.DBeaverNotifications;
 import org.jkiss.dbeaver.runtime.ui.DBPPlatformUI;
-import org.jkiss.dbeaver.tasks.nativetool.AbstractNativeToolSettings;
 import org.jkiss.dbeaver.tasks.ui.internal.TaskUIMessages;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class TaskProcessorUI implements DBRRunnableContext, DBTTaskExecutionListener {
     private static final Log log = Log.getLog(TaskProcessorUI.class);
@@ -49,7 +45,6 @@ public class TaskProcessorUI implements DBRRunnableContext, DBTTaskExecutionList
     private DBRRunnableContext staticContext;
     private long startTime;
     private boolean started;
-    private long timeSincePreviousTask;
 
     public TaskProcessorUI(@NotNull DBRRunnableContext staticContext, @NotNull DBTTask task) {
         this.staticContext = staticContext;
@@ -77,60 +72,42 @@ public class TaskProcessorUI implements DBRRunnableContext, DBTTaskExecutionList
     public void taskStarted(@NotNull Object task) {
         this.started = true;
         this.startTime = System.currentTimeMillis();
-        this.timeSincePreviousTask = startTime;
     }
 
     @Override
-    public void taskFinished(@NotNull DBTTask task, @Nullable Object result, @Nullable Throwable error, @Nullable Object settings) {
+    public void taskFinished(@NotNull Object task, @Nullable Object result, @Nullable Throwable error) {
         this.started = false;
 
         long elapsedTime = System.currentTimeMillis() - startTime;
 
-        sendNotification(task, error, elapsedTime, settings);
-
-    }
-
-    private void sendNotification(@NotNull DBTTask task, @Nullable Throwable error, long elapsedTime, @Nullable Object settings) {
         UIUtils.asyncExec(() -> {
             // Make a sound
             Display.getCurrent().beep();
             // Notify agent
             boolean hasErrors = error != null;
             DBPPlatformUI platformUI = DBWorkbench.getPlatformUI();
-            StringBuilder completeMessage = new StringBuilder();
-            completeMessage.append(task.getType().getName()).append(" ").append(TaskUIMessages.task_processor_ui_message_task_completed).append(" (").append(RuntimeUtils.formatExecutionTime(elapsedTime)).append(")");
-            List<String> objects = new ArrayList<>();
-            if (settings instanceof AbstractNativeToolSettings) {
-                for (DBSObject databaseObject : ((AbstractNativeToolSettings<?>) settings).getDatabaseObjects()) {
-                    objects.add(databaseObject.getName());
-                }
-                completeMessage.append("\nObject(s) processed: ").append(String.join(",", objects));
-            }
+            String completeMessage = this.task.getType().getName() + " " + TaskUIMessages.task_processor_ui_message_task_completed + " (" + RuntimeUtils.formatExecutionTime(elapsedTime) + ")";
             if (elapsedTime > platformUI.getLongOperationTimeout() * 1000) {
                 platformUI.notifyAgent(
-                    completeMessage.toString(), !hasErrors ? IStatus.INFO : IStatus.ERROR);
+                    completeMessage, !hasErrors ? IStatus.INFO : IStatus.ERROR);
             }
-
             if (isShowFinalMessage() && !hasErrors) {
                 // Show message box
                 DBeaverNotifications.showNotification(
                     "task",
-                    task.getName(),
-                    completeMessage.toString(),
+                    this.task.getName(),
+                    completeMessage,
                     DBPMessageType.INFORMATION,
                     null);
             } else if (error != null) {
                 DBWorkbench.getPlatformUI().showError("Task error", "Task execution failed", error);
             }
         });
-    }
 
+    }
 
     @Override
-    public void subTaskFinished(@NotNull DBTTask task, @Nullable Throwable error, @Nullable Object settings) {
-        long elapsedTime = System.currentTimeMillis() - timeSincePreviousTask;
-        timeSincePreviousTask = System.currentTimeMillis();
-        sendNotification(task, error, elapsedTime, settings);
+    public void subTaskFinished(@Nullable Throwable error) {
 
     }
 

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/wizard/TaskWizardExecutor.java

@@ -46,7 +46,7 @@ public class TaskWizardExecutor extends TaskProcessorUI {
     @Override
     protected void runTask() throws DBException {
         DBTTaskHandler handlerTransfer = getTask().getType().createHandler();
-        handlerTransfer.executeTask(this, getTask(), Locale.getDefault(), log, logWriter, this);
+        handlerTransfer.executeTask(this, getTask(), Locale.getDefault(), log, logWriter, this, true);
     }
 
 }
\ No newline at end of file