Skip to content
GitLab
Unverified Commit a2ea94eb authored by An Phi's avatar An Phi Committed by GitHub
Browse files

Fix issue with getting project repository archive for GitLab 12.9.1 (#542)

parent 03ef4663
Hide whitespace changes
Inline Side-by-side
src/main/java/org/gitlab4j/api/RepositoryApi.java
View file @ a2ea94eb
...@@ -441,7 +441,7 @@ public class RepositoryApi extends AbstractApi { ...@@ -441,7 +441,7 @@ public class RepositoryApi extends AbstractApi {
*/ */
public InputStream getRepositoryArchive(Object projectIdOrPath, String sha) throws GitLabApiException { public InputStream getRepositoryArchive(Object projectIdOrPath, String sha) throws GitLabApiException {
Form formData = new GitLabApiForm().withParam("sha", sha); Form formData = new GitLabApiForm().withParam("sha", sha);
Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.MEDIA_TYPE_WILDCARD, Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.WILDCARD,
"projects", getProjectIdOrPath(projectIdOrPath), "repository", "archive"); "projects", getProjectIdOrPath(projectIdOrPath), "repository", "archive");
return (response.readEntity(InputStream.class)); return (response.readEntity(InputStream.class));
} }
...@@ -487,7 +487,7 @@ public class RepositoryApi extends AbstractApi { ...@@ -487,7 +487,7 @@ public class RepositoryApi extends AbstractApi {
* https://gitlab.com/gitlab-com/support-forum/issues/3067 * https://gitlab.com/gitlab-com/support-forum/issues/3067
*/ */
Form formData = new GitLabApiForm().withParam("sha", sha); Form formData = new GitLabApiForm().withParam("sha", sha);
Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.MEDIA_TYPE_WILDCARD, Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.WILDCARD,
"projects", getProjectIdOrPath(projectIdOrPath), "repository", "archive" + "." + format.toString()); "projects", getProjectIdOrPath(projectIdOrPath), "repository", "archive" + "." + format.toString());
return (response.readEntity(InputStream.class)); return (response.readEntity(InputStream.class));
} }
...@@ -507,7 +507,7 @@ public class RepositoryApi extends AbstractApi { ...@@ -507,7 +507,7 @@ public class RepositoryApi extends AbstractApi {
public File getRepositoryArchive(Object projectIdOrPath, String sha, File directory) throws GitLabApiException { public File getRepositoryArchive(Object projectIdOrPath, String sha, File directory) throws GitLabApiException {
Form formData = new GitLabApiForm().withParam("sha", sha); Form formData = new GitLabApiForm().withParam("sha", sha);
Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.MEDIA_TYPE_WILDCARD, Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.WILDCARD,
"projects", getProjectIdOrPath(projectIdOrPath), "repository", "archive"); "projects", getProjectIdOrPath(projectIdOrPath), "repository", "archive");
try { try {
...@@ -572,7 +572,7 @@ public class RepositoryApi extends AbstractApi { ...@@ -572,7 +572,7 @@ public class RepositoryApi extends AbstractApi {
* https://gitlab.com/gitlab-com/support-forum/issues/3067 * https://gitlab.com/gitlab-com/support-forum/issues/3067
*/ */
Form formData = new GitLabApiForm().withParam("sha", sha); Form formData = new GitLabApiForm().withParam("sha", sha);
Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.MEDIA_TYPE_WILDCARD, Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.WILDCARD,
"projects", getProjectIdOrPath(projectIdOrPath), "repository", "archive" + "." + format.toString()); "projects", getProjectIdOrPath(projectIdOrPath), "repository", "archive" + "." + format.toString());
try { try {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment