Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
267ffcf3
Commit
267ffcf3
authored
2 years ago
by
Gabriel Barbier
Committed by
Jeremie Bresson
2 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Replace javax package by jakarta package
parent
47a47358
6.x
No related merge requests found
Changes
78
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
src/main/java/org/gitlab4j/api/webhook/WebHookManager.java
+1
-1
src/main/java/org/gitlab4j/api/webhook/WebHookManager.java
src/test/java/org/gitlab4j/api/MockResponse.java
+8
-8
src/test/java/org/gitlab4j/api/MockResponse.java
src/test/java/org/gitlab4j/api/MockServletInputStream.java
+2
-2
src/test/java/org/gitlab4j/api/MockServletInputStream.java
src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java
+1
-1
src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java
src/test/java/org/gitlab4j/api/TestCommitsApi.java
+1
-1
src/test/java/org/gitlab4j/api/TestCommitsApi.java
src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java
+1
-1
src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java
src/test/java/org/gitlab4j/api/TestExternalStatusCheckApi.java
+1
-1
...est/java/org/gitlab4j/api/TestExternalStatusCheckApi.java
src/test/java/org/gitlab4j/api/TestGitLabApiEvents.java
+2
-2
src/test/java/org/gitlab4j/api/TestGitLabApiEvents.java
src/test/java/org/gitlab4j/api/TestGitLabApiException.java
+1
-1
src/test/java/org/gitlab4j/api/TestGitLabApiException.java
src/test/java/org/gitlab4j/api/TestGroupApi.java
+1
-1
src/test/java/org/gitlab4j/api/TestGroupApi.java
src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java
+1
-1
src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java
src/test/java/org/gitlab4j/api/TestIssuesApi.java
+1
-1
src/test/java/org/gitlab4j/api/TestIssuesApi.java
src/test/java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java
+1
-1
...java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java
src/test/java/org/gitlab4j/api/TestProjectApi.java
+1
-1
src/test/java/org/gitlab4j/api/TestProjectApi.java
src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java
+1
-1
...test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java
src/test/java/org/gitlab4j/api/TestStreams.java
+1
-1
src/test/java/org/gitlab4j/api/TestStreams.java
src/test/java/org/gitlab4j/api/TestUnitMergeRequestApi.java
+1
-1
src/test/java/org/gitlab4j/api/TestUnitMergeRequestApi.java
src/test/java/org/gitlab4j/api/TestUserApi.java
+1
-1
src/test/java/org/gitlab4j/api/TestUserApi.java
with
27 additions
and
27 deletions
+27
-27
src/main/java/org/gitlab4j/api/webhook/WebHookManager.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.servlet.http.HttpServletRequest
;
import
ja
karta
.servlet.http.HttpServletRequest
;
import
org.gitlab4j.api.GitLabApiException
;
import
org.gitlab4j.api.GitLabApiException
;
import
org.gitlab4j.api.HookManager
;
import
org.gitlab4j.api.HookManager
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/MockResponse.java
+
8
-
8
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.EntityTag
;
import
ja
karta
.ws.rs.core.EntityTag
;
import
ja
vax
.ws.rs.core.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.Link
;
import
ja
karta
.ws.rs.core.Link
;
import
ja
vax
.ws.rs.core.Link.Builder
;
import
ja
karta
.ws.rs.core.Link.Builder
;
import
ja
vax
.ws.rs.core.MediaType
;
import
ja
karta
.ws.rs.core.MediaType
;
import
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.ws.rs.core.MultivaluedMap
;
import
ja
vax
.ws.rs.core.NewCookie
;
import
ja
karta
.ws.rs.core.NewCookie
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.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
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/MockServletInputStream.java
+
2
-
2
View file @
267ffcf3
...
@@ -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
ja
vax
.servlet.ReadListener
;
import
ja
karta
.servlet.ReadListener
;
import
ja
vax
.servlet.ServletInputStream
;
import
ja
karta
.servlet.ServletInputStream
;
public
class
MockServletInputStream
extends
ServletInputStream
{
public
class
MockServletInputStream
extends
ServletInputStream
{
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestCommitsApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestExternalStatusCheckApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestGitLabApiEvents.java
+
2
-
2
View file @
267ffcf3
...
@@ -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
ja
vax
.servlet.ServletInputStream
;
import
ja
karta
.servlet.ServletInputStream
;
import
ja
vax
.servlet.http.HttpServletRequest
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestGitLabApiException.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.Response.Status
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestGroupApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestIssuesApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestProjectApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestStreams.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestUnitMergeRequestApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
src/test/java/org/gitlab4j/api/TestUserApi.java
+
1
-
1
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.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
;
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets