Skip to content

Fix Accept Header to use MediaType.WILDCARD #1318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
exceptionfactory wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Accept Header to use MediaType.WILDCARD #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions gitlab4j-api/src/main/java/org/gitlab4j/api/GroupApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2265,12 +2265,7 @@ public Group setGroupAvatar(Object groupIdOrPath, File avatarFile) throws GitLab
public InputStream getAvatar(Object groupIdOrPath) throws GitLabApiException {

Response response = getWithAccepts(
Response.Status.OK,
null,
MediaType.MEDIA_TYPE_WILDCARD,
"groups",
getGroupIdOrPath(groupIdOrPath),
"avatar");
Response.Status.OK, null, MediaType.WILDCARD, "groups", getGroupIdOrPath(groupIdOrPath), "avatar");
return (response.readEntity(InputStream.class));
}

Expand Down
2 changes: 1 addition & 1 deletion gitlab4j-api/src/main/java/org/gitlab4j/api/ImportExportApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public File downloadExport(Object projectIdOrPath, File directory, String filena
Response response = getWithAccepts(
Response.Status.OK,
null,
MediaType.MEDIA_TYPE_WILDCARD,
MediaType.WILDCARD,
"projects",
getProjectIdOrPath(projectIdOrPath),
"export",
Expand Down
8 changes: 4 additions & 4 deletions gitlab4j-api/src/main/java/org/gitlab4j/api/JobApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ public File downloadArtifactsFile(Object projectIdOrPath, String ref, String job
Response response = getWithAccepts(
Response.Status.OK,
formData.asMap(),
MediaType.MEDIA_TYPE_WILDCARD,
MediaType.WILDCARD,
"projects",
getProjectIdOrPath(projectIdOrPath),
"jobs",
Expand Down Expand Up @@ -421,7 +421,7 @@ public InputStream downloadArtifactsFile(Object projectIdOrPath, String ref, Str
Response response = getWithAccepts(
Response.Status.OK,
formData.asMap(),
MediaType.MEDIA_TYPE_WILDCARD,
MediaType.WILDCARD,
"projects",
getProjectIdOrPath(projectIdOrPath),
"jobs",
Expand Down Expand Up @@ -449,7 +449,7 @@ public File downloadArtifactsFile(Object projectIdOrPath, Long jobId, File direc
Response response = getWithAccepts(
Response.Status.OK,
null,
MediaType.MEDIA_TYPE_WILDCARD,
MediaType.WILDCARD,
"projects",
getProjectIdOrPath(projectIdOrPath),
"jobs",
Expand Down Expand Up @@ -485,7 +485,7 @@ public InputStream downloadArtifactsFile(Object projectIdOrPath, Long jobId) thr
Response response = getWithAccepts(
Response.Status.OK,
null,
MediaType.MEDIA_TYPE_WILDCARD,
MediaType.WILDCARD,
"projects",
getProjectIdOrPath(projectIdOrPath),
"jobs",
Expand Down
2 changes: 1 addition & 1 deletion gitlab4j-api/src/main/java/org/gitlab4j/api/ProjectApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ public InputStream getAvatar(Object projectIdOrPath) throws GitLabApiException {
Response response = getWithAccepts(
Response.Status.OK,
null,
MediaType.MEDIA_TYPE_WILDCARD,
MediaType.WILDCARD,
"projects",
getProjectIdOrPath(projectIdOrPath),
"avatar");
Expand Down
2 changes: 1 addition & 1 deletion gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ public InputStream getRawBlobContent(Object projectIdOrPath, String sha) throws
Response response = getWithAccepts(
Response.Status.OK,
null,
MediaType.MEDIA_TYPE_WILDCARD,
MediaType.WILDCARD,
"projects",
getProjectIdOrPath(projectIdOrPath),
"repository",
Expand Down
2 changes: 1 addition & 1 deletion gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryFileApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ public InputStream getRawFile(Object projectIdOrPath, String ref, String filepat
Response response = getWithAccepts(
Response.Status.OK,
formData.asMap(),
MediaType.MEDIA_TYPE_WILDCARD,
MediaType.WILDCARD,
"projects",
getProjectIdOrPath(projectIdOrPath),
"repository",
Expand Down