From 0cb325a091247f39152eb80a1053776c49cf6a32 Mon Sep 17 00:00:00 2001 From: dengjia Date: Wed, 21 Aug 2024 16:32:20 +0800 Subject: [PATCH] change javax to jakarta --- pom.xml | 15 ++++--- .../java/org/gitlab4j/api/AbstractApi.java | 11 +++-- .../gitlab4j/api/ApplicationSettingsApi.java | 2 +- .../org/gitlab4j/api/ApplicationsApi.java | 6 +-- .../java/org/gitlab4j/api/AuditEventApi.java | 4 +- .../java/org/gitlab4j/api/AwardEmojiApi.java | 4 +- src/main/java/org/gitlab4j/api/BoardsApi.java | 8 ++-- .../java/org/gitlab4j/api/CommitsApi.java | 8 ++-- .../gitlab4j/api/ContainerRegistryApi.java | 4 +- .../java/org/gitlab4j/api/DeployKeysApi.java | 10 ++--- .../org/gitlab4j/api/DeployTokensApi.java | 2 +- .../java/org/gitlab4j/api/DeploymentsApi.java | 2 +- .../java/org/gitlab4j/api/DiscussionsApi.java | 4 +- .../org/gitlab4j/api/EnvironmentsApi.java | 4 +- src/main/java/org/gitlab4j/api/EpicsApi.java | 6 +-- src/main/java/org/gitlab4j/api/EventsApi.java | 8 ++-- src/main/java/org/gitlab4j/api/GitLabApi.java | 4 +- .../org/gitlab4j/api/GitLabApiClient.java | 20 ++++----- .../org/gitlab4j/api/GitLabApiException.java | 14 +++---- .../java/org/gitlab4j/api/GitLabApiForm.java | 8 ++-- src/main/java/org/gitlab4j/api/GroupApi.java | 6 +-- .../java/org/gitlab4j/api/HealthCheckApi.java | 2 +- .../java/org/gitlab4j/api/HookManager.java | 10 ++--- .../org/gitlab4j/api/ImportExportApi.java | 8 ++-- src/main/java/org/gitlab4j/api/IssuesApi.java | 4 +- src/main/java/org/gitlab4j/api/JobApi.java | 10 ++--- src/main/java/org/gitlab4j/api/KeysApi.java | 6 +-- src/main/java/org/gitlab4j/api/LabelsApi.java | 6 +-- .../java/org/gitlab4j/api/LicenseApi.java | 4 +- .../org/gitlab4j/api/LicenseTemplatesApi.java | 4 +- .../java/org/gitlab4j/api/MarkdownApi.java | 4 +- .../org/gitlab4j/api/MergeRequestApi.java | 8 ++-- .../java/org/gitlab4j/api/MilestonesApi.java | 6 +-- .../java/org/gitlab4j/api/NamespaceApi.java | 4 +- src/main/java/org/gitlab4j/api/NotesApi.java | 4 +- .../gitlab4j/api/NotificationSettingsApi.java | 2 +- .../java/org/gitlab4j/api/PackagesApi.java | 12 +++--- src/main/java/org/gitlab4j/api/Pager.java | 4 +- .../java/org/gitlab4j/api/PipelineApi.java | 4 +- .../java/org/gitlab4j/api/ProjectApi.java | 8 ++-- .../gitlab4j/api/ProtectedBranchesApi.java | 4 +- .../java/org/gitlab4j/api/ReleasesApi.java | 2 +- .../java/org/gitlab4j/api/RepositoryApi.java | 10 ++--- .../org/gitlab4j/api/RepositoryFileApi.java | 8 ++-- .../gitlab4j/api/ResourceLabelEventsApi.java | 2 +- .../java/org/gitlab4j/api/RunnersApi.java | 4 +- .../java/org/gitlab4j/api/ServicesApi.java | 4 +- .../java/org/gitlab4j/api/SnippetsApi.java | 4 +- .../java/org/gitlab4j/api/SystemHooksApi.java | 4 +- src/main/java/org/gitlab4j/api/TagsApi.java | 6 +-- src/main/java/org/gitlab4j/api/TodosApi.java | 2 +- src/main/java/org/gitlab4j/api/UserApi.java | 6 +-- src/main/java/org/gitlab4j/api/WikisApi.java | 6 +-- .../api/systemhooks/SystemHookManager.java | 6 +-- .../org/gitlab4j/api/utils/FileUtils.java | 12 +++--- .../gitlab4j/api/utils/HttpRequestUtils.java | 18 ++++---- .../org/gitlab4j/api/utils/JacksonJson.java | 10 ++--- .../api/utils/MaskingLoggingFilter.java | 42 +++++++++---------- .../api/utils/Oauth2LoginStreamingOutput.java | 8 ++-- .../gitlab4j/api/webhook/WebHookManager.java | 2 +- .../java/org/gitlab4j/api/MockResponse.java | 22 +++++----- .../gitlab4j/api/MockServletInputStream.java | 6 +-- .../api/TestCommitDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestCommitsApi.java | 4 +- .../gitlab4j/api/TestEpicDiscussionsApi.java | 2 +- .../org/gitlab4j/api/TestGitLabApiEvents.java | 4 +- .../gitlab4j/api/TestGitLabApiException.java | 2 +- .../java/org/gitlab4j/api/TestGroupApi.java | 2 +- .../gitlab4j/api/TestIssueDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestIssuesApi.java | 2 +- .../api/TestMergeRequestDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestProjectApi.java | 2 +- .../api/TestSnippetDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestStreams.java | 2 +- .../gitlab4j/api/TestUnitMergeRequestApi.java | 2 +- .../java/org/gitlab4j/api/TestUserApi.java | 2 +- src/test/resources/test-gitlab4j.properties | 2 +- 77 files changed, 243 insertions(+), 239 deletions(-) diff --git a/pom.xml b/pom.xml index 9af847a9..4e0e3181 100644 --- a/pom.xml +++ b/pom.xml @@ -45,16 +45,16 @@ - 8 - 1.8 - 1.8 + 17 + 17 + 17 UTF-8 UTF-8 - 2.35 + 3.0.4 2.12.4 - 4.0.4 + 6.0.0 1.2.2 5.8.2 @@ -387,6 +387,11 @@ + + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 + jakarta.activation diff --git a/src/main/java/org/gitlab4j/api/AbstractApi.java b/src/main/java/org/gitlab4j/api/AbstractApi.java index 3fd19ddd..caaa7894 100644 --- a/src/main/java/org/gitlab4j/api/AbstractApi.java +++ b/src/main/java/org/gitlab4j/api/AbstractApi.java @@ -4,12 +4,11 @@ import java.io.File; import java.io.InputStream; import java.net.URL; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; - +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.models.Group; import org.gitlab4j.api.models.Label; diff --git a/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java b/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java index 28ff1d71..ee76efcc 100644 --- a/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java +++ b/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java @@ -3,7 +3,7 @@ package org.gitlab4j.api; import java.text.ParseException; import java.util.Iterator; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Setting; import org.gitlab4j.api.models.ApplicationSettings; diff --git a/src/main/java/org/gitlab4j/api/ApplicationsApi.java b/src/main/java/org/gitlab4j/api/ApplicationsApi.java index b5c79370..277c5d84 100644 --- a/src/main/java/org/gitlab4j/api/ApplicationsApi.java +++ b/src/main/java/org/gitlab4j/api/ApplicationsApi.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Application; @@ -43,7 +43,7 @@ public class ApplicationsApi extends AbstractApi { * @throws GitLabApiException if any exception occurs */ public List getApplications(int page, int perPage) throws GitLabApiException { - Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "applications"); + Response response = get(Response.Status.OK, getPageQueryParams(page, perPage), "applications"); return (response.readEntity(new GenericType>() {})); } diff --git a/src/main/java/org/gitlab4j/api/AuditEventApi.java b/src/main/java/org/gitlab4j/api/AuditEventApi.java index eebfb617..f5ed7013 100644 --- a/src/main/java/org/gitlab4j/api/AuditEventApi.java +++ b/src/main/java/org/gitlab4j/api/AuditEventApi.java @@ -4,8 +4,8 @@ import java.util.Date; import java.util.List; import java.util.stream.Stream; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.AuditEvent; import org.gitlab4j.api.utils.ISO8601; diff --git a/src/main/java/org/gitlab4j/api/AwardEmojiApi.java b/src/main/java/org/gitlab4j/api/AwardEmojiApi.java index dce6a130..57b6f478 100644 --- a/src/main/java/org/gitlab4j/api/AwardEmojiApi.java +++ b/src/main/java/org/gitlab4j/api/AwardEmojiApi.java @@ -2,8 +2,8 @@ package org.gitlab4j.api; import java.util.List; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.AwardEmoji; diff --git a/src/main/java/org/gitlab4j/api/BoardsApi.java b/src/main/java/org/gitlab4j/api/BoardsApi.java index 975cba5e..112bc854 100644 --- a/src/main/java/org/gitlab4j/api/BoardsApi.java +++ b/src/main/java/org/gitlab4j/api/BoardsApi.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Board; import org.gitlab4j.api.models.BoardList; @@ -49,7 +49,7 @@ public class BoardsApi extends AbstractApi { * @throws GitLabApiException if any exception occurs */ public List getBoards(Object projectIdOrPath, int page, int perPage) throws GitLabApiException { - Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), + Response response = get(jakarta.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "projects", getProjectIdOrPath(projectIdOrPath), "boards"); return (response.readEntity(new GenericType>() {})); } @@ -206,7 +206,7 @@ public class BoardsApi extends AbstractApi { * @throws GitLabApiException if any exception occurs */ public List getBoardLists(Object projectIdOrPath, Long boardId, int page, int perPage) throws GitLabApiException { - Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), + Response response = get(Response.Status.OK, getPageQueryParams(page, perPage), "projects", getProjectIdOrPath(projectIdOrPath), "boards", boardId, "lists"); return (response.readEntity(new GenericType>() {})); } diff --git a/src/main/java/org/gitlab4j/api/CommitsApi.java b/src/main/java/org/gitlab4j/api/CommitsApi.java index c6cffde7..560261ac 100644 --- a/src/main/java/org/gitlab4j/api/CommitsApi.java +++ b/src/main/java/org/gitlab4j/api/CommitsApi.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Comment; import org.gitlab4j.api.models.Commit; diff --git a/src/main/java/org/gitlab4j/api/ContainerRegistryApi.java b/src/main/java/org/gitlab4j/api/ContainerRegistryApi.java index 87fc6289..8b16a12c 100644 --- a/src/main/java/org/gitlab4j/api/ContainerRegistryApi.java +++ b/src/main/java/org/gitlab4j/api/ContainerRegistryApi.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.RegistryRepository; import org.gitlab4j.api.models.RegistryRepositoryTag; diff --git a/src/main/java/org/gitlab4j/api/DeployKeysApi.java b/src/main/java/org/gitlab4j/api/DeployKeysApi.java index c8525956..89a8e3cd 100644 --- a/src/main/java/org/gitlab4j/api/DeployKeysApi.java +++ b/src/main/java/org/gitlab4j/api/DeployKeysApi.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.DeployKey; @@ -32,7 +32,7 @@ public class DeployKeysApi extends AbstractApi { } /** - * Get a list of all deploy keys across all projects of the GitLab instance using the specified page and per page settings. + * Get a list of all deploy keys across all projects of the GitLab instance using the specified page and per page settings. * This method requires admin access. * *
GitLab Endpoint: GET /deploy_keys
@@ -86,7 +86,7 @@ public class DeployKeysApi extends AbstractApi { } /** - * Get a list of the deploy keys for the specified project using the specified page and per page settings. + * Get a list of the deploy keys for the specified project using the specified page and per page settings. * This method requires admin access. * *
GitLab Endpoint: GET /projects/:id/deploy_keys
diff --git a/src/main/java/org/gitlab4j/api/DeployTokensApi.java b/src/main/java/org/gitlab4j/api/DeployTokensApi.java index 214089f1..0821dcbb 100644 --- a/src/main/java/org/gitlab4j/api/DeployTokensApi.java +++ b/src/main/java/org/gitlab4j/api/DeployTokensApi.java @@ -2,7 +2,7 @@ package org.gitlab4j.api; import org.gitlab4j.api.models.DeployToken; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.Date; import java.util.List; import java.util.stream.Stream; diff --git a/src/main/java/org/gitlab4j/api/DeploymentsApi.java b/src/main/java/org/gitlab4j/api/DeploymentsApi.java index 299c7ce3..c05b24ca 100644 --- a/src/main/java/org/gitlab4j/api/DeploymentsApi.java +++ b/src/main/java/org/gitlab4j/api/DeploymentsApi.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Deployment; import org.gitlab4j.api.models.DeploymentFilter; diff --git a/src/main/java/org/gitlab4j/api/DiscussionsApi.java b/src/main/java/org/gitlab4j/api/DiscussionsApi.java index 687d5a83..2c1f6cf6 100644 --- a/src/main/java/org/gitlab4j/api/DiscussionsApi.java +++ b/src/main/java/org/gitlab4j/api/DiscussionsApi.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Discussion; import org.gitlab4j.api.models.Note; diff --git a/src/main/java/org/gitlab4j/api/EnvironmentsApi.java b/src/main/java/org/gitlab4j/api/EnvironmentsApi.java index 6eca5127..cea899d9 100644 --- a/src/main/java/org/gitlab4j/api/EnvironmentsApi.java +++ b/src/main/java/org/gitlab4j/api/EnvironmentsApi.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Environment; @@ -175,4 +175,4 @@ public class EnvironmentsApi extends AbstractApi { "projects", getProjectIdOrPath(projectIdOrPath), "environments", environmentId, "stop"); return (response.readEntity(Environment.class)); } -} \ No newline at end of file +} diff --git a/src/main/java/org/gitlab4j/api/EpicsApi.java b/src/main/java/org/gitlab4j/api/EpicsApi.java index 6eb59a1c..323c4c90 100644 --- a/src/main/java/org/gitlab4j/api/EpicsApi.java +++ b/src/main/java/org/gitlab4j/api/EpicsApi.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Epic; import org.gitlab4j.api.models.EpicIssue; diff --git a/src/main/java/org/gitlab4j/api/EventsApi.java b/src/main/java/org/gitlab4j/api/EventsApi.java index b4bed04d..1a1eadaa 100644 --- a/src/main/java/org/gitlab4j/api/EventsApi.java +++ b/src/main/java/org/gitlab4j/api/EventsApi.java @@ -4,8 +4,8 @@ import java.util.Date; import java.util.List; import java.util.stream.Stream; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Event; @@ -86,7 +86,7 @@ public class EventsApi extends AbstractApi { * @param sortOrder sort events in ASC or DESC order by created_at. Default is DESC, optional * @param page the page to get * @param perPage the number of projects per page - * @param scope include all events across a user’s projects, optional + * @param scope include all events across a user’s projects, optional * @return a list of events for the authenticated user and matching the supplied parameters * @throws GitLabApiException if any exception occurs */ @@ -137,7 +137,7 @@ public class EventsApi extends AbstractApi { * @param after include only events created after a particular date, optional * @param sortOrder sort events in ASC or DESC order by created_at. Default is DESC, optional * @param itemsPerPage the number of Event instances that will be fetched per page - * @param scope include all events across a user’s projects, optional + * @param scope include all events across a user’s projects, optional * @return a Pager of events for the authenticated user and matching the supplied parameters * @throws GitLabApiException if any exception occurs */ diff --git a/src/main/java/org/gitlab4j/api/GitLabApi.java b/src/main/java/org/gitlab4j/api/GitLabApi.java index 051b7367..272f06e7 100644 --- a/src/main/java/org/gitlab4j/api/GitLabApi.java +++ b/src/main/java/org/gitlab4j/api/GitLabApi.java @@ -9,8 +9,8 @@ import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.Constants.TokenType; import org.gitlab4j.api.models.OauthTokenResponse; diff --git a/src/main/java/org/gitlab4j/api/GitLabApiClient.java b/src/main/java/org/gitlab4j/api/GitLabApiClient.java index 3322e8ba..4d5d8dd4 100755 --- a/src/main/java/org/gitlab4j/api/GitLabApiClient.java +++ b/src/main/java/org/gitlab4j/api/GitLabApiClient.java @@ -20,16 +20,16 @@ import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLSession; import javax.net.ssl.TrustManager; import javax.net.ssl.X509ExtendedTrustManager; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import org.gitlab4j.api.Constants.TokenType; import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.utils.JacksonJson; diff --git a/src/main/java/org/gitlab4j/api/GitLabApiException.java b/src/main/java/org/gitlab4j/api/GitLabApiException.java index 8af8ee82..f0e79935 100755 --- a/src/main/java/org/gitlab4j/api/GitLabApiException.java +++ b/src/main/java/org/gitlab4j/api/GitLabApiException.java @@ -7,9 +7,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.StatusType; import org.gitlab4j.api.utils.JacksonJson; @@ -26,7 +26,7 @@ public class GitLabApiException extends Exception { private int httpStatus; private String message; private Map> validationErrors; - + /** * Create a GitLabApiException instance with the specified message. * @@ -87,7 +87,7 @@ public class GitLabApiException extends Exception { while(fields.hasNext()) { Entry field = fields.next(); - String fieldName = field.getKey(); + String fieldName = field.getKey(); List values = new ArrayList<>(); validationErrors.put(fieldName, values); for (JsonNode value : field.getValue()) { @@ -186,10 +186,10 @@ public class GitLabApiException extends Exception { } /** - * Returns a Map<String, List<String>> instance containing validation errors if this GitLabApiException + * Returns a Map<String, List<String>> instance containing validation errors if this GitLabApiException * was caused by validation errors on the GitLab server, otherwise returns null. * - * @return a Map<String, List<String>> instance containing validation errors if this GitLabApiException + * @return a Map<String, List<String>> instance containing validation errors if this GitLabApiException * was caused by validation errors on the GitLab server, otherwise returns null */ public Map> getValidationErrors() { diff --git a/src/main/java/org/gitlab4j/api/GitLabApiForm.java b/src/main/java/org/gitlab4j/api/GitLabApiForm.java index b9c09e60..bcc603e0 100644 --- a/src/main/java/org/gitlab4j/api/GitLabApiForm.java +++ b/src/main/java/org/gitlab4j/api/GitLabApiForm.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MultivaluedHashMap; import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.models.Variable; @@ -39,7 +39,7 @@ public class GitLabApiForm extends Form { /** * Fluent method for adding query and form parameters to a get() or post() call. - * + * * @param name the name of the field/attribute to add * @param value the value of the field/attribute to add * @return this GitLabAPiForm instance @@ -217,4 +217,4 @@ public class GitLabApiForm extends Form { return (this); } -} \ No newline at end of file +} diff --git a/src/main/java/org/gitlab4j/api/GroupApi.java b/src/main/java/org/gitlab4j/api/GroupApi.java index c54bb5dc..168bd6b3 100644 --- a/src/main/java/org/gitlab4j/api/GroupApi.java +++ b/src/main/java/org/gitlab4j/api/GroupApi.java @@ -7,9 +7,9 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.models.AccessLevel; diff --git a/src/main/java/org/gitlab4j/api/HealthCheckApi.java b/src/main/java/org/gitlab4j/api/HealthCheckApi.java index 104f8d9d..f6ff0f4e 100644 --- a/src/main/java/org/gitlab4j/api/HealthCheckApi.java +++ b/src/main/java/org/gitlab4j/api/HealthCheckApi.java @@ -2,7 +2,7 @@ package org.gitlab4j.api; import org.gitlab4j.api.models.HealthCheckInfo; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/org/gitlab4j/api/HookManager.java b/src/main/java/org/gitlab4j/api/HookManager.java index e3c09887..7b92be11 100644 --- a/src/main/java/org/gitlab4j/api/HookManager.java +++ b/src/main/java/org/gitlab4j/api/HookManager.java @@ -1,7 +1,7 @@ package org.gitlab4j.api; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * This interface provides a base class handler for processing GitLab Web Hook and System Hook callouts. @@ -26,7 +26,7 @@ public interface HookManager { * Validate the provided secret token against the reference secret token. Returns true if * the secret token is valid or there is no reference secret token to validate against, * otherwise returns false. - * + * * @param secretToken the token to validate * @return true if the secret token is valid or there is no reference secret token to validate against */ @@ -41,7 +41,7 @@ public interface HookManager { * Validate the provided secret token found in the HTTP header against the reference secret token. * Returns true if the secret token is valid or there is no reference secret token to validate * against, otherwise returns false. - * + * * @param request the HTTP request to verify the secret token * @return true if the secret token is valid or there is no reference secret token to validate against */ @@ -58,9 +58,9 @@ public interface HookManager { /** * Parses and verifies an Event instance from the HTTP request and * fires it off to the registered listeners. - * + * * @param request the HttpServletRequest to read the Event instance from * @throws GitLabApiException if the parsed event is not supported */ public void handleEvent(HttpServletRequest request) throws GitLabApiException; -} \ No newline at end of file +} diff --git a/src/main/java/org/gitlab4j/api/ImportExportApi.java b/src/main/java/org/gitlab4j/api/ImportExportApi.java index 509eae1d..f352a9d2 100644 --- a/src/main/java/org/gitlab4j/api/ImportExportApi.java +++ b/src/main/java/org/gitlab4j/api/ImportExportApi.java @@ -9,9 +9,9 @@ import java.nio.file.StandardCopyOption; import java.util.Date; import java.util.Map; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.ExportStatus; import org.gitlab4j.api.models.ImportStatus; @@ -251,7 +251,7 @@ public class ImportExportApi extends AbstractApi { * *
GitLab Endpoint: GET /projects/:id/import
* - * @param projectIdOrPath the new (imported) project identifier in the form of an Long(ID), String(path), or Project instance + * @param projectIdOrPath the new (imported) project identifier in the form of an Long(ID), String(path), or Project instance * @return an ImportStatus instance holding information on the import status * @throws GitLabApiException if any exception occurs */ diff --git a/src/main/java/org/gitlab4j/api/IssuesApi.java b/src/main/java/org/gitlab4j/api/IssuesApi.java index 02c01fa8..911373e8 100644 --- a/src/main/java/org/gitlab4j/api/IssuesApi.java +++ b/src/main/java/org/gitlab4j/api/IssuesApi.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.models.Duration; diff --git a/src/main/java/org/gitlab4j/api/JobApi.java b/src/main/java/org/gitlab4j/api/JobApi.java index 1c8a6e80..d0b2f8bd 100644 --- a/src/main/java/org/gitlab4j/api/JobApi.java +++ b/src/main/java/org/gitlab4j/api/JobApi.java @@ -10,11 +10,11 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.gitlab4j.api.models.ArtifactsFile; import org.gitlab4j.api.models.Job; diff --git a/src/main/java/org/gitlab4j/api/KeysApi.java b/src/main/java/org/gitlab4j/api/KeysApi.java index 29265ff8..f869e3e1 100644 --- a/src/main/java/org/gitlab4j/api/KeysApi.java +++ b/src/main/java/org/gitlab4j/api/KeysApi.java @@ -2,9 +2,9 @@ package org.gitlab4j.api; import org.gitlab4j.api.models.Key; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.Collections; /** diff --git a/src/main/java/org/gitlab4j/api/LabelsApi.java b/src/main/java/org/gitlab4j/api/LabelsApi.java index b8ba967f..6b84b692 100644 --- a/src/main/java/org/gitlab4j/api/LabelsApi.java +++ b/src/main/java/org/gitlab4j/api/LabelsApi.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.Label; @@ -359,7 +359,7 @@ public class LabelsApi extends AbstractApi { */ @Deprecated public List