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
45ff580c
Commit
45ff580c
authored
Apr 16, 2019
by
Greg Messner
Browse files
Removed use of JAXB (#327).
parent
7a0906fd
Changes
113
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
45ff580c
...
...
@@ -43,7 +43,6 @@
<jersey.version>
2.27
</jersey.version>
<jackson.version>
2.9.8
</jackson.version>
<javaServlet.version>
4.0.1
</javaServlet.version>
<jaxbApi.version>
2.3.1
</jaxbApi.version>
<junit.version>
4.12
</junit.version>
<mockito.version>
2.19.0
</mockito.version>
<hamcrest.version>
1.3
</hamcrest.version>
...
...
@@ -221,17 +220,6 @@
</build>
<dependencies>
<!-- jaxb-api and javax.activation added for Java 9 compatibility -->
<dependency>
<groupId>
javax.xml.bind
</groupId>
<artifactId>
jaxb-api
</artifactId>
<version>
${jaxbApi.version}
</version>
</dependency>
<dependency>
<groupId>
com.sun.activation
</groupId>
<artifactId>
javax.activation
</artifactId>
<version>
1.2.0
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.jaxrs
</groupId>
...
...
src/main/java/org/gitlab4j/api/MergeRequestApi.java
View file @
45ff580c
...
...
@@ -376,7 +376,7 @@ public class MergeRequestApi extends AbstractApi {
}
/**
*
@param projectIdOrPath the project in the form of an Integer(ID), String(path), or Project instance
*
Creates a merge request and optionally assigns a reviewer to it.
*
* <pre><code>GitLab Endpoint: POST /projects/:id/merge_requests</code></pre>
*
...
...
@@ -394,8 +394,7 @@ public class MergeRequestApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs
*/
public
MergeRequest
createMergeRequest
(
Object
projectIdOrPath
,
String
sourceBranch
,
String
targetBranch
,
String
title
,
String
description
,
Integer
assigneeId
,
Integer
targetProjectId
,
String
[]
labels
,
Integer
milestoneId
,
Boolean
removeSourceBranch
)
throws
GitLabApiException
{
Integer
targetProjectId
,
String
[]
labels
,
Integer
milestoneId
,
Boolean
removeSourceBranch
)
throws
GitLabApiException
{
return
createMergeRequest
(
projectIdOrPath
,
sourceBranch
,
targetBranch
,
title
,
description
,
assigneeId
,
targetProjectId
,
labels
,
milestoneId
,
removeSourceBranch
,
null
);
}
...
...
src/main/java/org/gitlab4j/api/models/AbstractUser.java
View file @
45ff580c
...
...
@@ -3,14 +3,10 @@ package org.gitlab4j.api.models;
import
java.util.Date
;
import
java.util.List
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
org.gitlab4j.api.utils.JacksonJson
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
abstract
class
AbstractUser
<
U
extends
AbstractUser
<
U
>>
{
...
...
src/main/java/org/gitlab4j/api/models/Artifact.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
import
org.gitlab4j.api.utils.JacksonJsonEnumHelper
;
import
com.fasterxml.jackson.annotation.JsonCreator
;
import
com.fasterxml.jackson.annotation.JsonValue
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
Artifact
{
public
enum
FileType
{
...
...
src/main/java/org/gitlab4j/api/models/ArtifactsFile.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ArtifactsFile
{
private
String
filename
;
...
...
src/main/java/org/gitlab4j/api/models/Assignee.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlRootElement
;
@XmlRootElement
public
class
Assignee
extends
AbstractUser
<
Assignee
>
{
}
src/main/java/org/gitlab4j/api/models/Author.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlRootElement
;
@XmlRootElement
public
class
Author
extends
AbstractUser
<
Author
>
{
}
src/main/java/org/gitlab4j/api/models/AwardEmoji.java
View file @
45ff580c
...
...
@@ -3,18 +3,12 @@ package org.gitlab4j.api.models;
import
java.util.Date
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
import
org.gitlab4j.api.utils.JacksonJsonEnumHelper
;
import
com.fasterxml.jackson.annotation.JsonCreator
;
import
com.fasterxml.jackson.annotation.JsonValue
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
AwardEmoji
{
public
enum
AwardableType
{
...
...
src/main/java/org/gitlab4j/api/models/Board.java
View file @
45ff580c
...
...
@@ -2,14 +2,8 @@ package org.gitlab4j.api.models;
import
java.util.List
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
Board
{
private
Integer
id
;
...
...
src/main/java/org/gitlab4j/api/models/BoardList.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
BoardList
{
private
Integer
id
;
...
...
src/main/java/org/gitlab4j/api/models/Branch.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
Branch
{
private
Commit
commit
;
...
...
src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
BranchAccessLevel
{
private
AccessLevel
accessLevel
;
...
...
src/main/java/org/gitlab4j/api/models/Comment.java
View file @
45ff580c
...
...
@@ -2,15 +2,9 @@ package org.gitlab4j.api.models;
import
java.util.Date
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.Constants.LineType
;
import
org.gitlab4j.api.utils.JacksonJson
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
Comment
{
private
Author
author
;
...
...
src/main/java/org/gitlab4j/api/models/Commit.java
View file @
45ff580c
...
...
@@ -4,14 +4,8 @@ package org.gitlab4j.api.models;
import
java.util.Date
;
import
java.util.List
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
Commit
{
private
Author
author
;
...
...
src/main/java/org/gitlab4j/api/models/CommitRef.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
import
org.gitlab4j.api.utils.JacksonJsonEnumHelper
;
import
com.fasterxml.jackson.annotation.JsonCreator
;
import
com.fasterxml.jackson.annotation.JsonValue
;
/**
* @author Евгений Уткин (evgeny.utkin@mediascope.net)
*/
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
CommitRef
{
private
RefType
type
;
...
...
src/main/java/org/gitlab4j/api/models/CommitStats.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
org.gitlab4j.api.utils.JacksonJson
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
CommitStats
{
private
Integer
additions
;
...
...
src/main/java/org/gitlab4j/api/models/CommitStatus.java
View file @
45ff580c
...
...
@@ -3,14 +3,8 @@ package org.gitlab4j.api.models;
import
java.util.Date
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
CommitStatus
{
private
Boolean
allowFailure
;
...
...
src/main/java/org/gitlab4j/api/models/CompareResults.java
View file @
45ff580c
...
...
@@ -3,14 +3,8 @@ package org.gitlab4j.api.models;
import
java.util.List
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
org.gitlab4j.api.utils.JacksonJson
;
@XmlRootElement
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
CompareResults
{
private
Commit
commit
;
...
...
src/main/java/org/gitlab4j/api/models/Contributor.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlRootElement
;
@XmlRootElement
public
class
Contributor
extends
AbstractUser
<
Contributor
>
{
}
\ No newline at end of file
src/main/java/org/gitlab4j/api/models/CustomAttribute.java
View file @
45ff580c
package
org.gitlab4j.api.models
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
CustomAttribute
{
private
String
key
;
private
String
value
;
...
...
Prev
1
2
3
4
5
6
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