From 22eeb00bbc7d50a7ceb2c79a4612d7770fe215a1 Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Tue, 7 Nov 2017 11:22:46 +0100 Subject: [PATCH 1/3] Added possibility to get issues by projectId. --- src/main/java/org/gitlab/api/GitlabAPI.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 8e982757..5cd47353 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1728,7 +1728,11 @@ public void deleteProjectHook(GitlabProject project, String hookId) throws IOExc } public List getIssues(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(project.getId()) + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; + return getIssues(project.getId()); + } + + public List getIssues(Serializable projectId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabIssue[].class); } From 4aa99cba210c308024514fa96b97ae81fbff1b93 Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Wed, 8 Nov 2017 14:19:20 +0100 Subject: [PATCH 2/3] Added possibility to create subgroups. --- src/main/java/org/gitlab/api/GitlabAPI.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 5cd47353..49780ea0 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -528,13 +528,31 @@ public GitlabGroup createGroup(CreateGroupRequest request, GitlabUser sudoUser) * @throws IOException on gitlab api call error */ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAccessLevel ldapAccess, GitlabUser sudoUser) throws IOException { + return createGroup(name, path, ldapCn, ldapAccess, sudoUser, null); + } + + /** + * Creates a Group + * + * @param name The name of the group + * @param path The path for the group + * @param ldapCn LDAP Group Name to sync with, null otherwise + * @param ldapAccess Access level for LDAP group members, null otherwise + * @param sudoUser The user to create the group on behalf of + * @param parentId The id of a parent group; the new group will be its subgroup + * @return The GitLab Group + * + * @throws IOException on gitlab api call error + */ + public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAccessLevel ldapAccess, GitlabUser sudoUser, Integer parentId) throws IOException { Query query = new Query() .append("name", name) .append("path", path) .appendIf("ldap_cn", ldapCn) .appendIf("ldap_access", ldapAccess) - .appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null); + .appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null) + .appendIf("parent_id", parentId); String tailUrl = GitlabGroup.URL + query.toString(); From ef159dcb0d3bf0f2da478a7e9280d5c242276b80 Mon Sep 17 00:00:00 2001 From: OlgaMaciaszek Date: Fri, 31 Aug 2018 15:02:31 +0200 Subject: [PATCH 3/3] Fix transfer project to a different namespace to match current GitLab API. --- src/main/java/org/gitlab/api/GitlabAPI.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index f2cd7888..4cbd723a 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2807,8 +2807,9 @@ public List getNamespaceMembers(Integer namespaceId) throws * @throws IOException on gitlab api call error */ public void transfer(Integer namespaceId, Integer projectId) throws IOException { - String tailUrl = GitlabGroup.URL + "/" + namespaceId + GitlabProject.URL + "/" + projectId; - dispatch().to(tailUrl, Void.class); + Query query = new Query().append("namespace", String.valueOf(namespaceId)); + String tailUrl = GitlabProject.URL + "/" + projectId + "/transfer" + query.toString(); + retrieve().method(PUT).to(tailUrl, Void.class); } /**