Merge origin/master

Author: vertigo17

source/src/main/java/org/cerberus/core/api/services/QueuedExecutionService.java

@@ -197,7 +197,7 @@ public QueuedExecutionResult addCampaignToExecutionQueue(String campaignId, Queu
         LOG.debug("MANUALEXEC {}", manualExecution);
         if (CollectionUtils.isEmpty(robots)) {
             if (manualExecution.equalsIgnoreCase("Y") || manualExecution.equalsIgnoreCase("A")) {
-                robotsMap.put("", robotFactory.create(0, "", "", "", "", true, "", "", "", "", "", 0, "", true, "", ""));
+                robotsMap.put("", robotFactory.create(0, "", "", "", "", true, "", "", "", "", "", 0, "", true, "", "", ""));
             } else {
                 throw new InvalidRequestException("No robots found for this campaign");
             }

source/src/main/java/org/cerberus/core/crud/dao/impl/RobotDAO.java

@@ -560,11 +560,12 @@ public Robot loadFromResultSet(ResultSet rs) throws SQLException {
         String type = ParameterParserUtil.parseStringParam(rs.getString("type"), "");
         Integer acceptNotifications = ParameterParserUtil.parseIntegerParam(rs.getString("AcceptNotifications"), 0);
         String extraParam = ParameterParserUtil.parseStringParam(rs.getString("ExtraParam"), "");
+        String preloadScript = ParameterParserUtil.parseStringParam(rs.getString("preloadScript"), "");
         boolean isAcceptInsecureCerts = rs.getBoolean("isAcceptInsecureCerts");
 
         //TODO remove when working in test with mockito and autowired
         factoryRobot = new FactoryRobot();
-        return factoryRobot.create(robotID, robot, platform, browser, version, isActive, lbexemethod, description, userAgent, screenSize, profileFolder, acceptNotifications, extraParam, isAcceptInsecureCerts, robotDecli, type);
+        return factoryRobot.create(robotID, robot, platform, browser, version, isActive, lbexemethod, description, userAgent, screenSize, profileFolder, acceptNotifications, extraParam, isAcceptInsecureCerts, robotDecli, type, preloadScript);
     }
 
     @Override

source/src/main/java/org/cerberus/core/crud/entity/Robot.java

@@ -22,6 +22,8 @@
 import java.sql.Timestamp;
 
 import java.util.List;
+
+import lombok.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
@@ -32,6 +34,11 @@
  *
  * @author bcivel
  */
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Robot {
 
     private static final Logger LOG = LogManager.getLogger(Robot.class);
@@ -42,20 +49,21 @@ public class Robot {
     private String platform;
     private String browser;
     private String version;
-    private boolean isActive;
+    private boolean active;
     private String userAgent;
     private String screenSize;
     private String profileFolder;
     private String extraParam;
     private Integer acceptNotifications;
-    private boolean isAcceptInsecureCerts;
+    private boolean acceptInsecureCerts;
+    private String preloadScript;
     private String robotDecli;
-    private String lbexemethod; // Contain the method used in order to spread the load against all executors of the robot.
+    private String lbexemethod; // Contain the method used in order to spread the load against all executors of the robot
     private String description;
-    private String UsrCreated;
-    private Timestamp DateCreated;
-    private String UsrModif;
-    private Timestamp DateModif;
+    private String usrCreated;
+    private Timestamp dateCreated;
+    private String usrModif;
+    private Timestamp dateModif;
 
     public static final String LOADBALANCINGEXECUTORMETHOD_ROUNDROBIN = "ROUNDROBIN";
     public static final String LOADBALANCINGEXECUTORMETHOD_BYRANKING = "BYRANKING";
@@ -67,186 +75,6 @@ public class Robot {
     private List<RobotCapability> capabilitiesDecoded;
     private List<RobotExecutor> executors;
 
-    public String getExtraParam() {
-        return extraParam;
-    }
-
-    public void setExtraParam(String extraParam) {
-        this.extraParam = extraParam;
-    }
-
-    public boolean isAcceptInsecureCerts() {
-        return isAcceptInsecureCerts;
-    }
-
-    public void setIsAcceptInsecureCerts(boolean isAcceptInsecureCerts) {
-        this.isAcceptInsecureCerts = isAcceptInsecureCerts;
-    }
-
-    public String getProfileFolder() {
-        return profileFolder;
-    }
-
-    public void setProfileFolder(String profileFolder) {
-        this.profileFolder = profileFolder;
-    }
-
-    public String getUsrCreated() {
-        return UsrCreated;
-    }
-
-    public void setUsrCreated(String UsrCreated) {
-        this.UsrCreated = UsrCreated;
-    }
-
-    public Timestamp getDateCreated() {
-        return DateCreated;
-    }
-
-    public void setDateCreated(Timestamp DateCreated) {
-        this.DateCreated = DateCreated;
-    }
-
-    public String getUsrModif() {
-        return UsrModif;
-    }
-
-    public void setUsrModif(String UsrModif) {
-        this.UsrModif = UsrModif;
-    }
-
-    public Timestamp getDateModif() {
-        return DateModif;
-    }
-
-    public void setDateModif(Timestamp DateModif) {
-        this.DateModif = DateModif;
-    }
-
-    public List<RobotExecutor> getExecutors() {
-        return executors;
-    }
-
-    public void setExecutors(List<RobotExecutor> executors) {
-        this.executors = executors;
-    }
-
-    public List<RobotCapability> getCapabilitiesDecoded() {
-        return capabilitiesDecoded;
-    }
-
-    public void setCapabilitiesDecoded(List<RobotCapability> capabilitiesDecoded) {
-        this.capabilitiesDecoded = capabilitiesDecoded;
-    }
-
-    public String getLbexemethod() {
-        return lbexemethod;
-    }
-
-    public void setLbexemethod(String lbexemethod) {
-        this.lbexemethod = lbexemethod;
-    }
-
-    public String getRobotDecli() {
-        return robotDecli;
-    }
-
-    public void setRobotDecli(String robotDecli) {
-        this.robotDecli = robotDecli;
-    }
-
-    public String getScreenSize() {
-        return screenSize;
-    }
-
-    public void setScreenSize(String screenSize) {
-        this.screenSize = screenSize;
-    }
-
-    public String getUserAgent() {
-        return userAgent;
-    }
-
-    public void setUserAgent(String userAgent) {
-        this.userAgent = userAgent;
-    }
-
-    public Integer getRobotID() {
-        return robotID;
-    }
-
-    public void setRobotID(Integer robotID) {
-        this.robotID = robotID;
-    }
-
-    public String getRobot() {
-        return robot;
-    }
-
-    public void setRobot(String robot) {
-        this.robot = robot;
-    }
-
-    public boolean isActive() {
-        return isActive;
-    }
-
-    public void setIsActive(boolean active) {
-        this.isActive = active;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(String platform) {
-        this.platform = platform;
-    }
-
-    public String getBrowser() {
-        return browser;
-    }
-
-    public void setBrowser(String browser) {
-        this.browser = browser;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public List<RobotCapability> getCapabilities() {
-        return capabilities;
-    }
-
-    public void setCapabilities(List<RobotCapability> capabilities) {
-        this.capabilities = capabilities;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Integer getAcceptNotifications(){return acceptNotifications;}
-
-    public void setAcceptNotifications(Integer acceptNotifications){this.acceptNotifications = acceptNotifications;}
-
     /**
      * Convert the current TestCaseExecution into JSON format
      *
@@ -271,33 +99,29 @@ public JSONObject toJson(boolean withChilds, boolean secured) {
             result.put("type", this.getType());
             result.put("isAcceptInsecureCerts", this.isAcceptInsecureCerts());
             result.put("acceptNotifications", this.getAcceptNotifications());
+            result.put("preloadScript", this.getPreloadScript());
             result.put("extraParam", this.getExtraParam());
 
             if (withChilds) {
-                // Looping on ** Capabilities **
                 JSONArray arrayCap = new JSONArray();
                 if (this.getCapabilities() != null) {
-                    for (Object capability : this.getCapabilities()) {
-                        arrayCap.put(((RobotCapability) capability).toJson());
+                    for (RobotCapability capability : this.getCapabilities()) {
+                        arrayCap.put(capability.toJson());
                     }
                 }
                 result.put("capabilities", arrayCap);
 
-                // Looping on ** Executors **
                 JSONArray arrayExecutor = new JSONArray();
                 if (this.getExecutors() != null) {
-                    for (Object executor : this.getExecutors()) {
-                        arrayExecutor.put(((RobotExecutor) executor).toJson(secured));
+                    for (RobotExecutor executor : this.getExecutors()) {
+                        arrayExecutor.put(executor.toJson(secured));
                     }
                 }
                 result.put("executors", arrayExecutor);
-
             }
 
-        } catch (JSONException ex) {
-            LOG.error(ex.toString(), ex);
         } catch (Exception ex) {
-            LOG.error(ex.toString(), ex);
+            LOG.error("Error converting Robot to JSON", ex);
         }
         return result;
     }

source/src/main/java/org/cerberus/core/crud/factory/IFactoryRobot.java

@@ -50,7 +50,7 @@ public interface IFactoryRobot {
      * @return
      */
     Robot create(Integer robotID, String robot, String platform,
-            String browser, String version, boolean isActive, String lbexemethod, String description, String userAgent, String screenSize, String profileFolder, Integer acceptNotifications, String extraParam, boolean isAcceptInsecureCerts, String robotDecli, String type);
+            String browser, String version, boolean isActive, String lbexemethod, String description, String userAgent, String screenSize, String profileFolder, Integer acceptNotifications, String extraParam, boolean isAcceptInsecureCerts, String robotDecli, String type, String preloadScript);
 
     /**
      *
@@ -76,6 +76,6 @@ Robot create(Integer robotID, String robot, String platform,
      */
     Robot create(Integer robotID, String robot, String platform,
             String browser, String version, boolean isActive, String lbexemethod, String description, String userAgent, String screenSize, String profileFolder, Integer acceptNotifications, String extraParam, boolean isAcceptInsecureCerts,
-            List<RobotCapability> capabilities, List<RobotExecutor> executors, String robotDecli, String type);
+            List<RobotCapability> capabilities, List<RobotExecutor> executors, String robotDecli, String type, String preloadScript);
 
 }

source/src/main/java/org/cerberus/core/crud/factory/impl/FactoryRobot.java

@@ -35,21 +35,21 @@ public class FactoryRobot implements IFactoryRobot {
 
     @Override
     public Robot create(Integer robotID, String robot, String platform,
-            String browser, String version, boolean isActive, String lbexemethod, String description, String userAgent, String screenSize, String profileFolder, Integer acceptNotifications, String extraParam, boolean isAcceptInsecureCerts, String robotDecli, String type) {
-        Robot r = create(robotID, robot, platform, browser, version, isActive, lbexemethod, description, userAgent, screenSize, profileFolder,acceptNotifications, extraParam, isAcceptInsecureCerts, new ArrayList<>(), new ArrayList<>(), robotDecli, type);
+            String browser, String version, boolean isActive, String lbexemethod, String description, String userAgent, String screenSize, String profileFolder, Integer acceptNotifications, String extraParam, boolean isAcceptInsecureCerts, String robotDecli, String type, String preloadScript) {
+        Robot r = create(robotID, robot, platform, browser, version, isActive, lbexemethod, description, userAgent, screenSize, profileFolder,acceptNotifications, extraParam, isAcceptInsecureCerts, new ArrayList<>(), new ArrayList<>(), robotDecli, type, preloadScript);
         return r;
     }
 
     @Override
     public Robot create(Integer robotID, String robot, String platform, String browser, String version, boolean isActive, String lbexemethod, String description, String userAgent,
-            String screenSize, String profileFolder, Integer acceptNotifications, String extraParam, boolean isAcceptInsecureCerts, List<RobotCapability> capabilities, List<RobotExecutor> executors, String robotDecli, String type) {
+            String screenSize, String profileFolder, Integer acceptNotifications, String extraParam, boolean isAcceptInsecureCerts, List<RobotCapability> capabilities, List<RobotExecutor> executors, String robotDecli, String type, String preloadScript) {
         Robot newRobot = new Robot();
         newRobot.setRobotID(robotID);
         newRobot.setRobot(robot);
         newRobot.setPlatform(platform);
         newRobot.setBrowser(browser);
         newRobot.setVersion(version);
-        newRobot.setIsActive(isActive);
+        newRobot.setActive(isActive);
         newRobot.setLbexemethod(lbexemethod);
         newRobot.setDescription(description);
         newRobot.setUserAgent(userAgent);
@@ -59,9 +59,10 @@ public Robot create(Integer robotID, String robot, String platform, String brows
         newRobot.setProfileFolder(profileFolder);
         newRobot.setRobotDecli(robotDecli);
         newRobot.setType(type);
-        newRobot.setIsAcceptInsecureCerts(isAcceptInsecureCerts);
+        newRobot.setAcceptInsecureCerts(isAcceptInsecureCerts);
         newRobot.setAcceptNotifications(acceptNotifications);
         newRobot.setExtraParam(extraParam);
+        newRobot.setPreloadScript(preloadScript);
         return newRobot;
     }