Commit 45ff580c authored by Greg Messner's avatar Greg Messner
Browse files

Removed use of JAXB (#327).

parent 7a0906fd
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
<jersey.version>2.27</jersey.version> <jersey.version>2.27</jersey.version>
<jackson.version>2.9.8</jackson.version> <jackson.version>2.9.8</jackson.version>
<javaServlet.version>4.0.1</javaServlet.version> <javaServlet.version>4.0.1</javaServlet.version>
<jaxbApi.version>2.3.1</jaxbApi.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<mockito.version>2.19.0</mockito.version> <mockito.version>2.19.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version> <hamcrest.version>1.3</hamcrest.version>
...@@ -221,17 +220,6 @@ ...@@ -221,17 +220,6 @@
</build> </build>
<dependencies> <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> <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
......
...@@ -376,7 +376,7 @@ public class MergeRequestApi extends AbstractApi { ...@@ -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> * <pre><code>GitLab Endpoint: POST /projects/:id/merge_requests</code></pre>
* *
...@@ -394,8 +394,7 @@ public class MergeRequestApi extends AbstractApi { ...@@ -394,8 +394,7 @@ public class MergeRequestApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs * @throws GitLabApiException if any exception occurs
*/ */
public MergeRequest createMergeRequest(Object projectIdOrPath, String sourceBranch, String targetBranch, String title, String description, Integer assigneeId, public MergeRequest createMergeRequest(Object projectIdOrPath, String sourceBranch, String targetBranch, String title, String description, Integer assigneeId,
Integer targetProjectId, String[] labels, Integer milestoneId, Boolean removeSourceBranch) Integer targetProjectId, String[] labels, Integer milestoneId, Boolean removeSourceBranch) throws GitLabApiException {
throws GitLabApiException {
return createMergeRequest(projectIdOrPath, sourceBranch, targetBranch, title, description, assigneeId, targetProjectId, labels, milestoneId, removeSourceBranch, null); return createMergeRequest(projectIdOrPath, sourceBranch, targetBranch, title, description, assigneeId, targetProjectId, labels, milestoneId, removeSourceBranch, null);
} }
......
...@@ -3,14 +3,10 @@ package org.gitlab4j.api.models; ...@@ -3,14 +3,10 @@ package org.gitlab4j.api.models;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@XmlAccessorType(XmlAccessType.FIELD)
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public abstract class AbstractUser<U extends AbstractUser<U>> { public abstract class AbstractUser<U extends AbstractUser<U>> {
......
package org.gitlab4j.api.models; 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.JacksonJson;
import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class Artifact { public class Artifact {
public enum FileType { public enum FileType {
......
package org.gitlab4j.api.models; 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.JacksonJson;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class ArtifactsFile { public class ArtifactsFile {
private String filename; private String filename;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class Assignee extends AbstractUser<Assignee> { public class Assignee extends AbstractUser<Assignee> {
} }
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class Author extends AbstractUser<Author> { public class Author extends AbstractUser<Author> {
} }
...@@ -3,18 +3,12 @@ package org.gitlab4j.api.models; ...@@ -3,18 +3,12 @@ package org.gitlab4j.api.models;
import java.util.Date; 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.JacksonJson;
import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class AwardEmoji { public class AwardEmoji {
public enum AwardableType { public enum AwardableType {
......
...@@ -2,14 +2,8 @@ package org.gitlab4j.api.models; ...@@ -2,14 +2,8 @@ package org.gitlab4j.api.models;
import java.util.List; 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; import org.gitlab4j.api.utils.JacksonJson;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class Board { public class Board {
private Integer id; private Integer id;
......
package org.gitlab4j.api.models; 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.JacksonJson;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class BoardList { public class BoardList {
private Integer id; private Integer id;
......
package org.gitlab4j.api.models; 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.JacksonJson;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class Branch { public class Branch {
private Commit commit; private Commit commit;
......
package org.gitlab4j.api.models; 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 { public class BranchAccessLevel {
private AccessLevel accessLevel; private AccessLevel accessLevel;
......
...@@ -2,15 +2,9 @@ package org.gitlab4j.api.models; ...@@ -2,15 +2,9 @@ package org.gitlab4j.api.models;
import java.util.Date; 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.Constants.LineType;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class Comment { public class Comment {
private Author author; private Author author;
......
...@@ -4,14 +4,8 @@ package org.gitlab4j.api.models; ...@@ -4,14 +4,8 @@ package org.gitlab4j.api.models;
import java.util.Date; import java.util.Date;
import java.util.List; 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; import org.gitlab4j.api.utils.JacksonJson;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class Commit { public class Commit {
private Author author; private Author author;
......
package org.gitlab4j.api.models; 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.JacksonJson;
import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
/**
* @author Евгений Уткин (evgeny.utkin@mediascope.net)
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class CommitRef { public class CommitRef {
private RefType type; private RefType type;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
@XmlAccessorType(XmlAccessType.FIELD)
public class CommitStats { public class CommitStats {
private Integer additions; private Integer additions;
......
...@@ -3,14 +3,8 @@ package org.gitlab4j.api.models; ...@@ -3,14 +3,8 @@ package org.gitlab4j.api.models;
import java.util.Date; 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.JacksonJson;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class CommitStatus { public class CommitStatus {
private Boolean allowFailure; private Boolean allowFailure;
......
...@@ -3,14 +3,8 @@ package org.gitlab4j.api.models; ...@@ -3,14 +3,8 @@ package org.gitlab4j.api.models;
import java.util.List; 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; import org.gitlab4j.api.utils.JacksonJson;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class CompareResults { public class CompareResults {
private Commit commit; private Commit commit;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class Contributor extends AbstractUser<Contributor> { public class Contributor extends AbstractUser<Contributor> {
} }
\ No newline at end of file
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@XmlAccessorType(XmlAccessType.FIELD)
public class CustomAttribute { public class CustomAttribute {
private String key; private String key;
private String value; private String value;
......
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