From 5bcef9278ee565bb890c96fe6407e6982b1fbddd Mon Sep 17 00:00:00 2001
From: serge-rider <serge@dbeaver.com>
Date: Wed, 13 Nov 2024 08:38:56 +0100
Subject: [PATCH] dbeaver/pro#3643 Utils refactoring

---
 .../src/io/cloudbeaver/DBWebException.java                    | 3 +--
 .../src/io/cloudbeaver/service/fs/model/WebFSServlet.java     | 3 +--
 .../service/security/internal/ClearAuthAttemptInfoJob.java    | 4 ++--
 3 files changed, 4 insertions(+), 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
index f4cc8e50ea..a06626ed51 100644
--- 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.GraphQLError;
 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 class DBWebException extends DBException implements GraphQLError {
     @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/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java
index fa2514c98f..9a39ba821d 100644
--- a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java
+++ b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java
@@ -31,7 +31,6 @@ import org.eclipse.jetty.ee10.servlet.ServletContextRequest;
 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 @@ public class WebFSServlet extends WebServiceServletBase {
             }
         } 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/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java
index 9c700dcca4..8eb28b5721 100644
--- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java
+++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java
@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.DBException;
 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 @@ public class ClearAuthAttemptInfoJob extends AbstractJob {
             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);
         }