Fixed Label entity and added unit test for same.

Author: gmessner

src/main/java/org/gitlab4j/api/LabelsApi.java

@@ -8,19 +8,13 @@
 import org.gitlab4j.api.models.Label;
 
 public class LabelsApi extends AbstractApi {
+
     public LabelsApi(GitLabApi gitLabApi) {
         super(gitLabApi);
     }
 
     public List<Label> getLabels(Integer projectId) throws GitLabApiException {
-
-        if (projectId == null) {
-            throw new RuntimeException("projectId cannot be null");
-        }
-
-        Response response = get(javax.ws.rs.core.Response.Status.OK, getDefaultPerPageParam(), "projects", projectId, "labels");
-        return (response.readEntity(new GenericType<List<Label>>() {
-        }));
+        return (getLabels(projectId, 1, getDefaultPerPage()));
     }
 
     public List<Label> getLabels(Integer projectId, int page, int perPage) throws GitLabApiException {
@@ -30,8 +24,7 @@ public List<Label> getLabels(Integer projectId, int page, int perPage) throws Gi
         }
 
 		Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "projects", projectId, "labels");
-        return (response.readEntity(new GenericType<List<Label>>() {
-        }));
+        return (response.readEntity(new GenericType<List<Label>>() {}));
     }
 
     public Label createLabel(Integer projectId, String name, String color, String description) throws GitLabApiException {

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

@@ -7,22 +7,15 @@
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Label {
-    private Integer id;
 
+    private Integer id;
     private String name;
-
     private String color;
-
     private String description;
-
     private Integer openIssuesCount;
-
     private Integer closedIssuesCount;
-
-    private Integer openMergeRequestCount;
-
+    private Integer openMergeRequestsCount;
     private boolean subscribed;
-
     private Integer priority;
 
     public Integer getId() {
@@ -73,12 +66,12 @@ public void setClosedIssuesCount(Integer closedIssuesCount) {
         this.closedIssuesCount = closedIssuesCount;
     }
 
-    public Integer getOpenMergeRequestCount() {
-        return openMergeRequestCount;
+    public Integer getOpenMergeRequestsCount() {
+        return openMergeRequestsCount;
     }
 
-    public void setOpenMergeRequestCount(Integer openMergeRequestCount) {
-        this.openMergeRequestCount = openMergeRequestCount;
+    public void setOpenMergeRequestsCount(Integer openMergeRequestsCount) {
+        this.openMergeRequestsCount = openMergeRequestsCount;
     }
 
     public boolean isSubscribed() {

src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java

@@ -43,6 +43,7 @@
 import org.gitlab4j.api.models.Issue;
 import org.gitlab4j.api.models.Job;
 import org.gitlab4j.api.models.Key;
+import org.gitlab4j.api.models.Label;
 import org.gitlab4j.api.models.Member;
 import org.gitlab4j.api.models.MergeRequest;
 import org.gitlab4j.api.models.Milestone;
@@ -417,6 +418,21 @@ public void testImpersonationToken() {
         }
     }
 
+    @Test
+    public void testLabels() {
+
+        try {
+
+            InputStreamReader reader = new InputStreamReader(GitLabApi.class.getResourceAsStream("labels.json"));
+            ObjectMapper objectMapper = jacksonJson.getContext(null);
+            List<Label> labels = objectMapper.readValue(reader, new TypeReference<List<Label>>() {});
+            assertTrue(compareJson(labels, "labels"));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     private <T> T makeFakeApiCall(Class<T> returnType, String file) throws JsonParseException, JsonMappingException, IOException {
 
         InputStreamReader reader = new InputStreamReader(GitLabApi.class.getResourceAsStream(file + ".json"));

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

@@ -0,0 +1,53 @@
+[
+  {
+    "id" : 1,
+    "name" : "bug",
+    "color" : "#d9534f",
+    "description": "Bug reported by user",
+    "open_issues_count": 1,
+    "closed_issues_count": 0,
+    "open_merge_requests_count": 1,
+    "subscribed": false,
+    "priority": 10
+  },
+  {
+    "id" : 4,
+    "color" : "#d9534f",
+    "name" : "confirmed",
+    "description": "Confirmed issue",
+    "open_issues_count": 2,
+    "closed_issues_count": 5,
+    "open_merge_requests_count": 0,
+    "subscribed": false
+  },
+  {
+    "id" : 7,
+    "name" : "critical",
+    "color" : "#d9534f",
+    "description": "Critical issue. Need fix ASAP",
+    "open_issues_count": 1,
+    "closed_issues_count": 3,
+    "open_merge_requests_count": 1,
+    "subscribed": false
+  },
+  {
+    "id" : 8,
+    "name" : "documentation",
+    "color" : "#f0ad4e",
+    "description": "Issue about documentation",
+    "open_issues_count": 1,
+    "closed_issues_count": 0,
+    "open_merge_requests_count": 2,
+    "subscribed": false
+  },
+  {
+    "id" : 9,
+    "color" : "#5cb85c",
+    "name" : "enhancement",
+    "description": "Enhancement proposal",
+    "open_issues_count": 1,
+    "closed_issues_count": 0,
+    "open_merge_requests_count": 1,
+    "subscribed": true
+  }
+]