dbeaver/pro#3643 Utils refactoring

dbeaver · Nov 13, 2024 · 5bcef92 · 5bcef92
1 parent bbe0e15
commit 5bcef92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.java
@@ -22,7 +22,6 @@
 import graphql.language.SourceLocation;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.sql.SQLState;
-import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;
 
 import java.io.PrintWriter;
@@ -100,7 +99,7 @@ public ErrorClassification getErrorType() {
     @Override
     public Map<String, Object> getExtensions() {
         StringWriter buf = new StringWriter();
-        GeneralUtils.getRootCause(this).printStackTrace(new PrintWriter(buf, true));
+        CommonUtils.getRootCause(this).printStackTrace(new PrintWriter(buf, true));
 
         Map<String, Object> extensions = new LinkedHashMap<>();
         String stString = buf.toString();

diff --git a/...r/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java b/...r/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java
@@ -31,7 +31,6 @@
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.navigator.fs.DBNPathBase;
-import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.IOUtils;
 
@@ -100,7 +99,7 @@ private void doPost(WebSession session, HttpServletRequest request, HttpServletR
             }
         } catch (Exception e) {
             throw new DBWebException("File Upload Failed: Unable to Save File to the File System",
-                GeneralUtils.getRootCause(e));
+                CommonUtils.getRootCause(e));
         }
     }
 }
diff --git a/...ervice.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java b/...ervice.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java
@@ -23,7 +23,7 @@
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.runtime.AbstractJob;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.utils.GeneralUtils;
+import org.jkiss.utils.CommonUtils;
 
 public class ClearAuthAttemptInfoJob extends AbstractJob {
 
@@ -45,7 +45,7 @@ protected IStatus run(DBRProgressMonitor monitor) {
             securityController.clearOldAuthAttemptInfo();
             schedule(CHECK_PERIOD);
         } catch (DBException e) {
-            log.error("Error to clear the auth attempt info: " + GeneralUtils.getRootCause(e).getMessage());
+            log.error("Error to clear the auth attempt info: " + CommonUtils.getRootCause(e).getMessage());
             // Check failed. Re-schedule after 5 seconds
             schedule(RETRY_PERIOD);
         }