Skip to content
GitLab
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
Apr 03, 2023
by
Gabriel Barbier
Committed by
Jeremie Bresson
Apr 11, 2023
Browse files
Replace javax package by jakarta package
parent
47a47358
Changes
78
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
267ffcf3
...
@@ -50,10 +50,10 @@
...
@@ -50,10 +50,10 @@
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<jersey.version>
2.35
</jersey.version>
<jersey.version>
3.1.1
</jersey.version>
<jackson.version>
2.1
2.4
</jackson.version>
<jackson.version>
2.1
4.1
</jackson.version>
<servlet.version>
4
.0.
4
</servlet.version>
<servlet.version>
6
.0.
0
</servlet.version>
<activation.version>
1.2.2
</activation.version>
<activation.version>
2.1.1
</activation.version>
<junit.version>
5.8.2
</junit.version>
<junit.version>
5.8.2
</junit.version>
<testcontainers.version>
1.15.3
</testcontainers.version>
<testcontainers.version>
1.15.3
</testcontainers.version>
...
...
src/main/java/org/gitlab4j/api/AbstractApi.java
View file @
267ffcf3
...
@@ -4,11 +4,11 @@ import java.io.File;
...
@@ -4,11 +4,11 @@ import java.io.File;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.net.URL
;
import
java.net.URL
;
import
ja
vax
.ws.rs.NotAuthorizedException
;
import
ja
karta
.ws.rs.NotAuthorizedException
;
import
ja
vax
.ws.rs.core.Form
;
import
ja
karta
.ws.rs.core.Form
;
import
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.ws.rs.core.MultivaluedMap
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
ja
vax
.ws.rs.core.StreamingOutput
;
import
ja
karta
.ws.rs.core.StreamingOutput
;
import
org.gitlab4j.api.GitLabApi.ApiVersion
;
import
org.gitlab4j.api.GitLabApi.ApiVersion
;
import
org.gitlab4j.api.models.Group
;
import
org.gitlab4j.api.models.Group
;
...
...
src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java
View file @
267ffcf3
...
@@ -3,7 +3,7 @@ package org.gitlab4j.api;
...
@@ -3,7 +3,7 @@ package org.gitlab4j.api;
import
java.text.ParseException
;
import
java.text.ParseException
;
import
java.util.Iterator
;
import
java.util.Iterator
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.Setting
;
import
org.gitlab4j.api.models.Setting
;
import
org.gitlab4j.api.models.ApplicationSettings
;
import
org.gitlab4j.api.models.ApplicationSettings
;
...
...
src/main/java/org/gitlab4j/api/ApplicationsApi.java
View file @
267ffcf3
...
@@ -5,8 +5,8 @@ import java.util.List;
...
@@ -5,8 +5,8 @@ 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.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.Application
;
import
org.gitlab4j.api.models.Application
;
...
@@ -43,7 +43,7 @@ public class ApplicationsApi extends AbstractApi {
...
@@ -43,7 +43,7 @@ public class ApplicationsApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs
* @throws GitLabApiException if any exception occurs
*/
*/
public
List
<
Application
>
getApplications
(
int
page
,
int
perPage
)
throws
GitLabApiException
{
public
List
<
Application
>
getApplications
(
int
page
,
int
perPage
)
throws
GitLabApiException
{
Response
response
=
get
(
ja
vax
.
ws
.
rs
.
core
.
Response
.
Status
.
OK
,
getPageQueryParams
(
page
,
perPage
),
"applications"
);
Response
response
=
get
(
ja
karta
.
ws
.
rs
.
core
.
Response
.
Status
.
OK
,
getPageQueryParams
(
page
,
perPage
),
"applications"
);
return
(
response
.
readEntity
(
new
GenericType
<
List
<
Application
>>()
{}));
return
(
response
.
readEntity
(
new
GenericType
<
List
<
Application
>>()
{}));
}
}
...
...
src/main/java/org/gitlab4j/api/AuditEventApi.java
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.Form
;
import
ja
karta
.ws.rs.core.Form
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.AuditEvent
;
import
org.gitlab4j.api.models.AuditEvent
;
import
org.gitlab4j.api.utils.ISO8601
;
import
org.gitlab4j.api.utils.ISO8601
;
...
...
src/main/java/org/gitlab4j/api/AwardEmojiApi.java
View file @
267ffcf3
...
@@ -2,8 +2,8 @@ package org.gitlab4j.api;
...
@@ -2,8 +2,8 @@ package org.gitlab4j.api;
import
java.util.List
;
import
java.util.List
;
import
ja
vax
.ws.rs.core.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.AwardEmoji
;
import
org.gitlab4j.api.models.AwardEmoji
;
...
...
src/main/java/org/gitlab4j/api/BoardsApi.java
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.Board
;
import
org.gitlab4j.api.models.Board
;
import
org.gitlab4j.api.models.BoardList
;
import
org.gitlab4j.api.models.BoardList
;
...
@@ -49,7 +49,7 @@ public class BoardsApi extends AbstractApi {
...
@@ -49,7 +49,7 @@ public class BoardsApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs
* @throws GitLabApiException if any exception occurs
*/
*/
public
List
<
Board
>
getBoards
(
Object
projectIdOrPath
,
int
page
,
int
perPage
)
throws
GitLabApiException
{
public
List
<
Board
>
getBoards
(
Object
projectIdOrPath
,
int
page
,
int
perPage
)
throws
GitLabApiException
{
Response
response
=
get
(
ja
vax
.
ws
.
rs
.
core
.
Response
.
Status
.
OK
,
getPageQueryParams
(
page
,
perPage
),
Response
response
=
get
(
ja
karta
.
ws
.
rs
.
core
.
Response
.
Status
.
OK
,
getPageQueryParams
(
page
,
perPage
),
"projects"
,
getProjectIdOrPath
(
projectIdOrPath
),
"boards"
);
"projects"
,
getProjectIdOrPath
(
projectIdOrPath
),
"boards"
);
return
(
response
.
readEntity
(
new
GenericType
<
List
<
Board
>>()
{}));
return
(
response
.
readEntity
(
new
GenericType
<
List
<
Board
>>()
{}));
}
}
...
@@ -206,7 +206,7 @@ public class BoardsApi extends AbstractApi {
...
@@ -206,7 +206,7 @@ public class BoardsApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs
* @throws GitLabApiException if any exception occurs
*/
*/
public
List
<
BoardList
>
getBoardLists
(
Object
projectIdOrPath
,
Long
boardId
,
int
page
,
int
perPage
)
throws
GitLabApiException
{
public
List
<
BoardList
>
getBoardLists
(
Object
projectIdOrPath
,
Long
boardId
,
int
page
,
int
perPage
)
throws
GitLabApiException
{
Response
response
=
get
(
ja
vax
.
ws
.
rs
.
core
.
Response
.
Status
.
OK
,
getPageQueryParams
(
page
,
perPage
),
Response
response
=
get
(
ja
karta
.
ws
.
rs
.
core
.
Response
.
Status
.
OK
,
getPageQueryParams
(
page
,
perPage
),
"projects"
,
getProjectIdOrPath
(
projectIdOrPath
),
"boards"
,
boardId
,
"lists"
);
"projects"
,
getProjectIdOrPath
(
projectIdOrPath
),
"boards"
,
boardId
,
"lists"
);
return
(
response
.
readEntity
(
new
GenericType
<
List
<
BoardList
>>()
{}));
return
(
response
.
readEntity
(
new
GenericType
<
List
<
BoardList
>>()
{}));
}
}
...
...
src/main/java/org/gitlab4j/api/CommitsApi.java
View file @
267ffcf3
...
@@ -6,10 +6,10 @@ import java.util.List;
...
@@ -6,10 +6,10 @@ 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.Form
;
import
ja
karta
.ws.rs.core.Form
;
import
ja
vax
.ws.rs.core.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.MultivaluedMap
;
import
ja
karta
.ws.rs.core.MultivaluedMap
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.Comment
;
import
org.gitlab4j.api.models.Comment
;
import
org.gitlab4j.api.models.Commit
;
import
org.gitlab4j.api.models.Commit
;
...
...
src/main/java/org/gitlab4j/api/ContainerRegistryApi.java
View file @
267ffcf3
...
@@ -27,8 +27,8 @@ import java.util.List;
...
@@ -27,8 +27,8 @@ 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.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.RegistryRepository
;
import
org.gitlab4j.api.models.RegistryRepository
;
import
org.gitlab4j.api.models.RegistryRepositoryTag
;
import
org.gitlab4j.api.models.RegistryRepositoryTag
;
...
...
src/main/java/org/gitlab4j/api/DeployKeysApi.java
View file @
267ffcf3
...
@@ -4,9 +4,9 @@ import java.util.List;
...
@@ -4,9 +4,9 @@ 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.Form
;
import
ja
karta
.ws.rs.core.Form
;
import
ja
vax
.ws.rs.core.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.DeployKey
;
import
org.gitlab4j.api.models.DeployKey
;
...
...
src/main/java/org/gitlab4j/api/DeployTokensApi.java
View file @
267ffcf3
...
@@ -2,7 +2,7 @@ package org.gitlab4j.api;
...
@@ -2,7 +2,7 @@ package org.gitlab4j.api;
import
org.gitlab4j.api.models.DeployToken
;
import
org.gitlab4j.api.models.DeployToken
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Stream
;
import
java.util.stream.Stream
;
...
...
src/main/java/org/gitlab4j/api/DeploymentsApi.java
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.Deployment
;
import
org.gitlab4j.api.models.Deployment
;
import
org.gitlab4j.api.models.DeploymentFilter
;
import
org.gitlab4j.api.models.DeploymentFilter
;
...
...
src/main/java/org/gitlab4j/api/DiscussionsApi.java
View file @
267ffcf3
...
@@ -5,8 +5,8 @@ import java.util.List;
...
@@ -5,8 +5,8 @@ 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.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.Discussion
;
import
org.gitlab4j.api.models.Discussion
;
import
org.gitlab4j.api.models.Note
;
import
org.gitlab4j.api.models.Note
;
...
...
src/main/java/org/gitlab4j/api/EnvironmentsApi.java
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.Environment
;
import
org.gitlab4j.api.models.Environment
;
...
...
src/main/java/org/gitlab4j/api/EpicsApi.java
View file @
267ffcf3
...
@@ -5,9 +5,9 @@ import java.util.List;
...
@@ -5,9 +5,9 @@ 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.Form
;
import
ja
karta
.ws.rs.core.Form
;
import
ja
vax
.ws.rs.core.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.Epic
;
import
org.gitlab4j.api.models.Epic
;
import
org.gitlab4j.api.models.EpicIssue
;
import
org.gitlab4j.api.models.EpicIssue
;
...
...
src/main/java/org/gitlab4j/api/EventsApi.java
View file @
267ffcf3
...
@@ -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
ja
vax
.ws.rs.core.GenericType
;
import
ja
karta
.ws.rs.core.GenericType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.Event
;
import
org.gitlab4j.api.models.Event
;
...
...
src/main/java/org/gitlab4j/api/ExternalStatusCheckApi.java
View file @
267ffcf3
...
@@ -4,8 +4,8 @@ import java.util.List;
...
@@ -4,8 +4,8 @@ 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.Form
;
import
ja
karta
.ws.rs.core.Form
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.models.ExternalStatusCheck
;
import
org.gitlab4j.api.models.ExternalStatusCheck
;
import
org.gitlab4j.api.models.ExternalStatusCheckProtectedBranch
;
import
org.gitlab4j.api.models.ExternalStatusCheckProtectedBranch
;
...
...
src/main/java/org/gitlab4j/api/GitLabApi.java
View file @
267ffcf3
...
@@ -9,8 +9,8 @@ import java.util.function.Supplier;
...
@@ -9,8 +9,8 @@ import java.util.function.Supplier;
import
java.util.logging.Level
;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
java.util.logging.Logger
;
import
ja
vax
.ws.rs.core.MediaType
;
import
ja
karta
.ws.rs.core.MediaType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
org.gitlab4j.api.Constants.TokenType
;
import
org.gitlab4j.api.Constants.TokenType
;
import
org.gitlab4j.api.models.OauthTokenResponse
;
import
org.gitlab4j.api.models.OauthTokenResponse
;
...
@@ -466,7 +466,7 @@ public class GitLabApi implements AutoCloseable {
...
@@ -466,7 +466,7 @@ public class GitLabApi implements AutoCloseable {
}
}
/**
/**
* Close the underlying {@link ja
vax
.ws.rs.client.Client} and its associated resources.
* Close the underlying {@link ja
karta
.ws.rs.client.Client} and its associated resources.
*/
*/
@Override
@Override
public
void
close
()
{
public
void
close
()
{
...
...
src/main/java/org/gitlab4j/api/GitLabApiClient.java
View file @
267ffcf3
...
@@ -20,16 +20,16 @@ import javax.net.ssl.SSLEngine;
...
@@ -20,16 +20,16 @@ import javax.net.ssl.SSLEngine;
import
javax.net.ssl.SSLSession
;
import
javax.net.ssl.SSLSession
;
import
javax.net.ssl.TrustManager
;
import
javax.net.ssl.TrustManager
;
import
javax.net.ssl.X509ExtendedTrustManager
;
import
javax.net.ssl.X509ExtendedTrustManager
;
import
ja
vax
.ws.rs.client.Client
;
import
ja
karta
.ws.rs.client.Client
;
import
ja
vax
.ws.rs.client.ClientBuilder
;
import
ja
karta
.ws.rs.client.ClientBuilder
;
import
ja
vax
.ws.rs.client.Entity
;
import
ja
karta
.ws.rs.client.Entity
;
import
ja
vax
.ws.rs.client.Invocation
;
import
ja
karta
.ws.rs.client.Invocation
;
import
ja
vax
.ws.rs.client.WebTarget
;
import
ja
karta
.ws.rs.client.WebTarget
;
import
ja
vax
.ws.rs.core.Form
;
import
ja
karta
.ws.rs.core.Form
;
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.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
ja
vax
.ws.rs.core.StreamingOutput
;
import
ja
karta
.ws.rs.core.StreamingOutput
;
import
org.gitlab4j.api.Constants.TokenType
;
import
org.gitlab4j.api.Constants.TokenType
;
import
org.gitlab4j.api.GitLabApi.ApiVersion
;
import
org.gitlab4j.api.GitLabApi.ApiVersion
;
import
org.gitlab4j.api.utils.JacksonJson
;
import
org.gitlab4j.api.utils.JacksonJson
;
...
...
src/main/java/org/gitlab4j/api/GitLabApiException.java
View file @
267ffcf3
...
@@ -7,9 +7,9 @@ import java.util.List;
...
@@ -7,9 +7,9 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Map.Entry
;
import
java.util.Map.Entry
;
import
ja
vax
.ws.rs.core.MediaType
;
import
ja
karta
.ws.rs.core.MediaType
;
import
ja
vax
.ws.rs.core.Response
;
import
ja
karta
.ws.rs.core.Response
;
import
ja
vax
.ws.rs.core.Response.StatusType
;
import
ja
karta
.ws.rs.core.Response.StatusType
;
import
org.gitlab4j.api.utils.JacksonJson
;
import
org.gitlab4j.api.utils.JacksonJson
;
...
...
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