From 4d20b4af630aa29b5905ca7473f10cce024ce077 Mon Sep 17 00:00:00 2001 From: lucashimpens Date: Thu, 13 Feb 2025 15:20:50 +0100 Subject: [PATCH] refactor(robot-executor): rename host_user to HostUser and host_password to HostPassword. --- .../core/crud/dao/impl/RobotExecutorDAO.java | 14 +++++++------- .../database/DocumentationDatabaseService.java | 12 ++++++------ .../servlet/crud/testexecution/CreateRobot.java | 12 ++++++------ .../servlet/crud/testexecution/UpdateRobot.java | 12 ++++++------ source/src/main/resources/database.sql | 6 ++++-- .../src/main/webapp/js/transversalobject/Robot.js | 12 ++++++------ 6 files changed, 35 insertions(+), 33 deletions(-) diff --git a/source/src/main/java/org/cerberus/core/crud/dao/impl/RobotExecutorDAO.java b/source/src/main/java/org/cerberus/core/crud/dao/impl/RobotExecutorDAO.java index 81e3aa1bd..62631c06e 100644 --- a/source/src/main/java/org/cerberus/core/crud/dao/impl/RobotExecutorDAO.java +++ b/source/src/main/java/org/cerberus/core/crud/dao/impl/RobotExecutorDAO.java @@ -146,8 +146,8 @@ public AnswerList readByVariousByCriteria(List robot, Str searchSQL.append(" or rbe.`rank` like ?"); searchSQL.append(" or rbe.`host` like ?"); searchSQL.append(" or rbe.`port` like ?"); - searchSQL.append(" or rbe.`host_user` like ?"); - searchSQL.append(" or rbe.`host_password` like ?"); + searchSQL.append(" or rbe.`HostUser` like ?"); + searchSQL.append(" or rbe.`HostPassword` like ?"); searchSQL.append(" or rbe.`deviceudid` like ?"); searchSQL.append(" or rbe.`devicename` like ?"); searchSQL.append(" or rbe.`usrCreated` like ?"); @@ -269,7 +269,7 @@ public AnswerList readByVariousByCriteria(List robot, Str public Answer create(RobotExecutor object) { MessageEvent msg = null; StringBuilder query = new StringBuilder(); - query.append("INSERT INTO robotexecutor (`robot`, `executor`, `isactive`, `rank`, `host`, `port`, `host_user`, `host_password`, `deviceudid`, `devicename`, `deviceport`, `isdevicelockunlock`, `ExecutorProxyServiceHost`, `ExecutorProxyServicePort`, `ExecutorBrowserProxyHost`, `ExecutorBrowserProxyPort`, `executorproxytype`, `description`, `usrcreated`) "); + query.append("INSERT INTO robotexecutor (`robot`, `executor`, `isactive`, `rank`, `host`, `port`, `HostUser`, `HostPassword`, `deviceudid`, `devicename`, `deviceport`, `isdevicelockunlock`, `ExecutorProxyServiceHost`, `ExecutorProxyServicePort`, `ExecutorBrowserProxyHost`, `ExecutorBrowserProxyPort`, `executorproxytype`, `description`, `usrcreated`) "); query.append("VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); // Debug message on SQL. @@ -367,7 +367,7 @@ public Answer delete(RobotExecutor object) { @Override public Answer update(String robot, String executor, RobotExecutor object) { MessageEvent msg = null; - final String query = "UPDATE robotexecutor SET `robot` = ?, `executor` = ?, description = ?, isactive = ?, `rank` = ?, `host` = ?, `port` = ?, `host_user` = ?, `host_password` = ?, `deviceudid` = ?, `devicename` = ?, `deviceport` = ?, `isdevicelockunlock` = ?, `ExecutorProxyServiceHost` = ?, `ExecutorProxyServicePort` = ?, `ExecutorBrowserProxyHost` = ?, `ExecutorBrowserProxyPort` = ?, `executorproxytype` = ?, " + final String query = "UPDATE robotexecutor SET `robot` = ?, `executor` = ?, description = ?, isactive = ?, `rank` = ?, `host` = ?, `port` = ?, `HostUser` = ?, `HostPassword` = ?, `deviceudid` = ?, `devicename` = ?, `deviceport` = ?, `isdevicelockunlock` = ?, `ExecutorProxyServiceHost` = ?, `ExecutorProxyServicePort` = ?, `ExecutorBrowserProxyHost` = ?, `ExecutorBrowserProxyPort` = ?, `executorproxytype` = ?, " + "dateModif = NOW(), usrModif= ? WHERE `robot` = ? and `executor` = ?"; // Debug message on SQL. @@ -466,8 +466,8 @@ public RobotExecutor loadFromResultSet(ResultSet rs) throws SQLException { String host = ParameterParserUtil.parseStringParam(rs.getString("rbe.host"), ""); String port = ParameterParserUtil.parseStringParam(rs.getString("rbe.port"), ""); int executorExtensionProxyPort = ParameterParserUtil.parseIntegerParam(rs.getString("rbe.ExecutorExtensionProxyPort"), 0); - String host_user = ParameterParserUtil.parseStringParam(rs.getString("rbe.host_user"), ""); - String host_password = ParameterParserUtil.parseStringParam(rs.getString("rbe.host_password"), ""); + String hostUser = ParameterParserUtil.parseStringParam(rs.getString("rbe.HostUser"), ""); + String hostPassword = ParameterParserUtil.parseStringParam(rs.getString("rbe.HostPassword"), ""); String deviceudid = ParameterParserUtil.parseStringParam(rs.getString("rbe.deviceudid"), ""); String devicename = ParameterParserUtil.parseStringParam(rs.getString("rbe.devicename"), ""); Integer deviceport = rs.getInt("rbe.deviceport"); @@ -489,7 +489,7 @@ public RobotExecutor loadFromResultSet(ResultSet rs) throws SQLException { //TODO remove when working in test with mockito and autowired factoryRobotExecutor = new FactoryRobotExecutor(); - return factoryRobotExecutor.create(id, robot, executor, isActive, rank, host, port, host_user, host_password, executorExtensionProxyPort, deviceudid, devicename, deviceport, isDevicelockunlock, executorProxyServiceHost, executorProxyServicePort, executorBrowserProxyHost, executorBrowserProxyPort, executorProxyType, description, usrCreated, dateCreated, usrModif, dateModif); + return factoryRobotExecutor.create(id, robot, executor, isActive, rank, host, port, hostUser, hostPassword, executorExtensionProxyPort, deviceudid, devicename, deviceport, isDevicelockunlock, executorProxyServiceHost, executorProxyServicePort, executorBrowserProxyHost, executorBrowserProxyPort, executorProxyType, description, usrCreated, dateCreated, usrModif, dateModif); } @Override diff --git a/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java b/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java index 893db0e08..7cc359fae 100644 --- a/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java +++ b/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java @@ -768,12 +768,12 @@ public ArrayList getSqlDocumentation() { b.append(",('robotexecutor','Port','','en','Port','Port number of the Executor.',NULL)"); b.append(",('robotexecutor','Port','','fr','Port','Numéro de port de l\\'Executor.',NULL)"); b.append(",('robotexecutor','Port','','fa','درگاه','شماره درگاه مجری.',NULL)"); - b.append(",('robotexecutor','host_user','','en','Host User','In case of authentication this is the username that will be used.',NULL)"); - b.append(",('robotexecutor','host_user','','fr','Nom d\\'Utilisateur pour l\\'hote','En cas d\\'authentification, Nom de l\\'utilisateur à utiliser pour l\\'Executor.',NULL)"); - b.append(",('robotexecutor','host_user','','fa','کاربر میزبان','درصورت احراز هویت این نام کاربری است که استفاده می شود.',NULL)"); - b.append(",('robotexecutor','host_password','','en','Host Password','In case of authentification this is the user password that will be used.',NULL)"); - b.append(",('robotexecutor','host_password','','fr','Mot de passe de l\\'utilisateur','En cas d\\'authentification, Mot de passe à utiliser pour l\\'Executor.',NULL)"); - b.append(",('robotexecutor','host_password','','fa','رمز عبور میزبان','در صورت احراز هویت این رمز عبور استفاده می شود.',NULL)"); + b.append(",('robotexecutor','hostUser','','en','Host User','In case of authentication this is the username that will be used.',NULL)"); + b.append(",('robotexecutor','hostUser','','fr','Nom d\\'Utilisateur pour l\\'hote','En cas d\\'authentification, Nom de l\\'utilisateur à utiliser pour l\\'Executor.',NULL)"); + b.append(",('robotexecutor','hostUser','','fa','کاربر میزبان','درصورت احراز هویت این نام کاربری است که استفاده می شود.',NULL)"); + b.append(",('robotexecutor','hostPassword','','en','Host Password','In case of authentification this is the user password that will be used.',NULL)"); + b.append(",('robotexecutor','hostPassword','','fr','Mot de passe de l\\'utilisateur','En cas d\\'authentification, Mot de passe à utiliser pour l\\'Executor.',NULL)"); + b.append(",('robotexecutor','hostPassword','','fa','رمز عبور میزبان','در صورت احراز هویت این رمز عبور استفاده می شود.',NULL)"); b.append(",('robotexecutor','deviceUdid','','en','Device UDID','When defined, it feed the \\'deviceUdid\\' capability..',NULL)"); b.append(",('robotexecutor','deviceUdid','','fr','UDID du Device','Lorsque défini, renseigne automatiquement la capability \\'deviceUdid\\.',NULL)"); b.append(",('robotexecutor','deviceUdid','','fa','دستگاه UDID','زمانیکه تعریف شود, قابلیت \\'deviceUdid\\' را تغذیه می کند.',NULL)"); diff --git a/source/src/main/java/org/cerberus/core/servlet/crud/testexecution/CreateRobot.java b/source/src/main/java/org/cerberus/core/servlet/crud/testexecution/CreateRobot.java index f1f39c90e..0d4e5642b 100644 --- a/source/src/main/java/org/cerberus/core/servlet/crud/testexecution/CreateRobot.java +++ b/source/src/main/java/org/cerberus/core/servlet/crud/testexecution/CreateRobot.java @@ -237,7 +237,7 @@ private List getExecutorsFromParameter(String robot, HttpServletR Integer rank = reJson.getInt("rank"); String host = reJson.getString("host"); String port = reJson.getString("port"); - String host_user = reJson.getString("hostUser"); + String hostUser = reJson.getString("hostUser"); String deviceName = reJson.getString("deviceName"); String deviceUdid = reJson.getString("deviceUdid"); Integer devicePort = null; @@ -263,19 +263,19 @@ private List getExecutorsFromParameter(String robot, HttpServletR } String description = reJson.getString("description"); - String host_password = reJson.getString("hostPassword"); - if (host_password.equals(StringUtil.SECRET_STRING)) { - host_password = ""; + String hostPassword = reJson.getString("hostPassword"); + if (hostPassword.equals(StringUtil.SECRET_STRING)) { + hostPassword = ""; for (RobotExecutor robotExecutor : reList1) { if (robotExecutor.getID() == id) { - host_password = robotExecutor.getHostPassword(); + hostPassword = robotExecutor.getHostPassword(); LOG.debug("Password not changed so reset to original value : " + robotExecutor.getHostPassword()); } } } if (!delete) { - RobotExecutor reo = reFactory.create(i, robot, executor, isActive, rank, host, port, host_user, host_password, 0, deviceUdid, deviceName, devicePort, false, executorProxyServiceHost, executorProxyServicePort, executorBrowserProxyHost, executorBrowserProxyPort, executorProxyType, description, "", null, "", null); + RobotExecutor reo = reFactory.create(i, robot, executor, isActive, rank, host, port, hostUser, hostPassword, 0, deviceUdid, deviceName, devicePort, false, executorProxyServiceHost, executorProxyServicePort, executorBrowserProxyHost, executorBrowserProxyPort, executorProxyType, description, "", null, "", null); reList.add(reo); } } diff --git a/source/src/main/java/org/cerberus/core/servlet/crud/testexecution/UpdateRobot.java b/source/src/main/java/org/cerberus/core/servlet/crud/testexecution/UpdateRobot.java index 0376b25fe..84f0a82cb 100644 --- a/source/src/main/java/org/cerberus/core/servlet/crud/testexecution/UpdateRobot.java +++ b/source/src/main/java/org/cerberus/core/servlet/crud/testexecution/UpdateRobot.java @@ -266,7 +266,7 @@ private List getExecutorsFromParameter(String robot, HttpServletR Integer rank = reJson.getInt("rank"); String host = reJson.getString("host"); String port = reJson.getString("port"); - String host_user = reJson.getString("hostUser"); + String hostUser = reJson.getString("hostUser"); String deviceName = reJson.getString("deviceName"); String deviceUdid = reJson.getString("deviceUdid"); boolean isDeviceLockUnlock = reJson.getBoolean("isDeviceLockUnlock"); @@ -295,19 +295,19 @@ private List getExecutorsFromParameter(String robot, HttpServletR String description = reJson.getString("description"); - String host_password = reJson.getString("hostPassword"); - if (host_password.equals(StringUtil.SECRET_STRING)) { - host_password = ""; + String hostPassword = reJson.getString("hostPassword"); + if (hostPassword.equals(StringUtil.SECRET_STRING)) { + hostPassword = ""; for (RobotExecutor robotExecutor : reList1) { if (robotExecutor.getID() == id) { - host_password = robotExecutor.getHostPassword(); + hostPassword = robotExecutor.getHostPassword(); LOG.debug("Password not changed so reset to original value : " + robotExecutor.getHostPassword()); } } } if (!delete) { - RobotExecutor reo = reFactory.create(i, robot, executor, isActive, rank, host, port, host_user, host_password, 0, deviceUdid, deviceName, devicePort, isDeviceLockUnlock, executorProxyServiceHost, executorProxyServicePort, executorBrowserProxyHost, executorBrowserProxyPort, executorProxyType, description, "", null, "", null); + RobotExecutor reo = reFactory.create(i, robot, executor, isActive, rank, host, port, hostUser, hostPassword, 0, deviceUdid, deviceName, devicePort, isDeviceLockUnlock, executorProxyServiceHost, executorProxyServicePort, executorBrowserProxyHost, executorBrowserProxyPort, executorProxyType, description, "", null, "", null); reList.add(reo); } } diff --git a/source/src/main/resources/database.sql b/source/src/main/resources/database.sql index 915e8502c..bd51a6152 100644 --- a/source/src/main/resources/database.sql +++ b/source/src/main/resources/database.sql @@ -6609,9 +6609,11 @@ UPDATE testcaseexecutionqueuedep SET `Type`='TCEXEENDOK' where `Type`='TCEXEEND' -- 1882 ALTER TABLE testcaseexecutionqueue MODIFY COLUMN `State` VARCHAR(20) NOT NULL DEFAULT 'QUEUED'; --- 1883-1887 +-- 1883-1889 ALTER TABLE robotexecutor RENAME COLUMN executorExtensionHost TO ExecutorProxyServiceHost; ALTER TABLE robotexecutor RENAME COLUMN executorExtensionPort TO ExecutorProxyServicePort; ALTER TABLE robotexecutor RENAME COLUMN executorProxyHost TO ExecutorBrowserProxyHost; ALTER TABLE robotexecutor RENAME COLUMN executorProxyPort TO ExecutorBrowserProxyPort; -ALTER TABLE robotexecutor RENAME COLUMN NodeProxyPort TO ExecutorExtensionProxyPort; \ No newline at end of file +ALTER TABLE robotexecutor RENAME COLUMN NodeProxyPort TO ExecutorExtensionProxyPort; +ALTER TABLE robotexecutor RENAME COLUMN host_user TO HostUser; +ALTER TABLE robotexecutor RENAME COLUMN host_password TO HostPassword; \ No newline at end of file diff --git a/source/src/main/webapp/js/transversalobject/Robot.js b/source/src/main/webapp/js/transversalobject/Robot.js index c3c20f0fb..f0648c1c0 100644 --- a/source/src/main/webapp/js/transversalobject/Robot.js +++ b/source/src/main/webapp/js/transversalobject/Robot.js @@ -626,8 +626,8 @@ function appendExecutorRow(tableBody, executor) { var rankInput = $("").addClass("form-control input-sm").val(executor.rank); var hostInput = $("").addClass("form-control input-sm").val(executor.host); var portInput = $("").addClass("form-control input-sm").val(executor.port); - var hostUserInput = $("").addClass("form-control input-sm").val(executor.hostUser); - var hostPasswordInput = $("").addClass("form-control input-sm").val(executor.hostPassword); + var hostUserInput = $("").addClass("form-control input-sm").val(executor.hostUser); + var hostPasswordInput = $("").addClass("form-control input-sm").val(executor.hostPassword); var deviceUdidInput = $("").addClass("form-control input-sm").val(executor.deviceUdid); var deviceNameInput = $("").addClass("form-control input-sm").val(executor.deviceName); var devicePortInput = $("").addClass("form-control input-sm").val(executor.devicePort); @@ -688,8 +688,8 @@ function appendExecutorRow(tableBody, executor) { var expandName = $("
").append(""); var host = $("
").append("").append(hostInput); var port = $("
").append("").append(portInput); - var hostuser = $("
").append("").append(hostUserInput); - var hostpass = $("
").append("").append(hostPasswordInput); + var hostUser = $("
").append("").append(hostUserInput); + var hostPassword = $("
").append("").append(hostPasswordInput); var dudid = $("
").append("").append(deviceUdidInput); var dname = $("
").append("").append(deviceNameInput); var dport = $("
").append("").append(devicePortInput); @@ -700,8 +700,8 @@ function appendExecutorRow(tableBody, executor) { var ephost = $("
").append("").append(executorBrowserProxyHostInput); var epport = $("
").append("").append(executorBrowserProxyPortInput); var drow1 = $("
").append(active).append(rank).append(expandName); - var drow2 = $("
").append(host).append(port).append(hostuser).append(hostpass); -// var drow3 = $("
").append(hostuser).append(hostpass); + var drow2 = $("
").append(host).append(port).append(hostUser).append(hostPassword); +// var drow3 = $("
").append(hostUser).append(hostPassword); var drow4 = $("
").append(dudid).append(dname).append(dport).append(dLockUnlock); var drow5 = $("
").append(epType).append(eehost).append(eeport).append(ephost).append(epport); var panelExtra = $("
").append(drow4).append(drow5);