Task utils refactoring

shaoxh · Feb 8, 2020 · 17a0717 · 17a0717
1 parent f2601a9
commit 17a0717
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/...s.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/sql/task/SQLScriptExecuteHandler.java b/...s.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/sql/task/SQLScriptExecuteHandler.java
@@ -34,7 +34,7 @@
 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.DBTUtils;
+import org.jkiss.dbeaver.model.task.DBTaskUtils;
 import org.jkiss.dbeaver.tools.sql.SQLScriptExecuteSettings;
 import org.jkiss.utils.IOUtils;
 
@@ -125,7 +125,7 @@ private void runScripts(DBRProgressMonitor monitor, DBTTask task, DBPDataSourceC
     private void processScript(DBRProgressMonitor monitor, DBTTask task, SQLScriptExecuteSettings settings, DBCExecutionContext executionContext, String filePath, String sqlScriptContent, Log log, Writer logStream) throws DBException {
         List<SQLScriptElement> scriptElements = SQLScriptParser.parseScript(executionContext, sqlScriptContent);
         SQLScriptContext scriptContext = new SQLScriptContext(null, () -> executionContext, null, logStream, null);
-        scriptContext.setVariables(DBTUtils.getVariables(task));
+        scriptContext.setVariables(DBTaskUtils.getVariables(task));
         SQLScriptDataReceiver dataReceiver = new SQLScriptDataReceiver();
         SQLScriptProcessor scriptProcessor = new SQLScriptProcessor(executionContext, scriptElements, scriptContext, dataReceiver, log);
 

diff --git a/...data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseTransferProducer.java b/...data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseTransferProducer.java
@@ -39,7 +39,7 @@
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.dbeaver.model.task.DBTTask;
-import org.jkiss.dbeaver.model.task.DBTUtils;
+import org.jkiss.dbeaver.model.task.DBTaskUtils;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.serialize.DBPObjectSerializer;
 import org.jkiss.dbeaver.tools.transfer.IDataTransferConsumer;
@@ -162,7 +162,7 @@ public void transferData(
                     context = DBUtils.getObjectOwnerInstance(getDatabaseObject()).openIsolatedContext(monitor, "Data transfer producer", context);
                 }
                 if (task != null) {
-                    DBTUtils.initFromContext(monitor, task, context);
+                    DBTaskUtils.initFromContext(monitor, task, context);
                 }
 
                 try (DBCSession session = context.openSession(monitor, DBCExecutionPurpose.UTIL, contextTask)) {
@@ -329,7 +329,7 @@ public DatabaseTransferProducer deserializeObject(DBRRunnableContext runnableCon
                                 SQLQuery query = new SQLQuery(ds.getDataSource(), queryText);
                                 SQLScriptContext scriptContext = new SQLScriptContext(null,
                                     new DataSourceContextProvider(ds), null, new PrintWriter(System.err, true), null);
-                                scriptContext.setVariables(DBTUtils.getVariables(objectContext));
+                                scriptContext.setVariables(DBTaskUtils.getVariables(objectContext));
                                 producer.dataContainer = new SQLQueryDataContainer(new DataSourceContextProvider(ds), query, scriptContext, log);
                                 break;
                             }

diff --git a/...rg/jkiss/dbeaver/model/task/DBTUtils.java → ...jkiss/dbeaver/model/task/DBTaskUtils.java b/...rg/jkiss/dbeaver/model/task/DBTUtils.java → ...jkiss/dbeaver/model/task/DBTaskUtils.java
@@ -37,8 +37,8 @@
 /**
  * Task utils
  */
-public class DBTUtils {
-    private static final Log log = Log.getLog(DBTUtils.class);
+public class DBTaskUtils {
+    private static final Log log = Log.getLog(DBTaskUtils.class);
 
     public static final String TASK_VARIABLES = "taskVariables";
     public static final String TASK_CONTEXT = "taskContext";
@@ -56,9 +56,9 @@ public static Map<String, Object> getVariables(@NotNull DBTTask task) {
 
     public static void setVariables(@NotNull Map<String, Object> taskState, @Nullable Map<String, Object> variables) {
         if (!CommonUtils.isEmpty(variables)) {
-            taskState.put(DBTUtils.TASK_VARIABLES, variables);
+            taskState.put(DBTaskUtils.TASK_VARIABLES, variables);
         } else {
-            taskState.remove(DBTUtils.TASK_VARIABLES);
+            taskState.remove(DBTaskUtils.TASK_VARIABLES);
         }
     }
 

diff --git a/...jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/wizard/TaskConfigurationWizard.java b/...jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/wizard/TaskConfigurationWizard.java
@@ -40,7 +40,7 @@
 import org.jkiss.dbeaver.model.task.DBTTask;
 import org.jkiss.dbeaver.model.task.DBTTaskContext;
 import org.jkiss.dbeaver.model.task.DBTTaskType;
-import org.jkiss.dbeaver.model.task.DBTUtils;
+import org.jkiss.dbeaver.model.task.DBTaskUtils;
 import org.jkiss.dbeaver.registry.task.TaskRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.tasks.ui.view.DatabaseTasksView;
@@ -236,10 +236,10 @@ protected void saveConfigurationToTask(DBTTask theTask) {
 
         DBTTaskContext context = getTaskContext();
         if (context != null) {
-            DBTUtils.saveTaskContext(state, context);
+            DBTaskUtils.saveTaskContext(state, context);
         }
         if (theTask.getType().supportsVariables()) {
-            DBTUtils.setVariables(state, getTaskVariables());
+            DBTaskUtils.setVariables(state, getTaskVariables());
         }
         theTask.setProperties(state);
         try {
@@ -304,7 +304,7 @@ private void configureVariables() {
     protected Map<String, Object> getTaskVariables() {
         if (variables == null) {
             if (currentTask != null) {
-                variables = DBTUtils.getVariables(currentTask);
+                variables = DBTaskUtils.getVariables(currentTask);
             } else {
                 variables = new LinkedHashMap<>();
             }
@@ -315,14 +315,14 @@ protected Map<String, Object> getTaskVariables() {
     public DBTTaskContext getTaskContext() {
         if (taskContext == null) {
             if (currentTask != null) {
-                taskContext = DBTUtils.loadTaskContext(currentTask.getProperties());
+                taskContext = DBTaskUtils.loadTaskContext(currentTask.getProperties());
             }
         }
         return taskContext;
     }
 
     protected void saveTaskContext(DBCExecutionContext executionContext) {
-        taskContext = DBTUtils.extractContext(executionContext);
+        taskContext = DBTaskUtils.extractContext(executionContext);
     }
 
     public void updateSaveTaskButtons() {