Add missing fields to ApprovalRule (#1265)

* Add protectedBranches
* Add reportType
* Add appliesToAllProtectedBranches

---------

Co-authored-by: Jeremie Bresson <[email protected]>

Author: christophbrill-cgmcom

gitlab4j-models/src/main/java/org/gitlab4j/api/models/ApprovalRule.java

@@ -11,6 +11,7 @@ public class ApprovalRule implements Serializable {
     private Long id;
     private String name;
     private String ruleType;
+    private String reportType;
     private List<User> eligibleApprovers;
     private Integer approvalsRequired;
     private ApprovalRule sourceRule;
@@ -19,6 +20,8 @@ public class ApprovalRule implements Serializable {
     private Boolean containsHiddenGroups;
     private List<User> approvedBy;
     private Boolean approved;
+    private Boolean appliesToAllProtectedBranches;
+    private List<ProtectedBranch> protectedBranches;
 
     public Long getId() {
         return id;
@@ -44,6 +47,14 @@ public void setRuleType(String ruleType) {
         this.ruleType = ruleType;
     }
 
+    public String getReportType() {
+        return reportType;
+    }
+
+    public void setReportType(String reportType) {
+        this.reportType = reportType;
+    }
+
     public List<User> getEligibleApprovers() {
         return eligibleApprovers;
     }
@@ -100,6 +111,14 @@ public void setApprovedBy(List<User> approvedBy) {
         this.approvedBy = approvedBy;
     }
 
+    public Boolean getAppliesToAllProtectedBranches() {
+        return appliesToAllProtectedBranches;
+    }
+
+    public void setAppliesToAllProtectedBranches(Boolean appliesToAllProtectedBranches) {
+        this.appliesToAllProtectedBranches = appliesToAllProtectedBranches;
+    }
+
     public Boolean getApproved() {
         return approved;
     }
@@ -108,6 +127,14 @@ public void setApproved(Boolean approved) {
         this.approved = approved;
     }
 
+    public List<ProtectedBranch> getProtectedBranches() {
+        return protectedBranches;
+    }
+
+    public void setProtectedBranches(List<ProtectedBranch> protectedBranches) {
+        this.protectedBranches = protectedBranches;
+    }
+
     @Override
     public String toString() {
         return (JacksonJson.toJsonString(this));

gitlab4j-models/src/test/resources/org/gitlab4j/models/approval-rule.json

@@ -2,6 +2,7 @@
   "id": 1,
   "name": "security",
   "rule_type": "regular",
+  "report_type": "code_coverage",
   "eligible_approvers": [
     {
       "id": 2,
@@ -39,11 +40,38 @@
       "description": "",
       "visibility": "public",
       "lfs_enabled": false,
+      "avatar_url": "https://www.gravatar.com/avatar/0?s=80&d=identicon",
       "web_url": "http://localhost/groups/group1",
       "request_access_enabled": false,
       "full_name": "group1",
       "full_path": "group1"
     }
   ],
+  "applies_to_all_protected_branches": false,
+  "protected_branches": [
+    {
+      "id": 1,
+      "name": "main",
+      "push_access_levels": [
+        {
+          "access_level": 30,
+          "access_level_description": "Developers + Maintainers"
+        }
+      ],
+      "merge_access_levels": [
+        {
+          "access_level": 30,
+          "access_level_description": "Developers + Maintainers"
+        }
+      ],
+      "unprotect_access_levels": [
+        {
+          "access_level": 40,
+          "access_level_description": "Maintainers"
+        }
+      ],
+      "code_owner_approval_required": false
+    }
+  ],
   "contains_hidden_groups": false
 }