From 3e0ba9279b3c2b75bafcec535238cd8604d949ea Mon Sep 17 00:00:00 2001 From: Igor I Date: Fri, 28 Mar 2025 15:33:36 +0500 Subject: [PATCH] Local tools --- src/main/java/org/ccalm/main/AcceptASDCController.java | 1 + src/main/java/org/ccalm/main/AcceptJSON.java | 3 ++- .../java/org/ccalm/main/utils/{Tools.java => LTools.java} | 6 ++---- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/org/ccalm/main/utils/{Tools.java => LTools.java} (98%) diff --git a/src/main/java/org/ccalm/main/AcceptASDCController.java b/src/main/java/org/ccalm/main/AcceptASDCController.java index e621ef6..a6a31c2 100644 --- a/src/main/java/org/ccalm/main/AcceptASDCController.java +++ b/src/main/java/org/ccalm/main/AcceptASDCController.java @@ -25,6 +25,7 @@ import java.util.*; //import javax.servlet.ServletContext; //import javax.servlet.http.HttpServletResponse; //import javax.servlet.http.Part; +import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/main/java/org/ccalm/main/AcceptJSON.java b/src/main/java/org/ccalm/main/AcceptJSON.java index 1d217ce..a9bd0a1 100644 --- a/src/main/java/org/ccalm/main/AcceptJSON.java +++ b/src/main/java/org/ccalm/main/AcceptJSON.java @@ -37,6 +37,7 @@ import com.zaxxer.hikari.HikariDataSource; import jakarta.servlet.ServletContext; import org.ccalm.main.models.FrmLocustModel; import org.ccalm.main.utils.CustomException; +import org.ccalm.main.utils.LTools; import org.json.JSONObject; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -2332,7 +2333,7 @@ public class AcceptJSON implements ServletContextAware { } catch (Exception e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = Tools.createJSONError(10000,"Internal_Server_Error", (String)null, uuid); + json = LTools.createJSONError(10000,"Internal_Server_Error", (String)null, uuid); } return json.toString(); } diff --git a/src/main/java/org/ccalm/main/utils/Tools.java b/src/main/java/org/ccalm/main/utils/LTools.java similarity index 98% rename from src/main/java/org/ccalm/main/utils/Tools.java rename to src/main/java/org/ccalm/main/utils/LTools.java index 7d01d8b..de67b4c 100644 --- a/src/main/java/org/ccalm/main/utils/Tools.java +++ b/src/main/java/org/ccalm/main/utils/LTools.java @@ -17,9 +17,9 @@ import java.util.Base64; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class Tools { +public class LTools { //--------------------------------------------------------------------------- - private static final Logger logger = LogManager.getLogger(Tools.class); + private static final Logger logger = LogManager.getLogger(LTools.class); //--------------------------------------------------------------------------- public static JSONObject createJSONError(int code, String message, String setting, String marker) { JSONObject json = new JSONObject(); @@ -162,6 +162,4 @@ public class Tools { } return payload; } - - }