HAP-409 - support multi-configuration projects

Author: liorhson

Diff for: build-info-api/src/main/java/org/jfrog/build/api/Build.java

@@ -60,6 +60,9 @@ public class Build extends BaseBuildBean {
 
     private BuildRetention buildRetention;
 
+    @XStreamAlias(RUN_PARAMETERS)
+    private List<MatrixParameter> runParameters;
+
     @XStreamAlias(MODULES)
     private List<Module> modules;
 
@@ -71,6 +74,17 @@ public class Build extends BaseBuildBean {
 
     private Governance governance;
 
+    /**
+     * Formats the timestamp to the ISO date time string format expected by the build info API.
+     *
+     * @param timestamp The build start time timestamp
+     * @return ISO date time formatted string
+     */
+    public static String formatBuildStarted(long timestamp) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(STARTED_FORMAT);
+        return dateFormat.format(timestamp);
+    }
+
     /**
      * Returns the version of the build
      *
@@ -423,18 +437,30 @@ public void setLicenseControl(LicenseControl licenseControl) {
         this.licenseControl = licenseControl;
     }
 
+    public BuildRetention getBuildRetention() {
+        return buildRetention;
+    }
+
     public void setBuildRetention(BuildRetention buildRetention) {
         this.buildRetention = buildRetention;
     }
 
-    public BuildRetention getBuildRetention() {
-        return buildRetention;
+    public List<MatrixParameter> getRunParameters() {
+        return runParameters;
+    }
+
+    public void setRunParameters(List<MatrixParameter> runParameters) {
+        this.runParameters = runParameters;
     }
 
     public List<PromotionStatus> getStatuses() {
         return statuses;
     }
 
+    public void setStatuses(List<PromotionStatus> statuses) {
+        this.statuses = statuses;
+    }
+
     public void addStatus(PromotionStatus promotionStatus) {
         if (statuses == null) {
             statuses = Lists.newArrayList();
@@ -443,28 +469,22 @@ public void addStatus(PromotionStatus promotionStatus) {
         statuses.add(promotionStatus);
     }
 
-    public void setStatuses(List<PromotionStatus> statuses) {
-        this.statuses = statuses;
-    }
-
     /**
-     * Formats the timestamp to the ISO date time string format expected by the build info API.
+     * Returns the build dependencies of this build
      *
-     * @param timestamp The build start time timestamp
-     * @return ISO date time formatted string
+     * @return list of #BuildDependency objects
      */
-    public static String formatBuildStarted(long timestamp) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat(STARTED_FORMAT);
-        return dateFormat.format(timestamp);
+    public List<BuildDependency> getBuildDependencies() {
+        return buildDependencies;
     }
 
     /**
-     * Returns the build dependencies of this build
+     * Sets build dependencies for this build
      *
-     * @return list of #BuildDependency objects
+     * @param buildDependencies List of #BuildDependency objects
      */
-    public List<BuildDependency> getBuildDependencies() {
-        return buildDependencies;
+    public void setBuildDependencies(List<BuildDependency> buildDependencies) {
+        this.buildDependencies = buildDependencies;
     }
 
     /**
@@ -479,15 +499,6 @@ public void addBuildDependency(BuildDependency buildDependency) {
         buildDependencies.add(buildDependency);
     }
 
-    /**
-     * Sets build dependencies for this build
-     *
-     * @param buildDependencies List of #BuildDependency objects
-     */
-    public void setBuildDependencies(List<BuildDependency> buildDependencies) {
-        this.buildDependencies = buildDependencies;
-    }
-
     public Issues getIssues() {
         return issues;
     }

Diff for: build-info-api/src/main/java/org/jfrog/build/api/BuildBean.java

@@ -33,6 +33,7 @@ public interface BuildBean extends Serializable {
     String ARTIFACT = "artifact";
     String DEPENDENCIES = "dependencies";
     String DEPENDENCY = "dependency";
+    String RUN_PARAMETERS = "runParameters";
 
     /**
      * Returns the properties of the bean

Diff for: build-info-api/src/main/java/org/jfrog/build/api/BuildInfoFields.java

@@ -43,4 +43,5 @@ public interface BuildInfoFields {
     String RELEASE_ENABLED = "promotion.enabled";
     String RELEASE_COMMENT = "promotion.comment";
     String BUILD_ROOT = "build.root";
+    String RUN_PARAMETERS = "runParameters.";
 }

Diff for: build-info-api/src/main/java/org/jfrog/build/api/builder/BuildInfoBuilder.java

@@ -33,28 +33,29 @@
  */
 public class BuildInfoBuilder {
 
-    private String version;
-    private String name;
-    private String started;
-    private String number;
-    private BuildType type;
-    private Agent agent;
-    private BuildAgent buildAgent;
-    private long durationMillis;
-    private String principal;
-    private String artifactoryPrincipal;
-    private String url;
-    private String parentName;
-    private String parentNumber;
-    private String vcsRevision;
-    private String vcsUrl;
-    private List<Module> modules;
-    private List<PromotionStatus> statuses;
-    private Properties properties;
-    private LicenseControl licenseControl;
-    private BuildRetention buildRetention;
-    private Issues issues;
-    private Governance governance;
+    protected String version;
+    protected String name;
+    protected String started;
+    protected String number;
+    protected BuildType type;
+    protected Agent agent;
+    protected BuildAgent buildAgent;
+    protected long durationMillis;
+    protected String principal;
+    protected String artifactoryPrincipal;
+    protected String url;
+    protected String parentName;
+    protected String parentNumber;
+    protected String vcsRevision;
+    protected String vcsUrl;
+    protected List<MatrixParameter> runParameters;
+    protected List<Module> modules;
+    protected List<PromotionStatus> statuses;
+    protected Properties properties;
+    protected LicenseControl licenseControl;
+    protected BuildRetention buildRetention;
+    protected Issues issues;
+    protected Governance governance;
 
     public BuildInfoBuilder(String name) {
         this.name = name;
@@ -92,6 +93,7 @@ public Build build() {
         build.setUrl(url);
         build.setParentName(parentName);
         build.setParentNumber(parentNumber);
+        build.setRunParameters(runParameters);
         build.setModules(modules);
         build.setStatuses(statuses);
         build.setProperties(properties);
@@ -320,14 +322,40 @@ public BuildInfoBuilder licenseControl(LicenseControl licenseControl) {
     /**
      * Sets the post build retention period
      *
-     * @param licenseControl Build violation  recipients.
+     * @param buildRetention Build violation  recipients.
      * @return Builder instance
      */
     public BuildInfoBuilder buildRetention(BuildRetention buildRetention) {
         this.buildRetention = buildRetention;
         return this;
     }
 
+    /**
+     * Sets the post build retention period
+     *
+     * @param runParameters matrix parameters.
+     * @return Builder instance
+     */
+    public BuildInfoBuilder buildRunParameters(List<MatrixParameter> runParameters) {
+        this.runParameters = runParameters;
+        return this;
+    }
+
+    /**
+     * Sets the post build retention period
+     *
+     * @param parameter MatrixParameter.
+     * @return Builder instance
+     */
+    public BuildInfoBuilder addRunParameters(MatrixParameter parameter) {
+        if (runParameters == null) {
+            runParameters = Lists.newArrayList();
+        }
+        runParameters.add(parameter);
+
+        return this;
+    }
+
     /**
      * Adds the given module to the modules list
      *