From 880914033cfb468b0eade6ca7dfab0aed1b8c6e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 14:29:12 -0700 Subject: [PATCH 1/2] Bump jackson-databind from 2.5.3 to 2.9.10.5 (#377) Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.5.3 to 2.9.10.5. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e13ad98..902f0424 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ com.fasterxml.jackson.core jackson-databind - 2.5.3 + 2.9.10.5 commons-io From 4982cfbc361f357d09087cd4ae508ca244af4f67 Mon Sep 17 00:00:00 2001 From: cpp597455873 <597455873@qq.com> Date: Thu, 9 Jul 2020 05:29:57 +0800 Subject: [PATCH 2/2] hooks api support pagination (#376) Co-authored-by: chenpiaopiao --- src/main/java/org/gitlab/api/GitlabAPI.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 4f2ebccb..c0c88fa7 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2523,14 +2523,12 @@ public void unprotectBranch(GitlabProject project, String branchName) throws IOE public List getProjectHooks(Serializable projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectHook.URL; - GitlabProjectHook[] hooks = retrieve().to(tailUrl, GitlabProjectHook[].class); - return Arrays.asList(hooks); + return retrieve().getAll(tailUrl, GitlabProjectHook[].class); } public List getProjectHooks(GitlabProject project) throws IOException { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabProjectHook.URL; - GitlabProjectHook[] hooks = retrieve().to(tailUrl, GitlabProjectHook[].class); - return Arrays.asList(hooks); + return retrieve().getAll(tailUrl, GitlabProjectHook[].class); } public GitlabProjectHook getProjectHook(GitlabProject project, String hookId) throws IOException {