From 155d8c291c1c008e834c74565e85c8d0a4dd34cf Mon Sep 17 00:00:00 2001 From: exceptionfactory Date: Mon, 23 Mar 2026 13:08:44 -0500 Subject: [PATCH] Fixed Accept Header to use MediaType.WILDCARD - Replaced MediaType.MEDIA_TYPE_WILDCARD with MediaType.WILDCARD as the Accept Header argument for calls to getWithAccepts --- gitlab4j-api/src/main/java/org/gitlab4j/api/GroupApi.java | 7 +------ .../src/main/java/org/gitlab4j/api/ImportExportApi.java | 2 +- gitlab4j-api/src/main/java/org/gitlab4j/api/JobApi.java | 8 ++++---- .../src/main/java/org/gitlab4j/api/ProjectApi.java | 2 +- .../src/main/java/org/gitlab4j/api/RepositoryApi.java | 2 +- .../src/main/java/org/gitlab4j/api/RepositoryFileApi.java | 2 +- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/gitlab4j-api/src/main/java/org/gitlab4j/api/GroupApi.java b/gitlab4j-api/src/main/java/org/gitlab4j/api/GroupApi.java index 755d88a41..155bf046e 100644 --- a/gitlab4j-api/src/main/java/org/gitlab4j/api/GroupApi.java +++ b/gitlab4j-api/src/main/java/org/gitlab4j/api/GroupApi.java @@ -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)); } diff --git a/gitlab4j-api/src/main/java/org/gitlab4j/api/ImportExportApi.java b/gitlab4j-api/src/main/java/org/gitlab4j/api/ImportExportApi.java index c36f425df..7a03ba249 100644 --- a/gitlab4j-api/src/main/java/org/gitlab4j/api/ImportExportApi.java +++ b/gitlab4j-api/src/main/java/org/gitlab4j/api/ImportExportApi.java @@ -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", diff --git a/gitlab4j-api/src/main/java/org/gitlab4j/api/JobApi.java b/gitlab4j-api/src/main/java/org/gitlab4j/api/JobApi.java index d13f2ebb4..4ab7d32f9 100644 --- a/gitlab4j-api/src/main/java/org/gitlab4j/api/JobApi.java +++ b/gitlab4j-api/src/main/java/org/gitlab4j/api/JobApi.java @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/gitlab4j-api/src/main/java/org/gitlab4j/api/ProjectApi.java b/gitlab4j-api/src/main/java/org/gitlab4j/api/ProjectApi.java index 384879b80..46e000557 100644 --- a/gitlab4j-api/src/main/java/org/gitlab4j/api/ProjectApi.java +++ b/gitlab4j-api/src/main/java/org/gitlab4j/api/ProjectApi.java @@ -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"); diff --git a/gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java b/gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java index 64ee231df..d1d19a40a 100644 --- a/gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java +++ b/gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java @@ -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", diff --git a/gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryFileApi.java b/gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryFileApi.java index 05ec4c483..39be583fa 100644 --- a/gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryFileApi.java +++ b/gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryFileApi.java @@ -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",