From 7221afb85db56ea7bd334d5cdcc01f7f196af9cd Mon Sep 17 00:00:00 2001 From: Andrey Troitskiy Date: Wed, 27 Jun 2018 16:18:37 +0300 Subject: [PATCH 1/2] Search project by namespace and project name --- src/main/java/org/gitlab/api/GitlabAPI.java | 6 ++++-- src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java | 2 +- src/main/java/org/gitlab/api/models/GitlabProject.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 50b860c8..2db4ba30 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -778,7 +778,8 @@ public GitlabProject getProject(Serializable projectId) throws IOException { * use namespace & project name to get project */ public GitlabProject getProject(String namespace, String projectName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeGroupId(namespace) + "%2F" + sanitizeProjectId(projectName); + String tailUrl = GitlabGroup.URL + "/" + sanitizeGroupId(namespace); + tailUrl += GitlabProject.URL + "?search=" + sanitizeProjectId(projectName); return retrieve().to(tailUrl, GitlabProject.class); } @@ -794,7 +795,8 @@ public String getProjectJson(Serializable projectId) throws IOException { * use namespace & project name to get project */ public String getProjectJson(String namespace, String projectName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeGroupId(namespace) + "%2F" + sanitizeProjectId(projectName); + String tailUrl = GitlabGroup.URL + "/" + sanitizeGroupId(namespace); + tailUrl += GitlabProject.URL + "?search=" + sanitizeProjectId(projectName); return retrieve().to(tailUrl, String.class); } diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index 0b2a2a65..83754792 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -261,7 +261,7 @@ private void findNextUrl() throws MalformedURLException { } else { // Since the page query was not present, its safe to assume that we just // currently used the first page, so we can default to page 2 - this.url = new URL(url + (url.indexOf('?') > 0 ? '&' : '?') + "&page=2"); + this.url = new URL(url + (url.indexOf('?') > 0 ? '&' : '?') + "page=2"); } } }; diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 33fb923c..04cf085d 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -125,7 +125,7 @@ public class GitlabProject { @JsonProperty("forked_from_project") private GitlabProject forkedFrom; - @JsonProperty("is_printing_merge_request_link_enabled") + @JsonProperty("printing_merge_request_link_enabled") private Boolean printingMergeRequestLinkEnabled; public Integer getId() { From c36693c921342010202ec9fc06181fee79d03187 Mon Sep 17 00:00:00 2001 From: Andrey Troitskiy Date: Wed, 27 Jun 2018 20:35:46 +0300 Subject: [PATCH 2/2] Reverted --- 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 2db4ba30..50b860c8 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -778,8 +778,7 @@ public GitlabProject getProject(Serializable projectId) throws IOException { * use namespace & project name to get project */ public GitlabProject getProject(String namespace, String projectName) throws IOException { - String tailUrl = GitlabGroup.URL + "/" + sanitizeGroupId(namespace); - tailUrl += GitlabProject.URL + "?search=" + sanitizeProjectId(projectName); + String tailUrl = GitlabProject.URL + "/" + sanitizeGroupId(namespace) + "%2F" + sanitizeProjectId(projectName); return retrieve().to(tailUrl, GitlabProject.class); } @@ -795,8 +794,7 @@ public String getProjectJson(Serializable projectId) throws IOException { * use namespace & project name to get project */ public String getProjectJson(String namespace, String projectName) throws IOException { - String tailUrl = GitlabGroup.URL + "/" + sanitizeGroupId(namespace); - tailUrl += GitlabProject.URL + "?search=" + sanitizeProjectId(projectName); + String tailUrl = GitlabProject.URL + "/" + sanitizeGroupId(namespace) + "%2F" + sanitizeProjectId(projectName); return retrieve().to(tailUrl, String.class); }