BI-560 - Add branch to Vcs (#448)

Author: yahavi

build-info-api/src/main/java/org/jfrog/build/api/Vcs.java

@@ -10,6 +10,7 @@
 @XStreamAlias(BuildInfoFields.VCS)
 public class Vcs implements Serializable {
     private String revision = "";
+    private String branch = "";
     private String url = "";
 
     public Vcs() {
@@ -20,6 +21,11 @@ public Vcs(String vcsUrl, String vcsRevision) {
         this.setRevision(vcsRevision);
     }
 
+    public Vcs(String vcsUrl, String vcsRevision, String branch) {
+        this(vcsUrl, vcsRevision);
+        this.branch = branch;
+    }
+
     public String getRevision() {
         return revision;
     }
@@ -28,6 +34,14 @@ public void setRevision(String revision) {
         this.revision = revision;
     }
 
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
     public String getUrl() {
         return this.url;
     }
@@ -38,7 +52,8 @@ public void setUrl(String url) {
 
     @Override
     public String toString() {
-        return "revision= '" + revision + '\'' +
+        return "revision='" + revision + '\'' +
+                ", branch='" + branch + '\'' +
                 ", url='" + url + '\'';
     }
 
@@ -52,18 +67,18 @@ public boolean equals(Object o) {
         }
 
         Vcs that = (Vcs) o;
-        return Objects.equals(revision, that.revision) && Objects.equals(url, that.url);
+        return Objects.equals(revision, that.revision) &&
+                Objects.equals(branch, that.branch) &&
+                Objects.equals(url, that.url);
     }
 
     @Override
     public int hashCode() {
-        int result = (revision != null ? revision.hashCode() : 0);
-        result = 31 * result + (url != null ? url.hashCode() : 0);
-        return result;
+        return Objects.hash(revision, branch, url);
     }
 
     @JsonIgnore
     public boolean isEmpty() {
-        return StringUtils.isEmpty(this.getRevision()) && StringUtils.isEmpty(this.getUrl());
+        return StringUtils.isEmpty(getRevision()) && StringUtils.isEmpty(getBranch()) && StringUtils.isEmpty(getUrl());
     }
 }

build-info-api/src/test/java/org/jfrog/build/api/BuildTest.java

@@ -26,11 +26,7 @@
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;
 
 import static org.testng.Assert.*;
 
@@ -79,9 +75,7 @@ public void testSetters() {
         String url = "mitz";
         String parentName = "pooh";
         String parentNumber = "5";
-        List<Vcs> vcsList = Arrays.asList(
-                new Vcs(url, "2421")
-        );
+        List<Vcs> vcsList = Collections.singletonList(new Vcs(url, "2421", "main"));
 
         List<Module> modules = new ArrayList<>();
         List<PromotionStatus> statuses = new ArrayList<>();