Merge remote-tracking branch 'origin/main' into 6.x

Author: jmini

src/main/java/org/gitlab4j/api/models/AbstractIssue.java

@@ -74,14 +74,20 @@ public String toString() {
     private Integer weight;
     private Boolean discussionLocked;
     private TimeStats timeStats;
+    private String severity;
+    private String issueType;
+    private IssueEpic epic;
 
     private Integer upvotes;
     private Integer downvotes;
     private Integer mergeRequestsCount;
     private Boolean hasTasks;
     private String taskStatus;
+    private Boolean imported;
+    private String importedFrom;
     private Iteration iteration;
     private TaskCompletionStatus taskCompletionStatus;
+    private String healthStatus;
 
     public Assignee getAssignee() {
         return assignee;
@@ -328,13 +334,29 @@ public void setTaskStatus(String taskStatus) {
         this.taskStatus = taskStatus;
     }
 
+    public Boolean getImported() {
+        return imported;
+    }
+
+    public void setImported(Boolean imported) {
+        this.imported = imported;
+    }
+
+    public String getImportedFrom() {
+        return importedFrom;
+    }
+
+    public void setImportedFrom(String importedFrom) {
+        this.importedFrom = importedFrom;
+    }
+
     public Iteration getIteration() {
-		return iteration;
-	}
+        return iteration;
+    }
 
-	public void setIteration(Iteration iteration) {
-		this.iteration = iteration;
-	}
+    public void setIteration(Iteration iteration) {
+        this.iteration = iteration;
+    }
 
 	public TaskCompletionStatus getTaskCompletionStatus() {
         return taskCompletionStatus;
@@ -344,6 +366,38 @@ public void setTaskCompletionStatus(TaskCompletionStatus taskCompletionStatus) {
         this.taskCompletionStatus = taskCompletionStatus;
     }
 
+    public String getIssueType() {
+        return issueType;
+    }
+
+    public void setIssueType(String issueType) {
+        this.issueType = issueType;
+    }
+
+    public String getSeverity() {
+        return severity;
+    }
+
+    public void setSeverity(String severity) {
+        this.severity = severity;
+    }
+
+    public IssueEpic getEpic() {
+        return epic;
+    }
+
+    public void setEpic(IssueEpic epic) {
+        this.epic = epic;
+    }
+
+    public String getHealthStatus() {
+        return healthStatus;
+    }
+
+    public void setHealthStatus(String healthStatus) {
+        this.healthStatus = healthStatus;
+    }
+
     @Override
     public String toString() {
         return (JacksonJson.toJsonString(this));

src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java

@@ -13,6 +13,7 @@ public class AbstractMinimalEpic<E extends AbstractMinimalEpic<E>> implements Se
     private Long parentId;
     private String title;
     private String reference;
+    private String url;
 
     public Long getId() {
         return id;
@@ -68,6 +69,14 @@ public void setReference(String reference) {
         this.reference = reference;
     }
 
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
     public String toString() {
         return (JacksonJson.toJsonString(this));
     }

src/main/java/org/gitlab4j/api/models/IssueEpic.java

@@ -0,0 +1,11 @@
+package org.gitlab4j.api.models;
+
+import org.gitlab4j.api.utils.JacksonJson;
+
+public class IssueEpic extends AbstractMinimalEpic<IssueEpic> {
+    private static final long serialVersionUID = 1L;
+
+    public String toString() {
+        return (JacksonJson.toJsonString(this));
+    }
+}

src/test/resources/org/gitlab4j/api/issue.json

@@ -40,6 +40,7 @@
       "id" : 1,
       "name" : "Administrator"
    },
+   "severity": "UNKNOWN",
    "subscribed": false,
    "user_notes_count": 1,
    "web_url": "http://example.com/example/example/issues/1",
@@ -59,6 +60,15 @@
       "count": 0,
       "completed_count": 0
    },
+   "imported": false,
+   "imported_from": "none",
+   "epic": {
+       "id": 1347,
+       "iid": 5,
+       "title": "Test Epic",
+       "url": "/groups/example/-/epics/5",
+       "group_id": 1651
+   },
    "iteration": {
       "id": 158,
       "iid": 34,
@@ -72,5 +82,6 @@
       "start_date": "2023-09-04T00:00:00Z",
       "due_date": "2023-09-10T00:00:00Z",
       "web_url": "http://example.com/example/-/iterations/158"
-  }
+  },
+  "health_status": "needs_attention"
 }