Commit 0cb325a0 authored by 佳 邓's avatar 佳 邓
Browse files

change javax to jakarta

parent c81635c4
...@@ -7,9 +7,9 @@ import java.util.Objects; ...@@ -7,9 +7,9 @@ import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.GitLabApi.ApiVersion;
import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.models.AccessLevel;
......
...@@ -2,7 +2,7 @@ package org.gitlab4j.api; ...@@ -2,7 +2,7 @@ package org.gitlab4j.api;
import org.gitlab4j.api.models.HealthCheckInfo; import org.gitlab4j.api.models.HealthCheckInfo;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
......
package org.gitlab4j.api; 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. * This interface provides a base class handler for processing GitLab Web Hook and System Hook callouts.
...@@ -26,7 +26,7 @@ public interface HookManager { ...@@ -26,7 +26,7 @@ public interface HookManager {
* Validate the provided secret token against the reference secret token. Returns true if * 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, * the secret token is valid or there is no reference secret token to validate against,
* otherwise returns false. * otherwise returns false.
* *
* @param secretToken the token to validate * @param secretToken the token to validate
* @return true if the secret token is valid or there is no reference secret token to validate against * @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 { ...@@ -41,7 +41,7 @@ public interface HookManager {
* Validate the provided secret token found in the HTTP header against the reference secret token. * 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 * Returns true if the secret token is valid or there is no reference secret token to validate
* against, otherwise returns false. * against, otherwise returns false.
* *
* @param request the HTTP request to verify the secret token * @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 * @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 { ...@@ -58,9 +58,9 @@ public interface HookManager {
/** /**
* Parses and verifies an Event instance from the HTTP request and * Parses and verifies an Event instance from the HTTP request and
* fires it off to the registered listeners. * fires it off to the registered listeners.
* *
* @param request the HttpServletRequest to read the Event instance from * @param request the HttpServletRequest to read the Event instance from
* @throws GitLabApiException if the parsed event is not supported * @throws GitLabApiException if the parsed event is not supported
*/ */
public void handleEvent(HttpServletRequest request) throws GitLabApiException; public void handleEvent(HttpServletRequest request) throws GitLabApiException;
} }
\ No newline at end of file
...@@ -9,9 +9,9 @@ import java.nio.file.StandardCopyOption; ...@@ -9,9 +9,9 @@ import java.nio.file.StandardCopyOption;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.ExportStatus; import org.gitlab4j.api.models.ExportStatus;
import org.gitlab4j.api.models.ImportStatus; import org.gitlab4j.api.models.ImportStatus;
...@@ -251,7 +251,7 @@ public class ImportExportApi extends AbstractApi { ...@@ -251,7 +251,7 @@ public class ImportExportApi extends AbstractApi {
* *
* <pre><code>GitLab Endpoint: GET /projects/:id/import</code></pre> * <pre><code>GitLab Endpoint: GET /projects/:id/import</code></pre>
* *
* @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 * @return an ImportStatus instance holding information on the import status
* @throws GitLabApiException if any exception occurs * @throws GitLabApiException if any exception occurs
*/ */
......
...@@ -6,8 +6,8 @@ import java.util.List; ...@@ -6,8 +6,8 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.GitLabApi.ApiVersion;
import org.gitlab4j.api.models.Duration; import org.gitlab4j.api.models.Duration;
......
...@@ -10,11 +10,11 @@ import java.util.List; ...@@ -10,11 +10,11 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import jakarta.ws.rs.core.Response.Status;
import org.gitlab4j.api.models.ArtifactsFile; import org.gitlab4j.api.models.ArtifactsFile;
import org.gitlab4j.api.models.Job; import org.gitlab4j.api.models.Job;
......
...@@ -2,9 +2,9 @@ package org.gitlab4j.api; ...@@ -2,9 +2,9 @@ package org.gitlab4j.api;
import org.gitlab4j.api.models.Key; import org.gitlab4j.api.models.Key;
import javax.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.Collections; import java.util.Collections;
/** /**
......
...@@ -4,8 +4,8 @@ import java.util.List; ...@@ -4,8 +4,8 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Label; import org.gitlab4j.api.models.Label;
...@@ -359,7 +359,7 @@ public class LabelsApi extends AbstractApi { ...@@ -359,7 +359,7 @@ public class LabelsApi extends AbstractApi {
*/ */
@Deprecated @Deprecated
public List<Label> getLabels(Object projectIdOrPath, int page, int perPage) throws GitLabApiException { public List<Label> getLabels(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), "labels"); "projects", getProjectIdOrPath(projectIdOrPath), "labels");
return (response.readEntity(new GenericType<List<Label>>() {})); return (response.readEntity(new GenericType<List<Label>>() {}));
} }
......
...@@ -4,7 +4,7 @@ import java.util.List; ...@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.License; import org.gitlab4j.api.models.License;
...@@ -112,4 +112,4 @@ public class LicenseApi extends AbstractApi { ...@@ -112,4 +112,4 @@ public class LicenseApi extends AbstractApi {
Response response = delete(Response.Status.OK, null, "license", licenseId); Response response = delete(Response.Status.OK, null, "license", licenseId);
return (response.readEntity(License.class)); return (response.readEntity(License.class));
} }
} }
\ No newline at end of file
...@@ -4,7 +4,7 @@ import java.util.List; ...@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.LicenseTemplate; import org.gitlab4j.api.models.LicenseTemplate;
...@@ -123,4 +123,4 @@ public class LicenseTemplatesApi extends AbstractApi { ...@@ -123,4 +123,4 @@ public class LicenseTemplatesApi extends AbstractApi {
return (GitLabApi.createOptionalFromException(glae)); return (GitLabApi.createOptionalFromException(glae));
} }
} }
} }
\ No newline at end of file
...@@ -4,7 +4,7 @@ import org.gitlab4j.api.GitLabApi.ApiVersion; ...@@ -4,7 +4,7 @@ import org.gitlab4j.api.GitLabApi.ApiVersion;
import org.gitlab4j.api.models.Markdown; import org.gitlab4j.api.models.Markdown;
import org.gitlab4j.api.models.MarkdownRequest; import org.gitlab4j.api.models.MarkdownRequest;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
/** /**
* This class provides an entry point to all the GitLab API markdown calls. * This class provides an entry point to all the GitLab API markdown calls.
...@@ -53,4 +53,4 @@ public class MarkdownApi extends AbstractApi { ...@@ -53,4 +53,4 @@ public class MarkdownApi extends AbstractApi {
Response response = post(Response.Status.OK, markdownRequest, "markdown"); Response response = post(Response.Status.OK, markdownRequest, "markdown");
return (response.readEntity(Markdown.class)); return (response.readEntity(Markdown.class));
} }
} }
\ No newline at end of file
...@@ -4,10 +4,10 @@ import java.util.List; ...@@ -4,10 +4,10 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.GitLabApi.ApiVersion;
import org.gitlab4j.api.models.AcceptMergeRequestParams; import org.gitlab4j.api.models.AcceptMergeRequestParams;
......
...@@ -4,9 +4,9 @@ import java.util.Date; ...@@ -4,9 +4,9 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Issue; import org.gitlab4j.api.models.Issue;
import org.gitlab4j.api.models.MergeRequest; import org.gitlab4j.api.models.MergeRequest;
......
...@@ -3,8 +3,8 @@ package org.gitlab4j.api; ...@@ -3,8 +3,8 @@ package org.gitlab4j.api;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Namespace; import org.gitlab4j.api.models.Namespace;
......
...@@ -4,8 +4,8 @@ import java.util.Date; ...@@ -4,8 +4,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Note; import org.gitlab4j.api.models.Note;
......
package org.gitlab4j.api; package org.gitlab4j.api;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.NotificationSettings; import org.gitlab4j.api.models.NotificationSettings;
import org.gitlab4j.api.models.NotificationSettings.Events; import org.gitlab4j.api.models.NotificationSettings.Events;
......
...@@ -26,9 +26,9 @@ package org.gitlab4j.api; ...@@ -26,9 +26,9 @@ package org.gitlab4j.api;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Package; import org.gitlab4j.api.models.Package;
import org.gitlab4j.api.models.PackageFile; import org.gitlab4j.api.models.PackageFile;
...@@ -37,7 +37,7 @@ import org.gitlab4j.api.models.PackageFilter; ...@@ -37,7 +37,7 @@ import org.gitlab4j.api.models.PackageFilter;
/** /**
* <p>This class implements the client side API for the GitLab Packages API. * <p>This class implements the client side API for the GitLab Packages API.
* See <a href="https://docs.gitlab.com/ee/api/packages.html">Packages API at GitLab</a> for more information.</p> * See <a href="https://docs.gitlab.com/ee/api/packages.html">Packages API at GitLab</a> for more information.</p>
* *
* NOTE: This API is not available in the Community edition of GitLab. * NOTE: This API is not available in the Community edition of GitLab.
*/ */
public class PackagesApi extends AbstractApi { public class PackagesApi extends AbstractApi {
...@@ -189,7 +189,7 @@ public class PackagesApi extends AbstractApi { ...@@ -189,7 +189,7 @@ public class PackagesApi extends AbstractApi {
} }
/** /**
* Get a Pager of project package files. * Get a Pager of project package files.
* *
* <pre><code>GitLab Endpoint: GET /projects/:id/packages/:package_id/package_files</code></pre> * <pre><code>GitLab Endpoint: GET /projects/:id/packages/:package_id/package_files</code></pre>
* *
...@@ -205,7 +205,7 @@ public class PackagesApi extends AbstractApi { ...@@ -205,7 +205,7 @@ public class PackagesApi extends AbstractApi {
} }
/** /**
* Get a Stream of project package files. * Get a Stream of project package files.
* *
* <pre><code>GitLab Endpoint: GET /projects/:id/packages/:package_id/package_files</code></pre> * <pre><code>GitLab Endpoint: GET /projects/:id/packages/:package_id/package_files</code></pre>
* *
......
...@@ -9,8 +9,8 @@ import java.util.NoSuchElementException; ...@@ -9,8 +9,8 @@ import java.util.NoSuchElementException;
import java.util.stream.Stream; import java.util.stream.Stream;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
......
...@@ -5,8 +5,8 @@ import java.util.Map; ...@@ -5,8 +5,8 @@ import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Pipeline; import org.gitlab4j.api.models.Pipeline;
import org.gitlab4j.api.models.PipelineFilter; import org.gitlab4j.api.models.PipelineFilter;
......
...@@ -33,10 +33,10 @@ import java.util.Map; ...@@ -33,10 +33,10 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.GitLabApi.ApiVersion;
import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.models.AccessLevel;
import org.gitlab4j.api.models.AccessRequest; import org.gitlab4j.api.models.AccessRequest;
......
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