Commit 267ffcf3 authored by Gabriel Barbier's avatar Gabriel Barbier Committed by Jeremie Bresson
Browse files

Replace javax package by jakarta package

parent 47a47358
...@@ -7,7 +7,7 @@ import java.util.concurrent.CopyOnWriteArrayList; ...@@ -7,7 +7,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.gitlab4j.api.GitLabApiException; import org.gitlab4j.api.GitLabApiException;
import org.gitlab4j.api.HookManager; import org.gitlab4j.api.HookManager;
......
...@@ -9,14 +9,14 @@ import java.util.Locale; ...@@ -9,14 +9,14 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.ws.rs.core.EntityTag; import jakarta.ws.rs.core.EntityTag;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Link; import jakarta.ws.rs.core.Link;
import javax.ws.rs.core.Link.Builder; import jakarta.ws.rs.core.Link.Builder;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.NewCookie; import jakarta.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
/** /**
* This class can be used as a concrete mock to test the individual APIs * This class can be used as a concrete mock to test the individual APIs
......
...@@ -2,8 +2,8 @@ package org.gitlab4j.api; ...@@ -2,8 +2,8 @@ package org.gitlab4j.api;
import java.io.IOException; import java.io.IOException;
import javax.servlet.ReadListener; import jakarta.servlet.ReadListener;
import javax.servlet.ServletInputStream; import jakarta.servlet.ServletInputStream;
public class MockServletInputStream extends ServletInputStream { public class MockServletInputStream extends ServletInputStream {
......
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import org.gitlab4j.api.models.Discussion; import org.gitlab4j.api.models.Discussion;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
......
...@@ -15,7 +15,7 @@ import java.util.List; ...@@ -15,7 +15,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.Branch; import org.gitlab4j.api.models.Branch;
import org.gitlab4j.api.models.Comment; import org.gitlab4j.api.models.Comment;
......
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import org.gitlab4j.api.models.Discussion; import org.gitlab4j.api.models.Discussion;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
......
...@@ -12,7 +12,7 @@ import java.util.List; ...@@ -12,7 +12,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import org.gitlab4j.api.models.ExternalStatusCheck; import org.gitlab4j.api.models.ExternalStatusCheck;
import org.gitlab4j.api.models.ExternalStatusCheckStatus; import org.gitlab4j.api.models.ExternalStatusCheckStatus;
......
...@@ -14,8 +14,8 @@ import static org.mockito.Mockito.mock; ...@@ -14,8 +14,8 @@ import static org.mockito.Mockito.mock;
import java.util.logging.Level; import java.util.logging.Level;
import javax.servlet.ServletInputStream; import jakarta.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.gitlab4j.api.systemhooks.MergeRequestSystemHookEvent; import org.gitlab4j.api.systemhooks.MergeRequestSystemHookEvent;
import org.gitlab4j.api.systemhooks.ProjectSystemHookEvent; import org.gitlab4j.api.systemhooks.ProjectSystemHookEvent;
......
...@@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; ...@@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.ws.rs.core.Response.Status; import jakarta.ws.rs.core.Response.Status;
import org.gitlab4j.api.models.Project; import org.gitlab4j.api.models.Project;
import org.gitlab4j.api.models.Visibility; import org.gitlab4j.api.models.Visibility;
......
...@@ -10,7 +10,7 @@ import java.util.List; ...@@ -10,7 +10,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.AccessLevel; import org.gitlab4j.api.models.AccessLevel;
import org.gitlab4j.api.models.AccessRequest; import org.gitlab4j.api.models.AccessRequest;
......
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import org.gitlab4j.api.models.Discussion; import org.gitlab4j.api.models.Discussion;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
......
...@@ -35,7 +35,7 @@ import java.util.List; ...@@ -35,7 +35,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Random; import java.util.Random;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.Constants.IssueState; import org.gitlab4j.api.Constants.IssueState;
import org.gitlab4j.api.models.Duration; import org.gitlab4j.api.models.Duration;
......
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import org.gitlab4j.api.models.Discussion; import org.gitlab4j.api.models.Discussion;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
......
...@@ -36,7 +36,7 @@ import java.util.Map; ...@@ -36,7 +36,7 @@ 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.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.models.AccessLevel;
import org.gitlab4j.api.models.AccessRequest; import org.gitlab4j.api.models.AccessRequest;
......
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import org.gitlab4j.api.models.Discussion; import org.gitlab4j.api.models.Discussion;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
......
...@@ -14,7 +14,7 @@ import static org.mockito.MockitoAnnotations.openMocks; ...@@ -14,7 +14,7 @@ import static org.mockito.MockitoAnnotations.openMocks;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import org.gitlab4j.api.models.User; import org.gitlab4j.api.models.User;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
......
...@@ -9,7 +9,7 @@ import static org.mockito.MockitoAnnotations.openMocks; ...@@ -9,7 +9,7 @@ import static org.mockito.MockitoAnnotations.openMocks;
import java.util.Collections; import java.util.Collections;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import org.gitlab4j.api.models.MergeRequest; import org.gitlab4j.api.models.MergeRequest;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
......
...@@ -15,7 +15,7 @@ import java.util.Date; ...@@ -15,7 +15,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.models.AccessLevel;
import org.gitlab4j.api.models.Email; import org.gitlab4j.api.models.Email;
......
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