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

Removed use of JAXB (#327).

parent 7a0906fd
...@@ -3,17 +3,11 @@ package org.gitlab4j.api.models; ...@@ -3,17 +3,11 @@ 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;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class MergeRequest { public class MergeRequest {
private Integer approvalsBeforeMerge; private Integer approvalsBeforeMerge;
......
...@@ -2,14 +2,8 @@ package org.gitlab4j.api.models; ...@@ -2,14 +2,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 Milestone { public class Milestone {
private Date createdAt; private Date createdAt;
......
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 Namespace { public class Namespace {
private Integer id; private Integer id;
......
...@@ -2,18 +2,12 @@ package org.gitlab4j.api.models; ...@@ -2,18 +2,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 Note { public class Note {
/** Enum to use for ordering the results. */ /** Enum to use for ordering the results. */
......
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 NotificationSettings { public class NotificationSettings {
/** Notification level */ /** Notification level */
......
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 OauthTokenResponse { public class OauthTokenResponse {
private String accessToken; private String accessToken;
......
...@@ -2,14 +2,8 @@ package org.gitlab4j.api.models; ...@@ -2,14 +2,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 Owner { public class Owner {
private Date createdAt; private Date createdAt;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import javax.xml.bind.annotation.XmlRootElement;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
@XmlRootElement
public class Package { public class Package {
private Integer id; private Integer id;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class Participant extends AbstractUser<Participant> { public class Participant extends AbstractUser<Participant> {
} }
\ 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;
import javax.xml.bind.annotation.XmlRootElement;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class Permissions { public class Permissions {
private ProjectAccess projectAccess; private ProjectAccess projectAccess;
......
...@@ -2,14 +2,8 @@ package org.gitlab4j.api.models; ...@@ -2,14 +2,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 Pipeline { public class Pipeline {
private Integer id; private Integer id;
......
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import org.gitlab4j.api.utils.JacksonJson;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Date; import java.util.Date;
@XmlRootElement import org.gitlab4j.api.utils.JacksonJson;
@XmlAccessorType(XmlAccessType.FIELD)
public class PipelineSchedule { public class PipelineSchedule {
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;
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 Position { public class Position {
public static enum PositionType { public static enum PositionType {
......
...@@ -4,18 +4,12 @@ package org.gitlab4j.api.models; ...@@ -4,18 +4,12 @@ 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;
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 Project { public class Project {
// Enum for the merge_method of the Project instance. // Enum for the merge_method of the Project instance.
......
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 ProjectAccess { public class ProjectAccess {
private AccessLevel accessLevel; private AccessLevel accessLevel;
......
...@@ -3,16 +3,10 @@ package org.gitlab4j.api.models; ...@@ -3,16 +3,10 @@ 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 com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class ProjectHook { public class ProjectHook {
private Boolean buildEvents; private Boolean buildEvents;
......
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 ProjectSharedGroup { public class ProjectSharedGroup {
private Integer groupId; private Integer groupId;
......
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;
/** /**
...@@ -11,7 +8,6 @@ import org.gitlab4j.api.utils.JacksonJson; ...@@ -11,7 +8,6 @@ import org.gitlab4j.api.utils.JacksonJson;
* ProjectApi.getProject() has to be called with parameter statistics=true * ProjectApi.getProject() has to be called with parameter statistics=true
* which is only allowed for GitLab admins. * which is only allowed for GitLab admins.
*/ */
@XmlAccessorType(XmlAccessType.FIELD)
public class ProjectStatistics { public class ProjectStatistics {
long commitCount; long commitCount;
......
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 ProjectUser { public class ProjectUser {
private Integer id; private Integer id;
......
...@@ -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 ProtectedBranch { public class ProtectedBranch {
private String name; private String name;
......
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