#2556 reuse DBRResult for PostgreDebugSession

Former-commit-id: 7ad9be85

plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF

@@ -12,4 +12,6 @@ Require-Bundle: org.eclipse.core.runtime,
 Export-Package: org.jkiss.dbeaver.debug,
  org.jkiss.dbeaver.debug.core,
  org.jkiss.dbeaver.debug.core.breakpoints,
- org.jkiss.dbeaver.debug.core.model
+ org.jkiss.dbeaver.debug.core.model,
+ org.jkiss.dbeaver.runtime,
+ org.jkiss.dbeaver.runtime.core

plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSession.java

@@ -30,6 +30,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.jkiss.dbeaver.debug.*;
 import org.jkiss.dbeaver.debug.DBGBreakpoint;
+import org.jkiss.dbeaver.runtime.DBRResult;
 
 @SuppressWarnings("nls")
 public class PostgreDebugSession implements DBGSession<PostgreDebugSessionInfo, PostgreDebugObject, Integer> {
@@ -68,7 +69,7 @@ public class PostgreDebugSession implements DBGSession<PostgreDebugSessionInfo,
 
     private PostgreDebugSessionWorker worker;
 
-    private FutureTask<PostgreDebugSessionResult> task;
+    private FutureTask<DBRResult> task;
 
     private Thread workerThread = null;
 
@@ -348,7 +349,7 @@ public class PostgreDebugSession implements DBGSession<PostgreDebugSessionInfo,
 
         if (task.isDone()) {
 
-            PostgreDebugSessionResult res;
+            DBRResult res;
 
             try {
                 res = task.get();
@@ -360,7 +361,7 @@ public class PostgreDebugSession implements DBGSession<PostgreDebugSessionInfo,
                 System.out.println("WARNING " + res.getException().getMessage());
             }
 
-            return res.isResult();
+            return res.isOK();
 
         }
 
@@ -376,7 +377,7 @@ public class PostgreDebugSession implements DBGSession<PostgreDebugSessionInfo,
 
             worker.execSQL(commandSQL);
 
-            task = new FutureTask<PostgreDebugSessionResult>(worker);
+            task = new FutureTask<DBRResult>(worker);
 
             workerThread = new Thread(task);
 

plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSessionResult.java

-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- * Copyright (C) 2017 Andrew Khitrin (ahitrin@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jkiss.dbeaver.ext.postgresql.debug.internal.impl;
-
-public class PostgreDebugSessionResult {
-
-    private final boolean result;
-
-    private final Exception exception;
-
-    public PostgreDebugSessionResult(boolean result, Exception exception) {
-        super();
-        this.result = result;
-        this.exception = exception;
-    }
-
-    public boolean isResult() {
-        return result;
-    }
-
-    public Exception getException() {
-        return exception;
-    }
-
-}

plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/impl/PostgreDebugSessionWorker.java

@@ -23,7 +23,10 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.concurrent.Callable;
 
-public class PostgreDebugSessionWorker implements Callable<PostgreDebugSessionResult> {
+import org.jkiss.dbeaver.runtime.DBRResult;
+import org.jkiss.dbeaver.runtime.DefaultResult;
+
+public class PostgreDebugSessionWorker implements Callable<DBRResult> {
 
     private final Connection conn;
     private String sql = "";
@@ -39,15 +42,16 @@ public class PostgreDebugSessionWorker implements Callable<PostgreDebugSessionRe
     }
 
     @Override
-    public PostgreDebugSessionResult call() throws Exception
+    public DBRResult call() throws Exception
     {
 
         try (Statement stmt = conn.createStatement()) {
             stmt.executeQuery(sql);
-            return new PostgreDebugSessionResult(true, null);
+            return DefaultResult.ok();
 
         } catch (SQLException e) {
-            return new PostgreDebugSessionResult(false, e);
+            String message = String.format("Failed to execute %s", sql);
+            return DefaultResult.error(message, e);
         }
     }