From a85c0ec1278dea7aad167355f5eacba3aa13eb7b Mon Sep 17 00:00:00 2001
From: Greg Messner <greg@messners.com>
Date: Wed, 29 Nov 2017 22:39:08 -0800
Subject: [PATCH] Misc code clean-up.

---
 src/main/java/org/gitlab4j/api/Constants.java |  3 +-
 src/main/java/org/gitlab4j/api/GitLabApi.java | 13 +++--
 src/main/java/org/gitlab4j/api/LabelsApi.java | 21 +++++--
 src/main/java/org/gitlab4j/api/NotesApi.java  | 55 ++++++++++++++++++-
 4 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/gitlab4j/api/Constants.java b/src/main/java/org/gitlab4j/api/Constants.java
index 011693ac..c4ce2ab3 100644
--- a/src/main/java/org/gitlab4j/api/Constants.java
+++ b/src/main/java/org/gitlab4j/api/Constants.java
@@ -1,8 +1,9 @@
 package org.gitlab4j.api;
 
+import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
 
 public interface Constants {
 
diff --git a/src/main/java/org/gitlab4j/api/GitLabApi.java b/src/main/java/org/gitlab4j/api/GitLabApi.java
index bcf09439..4d4b2696 100644
--- a/src/main/java/org/gitlab4j/api/GitLabApi.java
+++ b/src/main/java/org/gitlab4j/api/GitLabApi.java
@@ -34,7 +34,7 @@ public class GitLabApi {
     private GroupApi groupApi;
     private IssuesApi issuesApi;
     private MergeRequestApi mergeRequestApi;
-    private MileStonesApi mileStonesApi;
+    private MilestonesApi milestonesApi;
     private NamespaceApi namespaceApi;
     private PipelineApi pipelineApi;
     private ProjectApi projectApi;
@@ -324,7 +324,7 @@ public class GitLabApi {
         jobApi = new JobApi(this);
         labelsApi = new LabelsApi(this);
         mergeRequestApi = new MergeRequestApi(this);
-        mileStonesApi = new MileStonesApi(this);
+        milestonesApi = new MilestonesApi(this);
         namespaceApi = new NamespaceApi(this);
         notesApi = new NotesApi(this);
         pipelineApi = new PipelineApi(this);
@@ -547,8 +547,13 @@ public class GitLabApi {
         return (mergeRequestApi);
     }
 
-    public MileStonesApi getMileStonesApi() {
-        return mileStonesApi;
+    /**
+     * Gets the MilsestonesApi instance owned by this GitLabApi instance.
+     *
+     * @return the MilsestonesApi instance owned by this GitLabApi instance
+     */
+    public MilestonesApi getMilestonesApi() {
+        return milestonesApi;
     }
 
     /**
diff --git a/src/main/java/org/gitlab4j/api/LabelsApi.java b/src/main/java/org/gitlab4j/api/LabelsApi.java
index 7134b857..c86ffe80 100644
--- a/src/main/java/org/gitlab4j/api/LabelsApi.java
+++ b/src/main/java/org/gitlab4j/api/LabelsApi.java
@@ -1,10 +1,11 @@
 package org.gitlab4j.api;
 
-import org.gitlab4j.api.models.Label;
+import java.util.List;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
-import java.util.List;
+
+import org.gitlab4j.api.models.Label;
 
 public class LabelsApi extends AbstractApi {
     public LabelsApi(GitLabApi gitLabApi) {
@@ -12,19 +13,23 @@ public class LabelsApi extends AbstractApi {
     }
 
     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>>() {
         }));
     }
 
     public List<Label> getLabels(Integer projectId, int page, int perPage) throws GitLabApiException {
+
         if (projectId == null) {
             throw new RuntimeException("projectId cannot be null");
         }
-        Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "projects", projectId, "labels");
+
+		Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "projects", projectId, "labels");
         return (response.readEntity(new GenericType<List<Label>>() {
         }));
     }
@@ -42,10 +47,12 @@ public class LabelsApi extends AbstractApi {
     }
 
     public Label createLabel(Integer projectId, String name, String color, String description, Integer priority) throws GitLabApiException {
-        if (projectId == null) {
+
+	    if (projectId == null) {
             throw new RuntimeException("projectId cannot be null");
         }
-        GitLabApiForm formData = new GitLabApiForm()
+
+	    GitLabApiForm formData = new GitLabApiForm()
                 .withParam("name", name, true)
                 .withParam("color", color, true)
                 .withParam("description", description)
@@ -63,9 +70,11 @@ public class LabelsApi extends AbstractApi {
     }
 
     public Label updateLabel(Integer projectId, String name, String newName, String color, String description, Integer priority) throws GitLabApiException {
+
         if (projectId == null) {
             throw new RuntimeException("projectId cannot be null");
         }
+
         GitLabApiForm formData = new GitLabApiForm()
                 .withParam("name", name, true)
                 .withParam("new_name", newName)
@@ -77,9 +86,11 @@ public class LabelsApi extends AbstractApi {
     }
 
     public void deleteLabel(Integer projectId, String name) throws GitLabApiException {
+
         if (projectId == null) {
             throw new RuntimeException("projectId cannot be null");
         }
+
         GitLabApiForm formData = new GitLabApiForm()
                 .withParam("name", name, true);
         Response.Status expectedStatus = (isApiVersion(GitLabApi.ApiVersion.V3) ? Response.Status.OK : Response.Status.NO_CONTENT);
diff --git a/src/main/java/org/gitlab4j/api/NotesApi.java b/src/main/java/org/gitlab4j/api/NotesApi.java
index 6f4452b4..e87305be 100644
--- a/src/main/java/org/gitlab4j/api/NotesApi.java
+++ b/src/main/java/org/gitlab4j/api/NotesApi.java
@@ -1,11 +1,12 @@
 package org.gitlab4j.api;
 
-import org.gitlab4j.api.models.Note;
+import java.util.Date;
+import java.util.List;
 
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
-import java.util.Date;
-import java.util.List;
+
+import org.gitlab4j.api.models.Note;
 
 public class NotesApi extends AbstractApi {
 
@@ -13,6 +14,54 @@ public class NotesApi extends AbstractApi {
         super(gitLabApi);
     }
 
+    /**
+     * Get a list of the issues's notes. Only returns the first page
+     *
+     * GET /projects/:id/issues/:issue_iid/notes
+     *
+     * @param projectId the project ID to get the issues for
+     * @param issueIid the issue ID to get the notes for
+     * @return a list of the issues's notes
+     * @throws GitLabApiException if any exception occurs
+     * @deprecated As of release 4.7.0, replaced by {@link #getIssueNotes(Integer, Integer)}
+     */
+    public List<Note> getNotes(Integer projectId, Integer issueIid) throws GitLabApiException {
+        return (getIssueNotes(projectId, issueIid));
+    }
+
+    /**
+     * Get a list of the issue's notes using the specified page and per page settings.
+     *
+     * GET /projects/:id/issues/:issue_iid/notes
+     *
+     * @param projectId the project ID to get the issues for
+     * @param issueIid the issue IID to get the notes for
+     * @param page the page to get
+     * @param perPage the number of notes per page
+     * @return the list of notes in the specified range
+     * @throws GitLabApiException if any exception occurs
+     * @deprecated As of release 4.7.0, replaced by {@link #getIssueNotes(Integer, Integer, int, int)}
+     */
+    public List<Note> getNotes(Integer projectId, Integer issueIid, int page, int perPage) throws GitLabApiException {
+        return (getIssueNotes(projectId, issueIid, page, perPage));
+    }
+
+    /**
+     * Get a Pager of issues's notes.
+     *
+     * GET /projects/:id/issues/:issue_iid/notes
+     *
+     * @param projectId the project ID to get the issues for
+     * @param issueIid the issue IID to get the notes for
+     * @param itemsPerPage the number of notes per page
+     * @return the list of notes in the specified range
+     * @throws GitLabApiException if any exception occurs
+     * @deprecated As of release 4.7.0, replaced by {@link #getIssueNotes(Integer, Integer, int)}
+     */
+    public Pager<Note> getNotes(Integer projectId, Integer issueIid, int itemsPerPage) throws GitLabApiException {
+        return (getIssueNotes(projectId, issueIid, itemsPerPage));
+    }
+
     /**
      * Get a list of the issues's notes. Only returns the first page
      *
-- 
GitLab