diff --git a/pom.xml b/pom.xml index 59fc7aec8fac2d1415929fdabc2b4f5e2bb01da1..a2eec28b2900e2d69070dcaffde114b3ea162ea6 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ 2.27 2.9.8 4.0.1 - 2.3.1 4.12 2.19.0 1.3 @@ -221,17 +220,6 @@ - - - javax.xml.bind - jaxb-api - ${jaxbApi.version} - - - com.sun.activation - javax.activation - 1.2.0 - com.fasterxml.jackson.jaxrs diff --git a/src/main/java/org/gitlab4j/api/MergeRequestApi.java b/src/main/java/org/gitlab4j/api/MergeRequestApi.java index c605111fd32dd138cb55d06346b06960fcca3293..70ccda8cdfcbc378545f0b204828717e4155446d 100644 --- a/src/main/java/org/gitlab4j/api/MergeRequestApi.java +++ b/src/main/java/org/gitlab4j/api/MergeRequestApi.java @@ -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. * * 
GitLab Endpoint: POST /projects/:id/merge_requests
* @@ -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); } diff --git a/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/src/main/java/org/gitlab4j/api/models/AbstractUser.java index cacb79ee245df7e76334a0d984d05b08abd9a5f6..df7e59054f8f8815ab5f13e1460e4e08b80b5e9b 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -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> { diff --git a/src/main/java/org/gitlab4j/api/models/Artifact.java b/src/main/java/org/gitlab4j/api/models/Artifact.java index bee2a16a979b7f0333c27410a747596031629a97..2395f4bac54c8c3c5db9eb1704607cd05a793ef8 100644 --- a/src/main/java/org/gitlab4j/api/models/Artifact.java +++ b/src/main/java/org/gitlab4j/api/models/Artifact.java @@ -1,17 +1,11 @@ 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 { diff --git a/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java b/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java index 2567931dfaf6f930e13c312f097d6ad305f38b39..6faa52af356f3a6953257749be009e65b559cc3e 100644 --- a/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java +++ b/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java @@ -1,13 +1,7 @@ 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; diff --git a/src/main/java/org/gitlab4j/api/models/Assignee.java b/src/main/java/org/gitlab4j/api/models/Assignee.java index 4163ad243a6c3ee77b51af43c210c916a7ad895e..6f3d8527307a778ceb6ff566675a9375974a738d 100644 --- a/src/main/java/org/gitlab4j/api/models/Assignee.java +++ b/src/main/java/org/gitlab4j/api/models/Assignee.java @@ -1,8 +1,5 @@ package org.gitlab4j.api.models; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement public class Assignee extends AbstractUser { } diff --git a/src/main/java/org/gitlab4j/api/models/Author.java b/src/main/java/org/gitlab4j/api/models/Author.java index 679c5b174daf918855f0621e8314d60584e7c7f0..b7735c25051730e886c4ed1db04e8ac361f83056 100644 --- a/src/main/java/org/gitlab4j/api/models/Author.java +++ b/src/main/java/org/gitlab4j/api/models/Author.java @@ -1,8 +1,5 @@ package org.gitlab4j.api.models; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement public class Author extends AbstractUser { } diff --git a/src/main/java/org/gitlab4j/api/models/AwardEmoji.java b/src/main/java/org/gitlab4j/api/models/AwardEmoji.java index 662213bbb9c764a0b8f86f2e10960558aeceadab..c4cda2c015a0a5ab35539e8325c4976c99aee41b 100644 --- a/src/main/java/org/gitlab4j/api/models/AwardEmoji.java +++ b/src/main/java/org/gitlab4j/api/models/AwardEmoji.java @@ -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 { diff --git a/src/main/java/org/gitlab4j/api/models/Board.java b/src/main/java/org/gitlab4j/api/models/Board.java index e318113bc57a6eb92212f278d866410474c67fdd..28544e4460f6ea0656e4a2b04e769f5de37b1b6e 100644 --- a/src/main/java/org/gitlab4j/api/models/Board.java +++ b/src/main/java/org/gitlab4j/api/models/Board.java @@ -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; diff --git a/src/main/java/org/gitlab4j/api/models/BoardList.java b/src/main/java/org/gitlab4j/api/models/BoardList.java index 38936233b75ecc7f0d91e563f427d400451b5be6..b8f81121e497da87a7fdb71f93767058928ad35d 100644 --- a/src/main/java/org/gitlab4j/api/models/BoardList.java +++ b/src/main/java/org/gitlab4j/api/models/BoardList.java @@ -1,13 +1,7 @@ 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; diff --git a/src/main/java/org/gitlab4j/api/models/Branch.java b/src/main/java/org/gitlab4j/api/models/Branch.java index 7c3b49389915db5750a9b3d44158254306d5b61f..f880925063f06a19c31b86a9418f088727ddbc43 100644 --- a/src/main/java/org/gitlab4j/api/models/Branch.java +++ b/src/main/java/org/gitlab4j/api/models/Branch.java @@ -1,14 +1,8 @@ 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; diff --git a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java index ddc4813279a6a165d7049b0649a001ecf1b1e971..36efe29a0a0c24e16ec49c828e7dcba5e9a9eaed 100644 --- a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java +++ b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java @@ -1,11 +1,5 @@ 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; diff --git a/src/main/java/org/gitlab4j/api/models/Comment.java b/src/main/java/org/gitlab4j/api/models/Comment.java index 80279b01abfc7b383fa2b2542e478483ab407b89..7eaf60b38674bd85d140adf6b6b45d610ef54052 100644 --- a/src/main/java/org/gitlab4j/api/models/Comment.java +++ b/src/main/java/org/gitlab4j/api/models/Comment.java @@ -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; diff --git a/src/main/java/org/gitlab4j/api/models/Commit.java b/src/main/java/org/gitlab4j/api/models/Commit.java index 233911fd9b137c6007490f62278965e66333dae8..3b3be3ed004b30a7e6a3c3d25b9285fd6cc1a91b 100644 --- a/src/main/java/org/gitlab4j/api/models/Commit.java +++ b/src/main/java/org/gitlab4j/api/models/Commit.java @@ -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; diff --git a/src/main/java/org/gitlab4j/api/models/CommitRef.java b/src/main/java/org/gitlab4j/api/models/CommitRef.java index 75a6e33cead58b03492a9c0c21963a5b97c4c7ca..3941559400fc81b8d05bf51ab6a2a3462f4f2816 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitRef.java +++ b/src/main/java/org/gitlab4j/api/models/CommitRef.java @@ -1,20 +1,11 @@ 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; diff --git a/src/main/java/org/gitlab4j/api/models/CommitStats.java b/src/main/java/org/gitlab4j/api/models/CommitStats.java index 25bcb22420fd25e29c5e8171af556bc418515c70..d43bc626ea6f54174c0dfd94e803f69a20079a36 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStats.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStats.java @@ -1,11 +1,7 @@ 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; diff --git a/src/main/java/org/gitlab4j/api/models/CommitStatus.java b/src/main/java/org/gitlab4j/api/models/CommitStatus.java index 6f2983b11ce6924e24d0caa89e6855d3f463af7c..9596f1cb89a18f5b949bb99f976176176493df3d 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStatus.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStatus.java @@ -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; diff --git a/src/main/java/org/gitlab4j/api/models/CompareResults.java b/src/main/java/org/gitlab4j/api/models/CompareResults.java index 0ed8b22a8a46d34c5ad705dd8e4ebadbb81ebe99..ffb09019b3355f6ac11adb94a0726af58fda387e 100644 --- a/src/main/java/org/gitlab4j/api/models/CompareResults.java +++ b/src/main/java/org/gitlab4j/api/models/CompareResults.java @@ -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; diff --git a/src/main/java/org/gitlab4j/api/models/Contributor.java b/src/main/java/org/gitlab4j/api/models/Contributor.java index 44272c644e69bd0fcd20b9bc9bffb47dd123aaff..17697594447b85c785a41df7a769aa8a6a2fe80a 100644 --- a/src/main/java/org/gitlab4j/api/models/Contributor.java +++ b/src/main/java/org/gitlab4j/api/models/Contributor.java @@ -1,7 +1,4 @@ package org.gitlab4j.api.models; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement public class Contributor extends AbstractUser { } \ No newline at end of file diff --git a/src/main/java/org/gitlab4j/api/models/CustomAttribute.java b/src/main/java/org/gitlab4j/api/models/CustomAttribute.java index c84e4b639985d1ecc6cf5d25b69bfe7d6fa888f3..6b965ae68b860596377ac4c8a8dad88f0a6d07d2 100644 --- a/src/main/java/org/gitlab4j/api/models/CustomAttribute.java +++ b/src/main/java/org/gitlab4j/api/models/CustomAttribute.java @@ -1,9 +1,5 @@ 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; diff --git a/src/main/java/org/gitlab4j/api/models/DeployKey.java b/src/main/java/org/gitlab4j/api/models/DeployKey.java index c593ff1ce49e5b174a7f2aab0635157840482302..f33ea8de12e5ddec09cc54c7b7c2525412bf50e8 100644 --- a/src/main/java/org/gitlab4j/api/models/DeployKey.java +++ b/src/main/java/org/gitlab4j/api/models/DeployKey.java @@ -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 DeployKey { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/Diff.java b/src/main/java/org/gitlab4j/api/models/Diff.java index 35a91cfc9386940c5c6f017d50f47e49895d8c35..9abeae4c5a6ec92c5f144cda3a974bc338cf76de 100644 --- a/src/main/java/org/gitlab4j/api/models/Diff.java +++ b/src/main/java/org/gitlab4j/api/models/Diff.java @@ -1,17 +1,11 @@ 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 com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class Diff { @JsonInclude(JsonInclude.Include.ALWAYS) diff --git a/src/main/java/org/gitlab4j/api/models/Discussion.java b/src/main/java/org/gitlab4j/api/models/Discussion.java index 97d4b224b8a711527a24f8e6f315e18d1a7444fe..d15204e89b980b19f858a6f3602acc06314769ee 100644 --- a/src/main/java/org/gitlab4j/api/models/Discussion.java +++ b/src/main/java/org/gitlab4j/api/models/Discussion.java @@ -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 Discussion { private String id; diff --git a/src/main/java/org/gitlab4j/api/models/Epic.java b/src/main/java/org/gitlab4j/api/models/Epic.java index 2964c293f0a3f36035ed3f4c8ad19c5fe01193ec..4b226f49a1a8cb82d7bd5ea1f921c893dd3ae238 100644 --- a/src/main/java/org/gitlab4j/api/models/Epic.java +++ b/src/main/java/org/gitlab4j/api/models/Epic.java @@ -3,14 +3,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 Epic { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/EpicIssue.java b/src/main/java/org/gitlab4j/api/models/EpicIssue.java index b154e778b3237ecc315372124e09a8030752bf4b..db4d9922e153ba956922250b8c2752b6ec0e3dfe 100644 --- a/src/main/java/org/gitlab4j/api/models/EpicIssue.java +++ b/src/main/java/org/gitlab4j/api/models/EpicIssue.java @@ -3,15 +3,11 @@ package org.gitlab4j.api.models; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -@XmlAccessorType(XmlAccessType.FIELD) public class EpicIssue extends Issue { private Integer downvotes; diff --git a/src/main/java/org/gitlab4j/api/models/Event.java b/src/main/java/org/gitlab4j/api/models/Event.java index ee14d83983cbee819a4e75ebe2508e704f074c2f..dc9e3a28c9c543d1bfb5f0605431555f922be36e 100644 --- a/src/main/java/org/gitlab4j/api/models/Event.java +++ b/src/main/java/org/gitlab4j/api/models/Event.java @@ -3,15 +3,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.TargetType; import org.gitlab4j.api.utils.JacksonJson; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class Event { private String actionName; diff --git a/src/main/java/org/gitlab4j/api/models/EventData.java b/src/main/java/org/gitlab4j/api/models/EventData.java index 3f129528db319da3242a3ad70fb9f20fdb47fee9..1ba98a9845cd1207ac05c4925c3c86b62d9c6669 100644 --- a/src/main/java/org/gitlab4j/api/models/EventData.java +++ b/src/main/java/org/gitlab4j/api/models/EventData.java @@ -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 EventData { private String after; diff --git a/src/main/java/org/gitlab4j/api/models/FileUpload.java b/src/main/java/org/gitlab4j/api/models/FileUpload.java index 195316be9d2406399ac649dcbf964dfdd3a255b4..ba042dd55f0bbdc13cad4efdca1879d30b1f4a9d 100644 --- a/src/main/java/org/gitlab4j/api/models/FileUpload.java +++ b/src/main/java/org/gitlab4j/api/models/FileUpload.java @@ -1,13 +1,7 @@ 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 FileUpload { private String alt; diff --git a/src/main/java/org/gitlab4j/api/models/Group.java b/src/main/java/org/gitlab4j/api/models/Group.java index 8d59711b57a7e1dbab4c67730b6f3442ecf0eb88..33ec5ca8d4d6800645d215781953617758091f18 100644 --- a/src/main/java/org/gitlab4j/api/models/Group.java +++ b/src/main/java/org/gitlab4j/api/models/Group.java @@ -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 Group { public class Statistics { diff --git a/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java b/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java index ca65d287ded2fac641c9cef22255474ec1c2b155..a757937d916552ce980bd45e2c9d356a3cd5954e 100644 --- a/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java +++ b/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java @@ -1,13 +1,7 @@ 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 HealthCheckInfo { private HealthCheckItem dbCheck; private HealthCheckItem redisCheck; diff --git a/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java b/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java index 44b6076cbd5fbe64e63126a44203fbeaac236f99..7d9261cd2fd3750e4c1e982363c9424633519a46 100644 --- a/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java +++ b/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java @@ -2,12 +2,8 @@ package org.gitlab4j.api.models; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class HealthCheckItem { private HealthCheckStatus status; private Map labels; diff --git a/src/main/java/org/gitlab4j/api/models/Identity.java b/src/main/java/org/gitlab4j/api/models/Identity.java index 4e04f26477e3edc0968fc17af6af0d2854973a71..6ea3450b60f006eead4371bf06f37d317e9d3372 100644 --- a/src/main/java/org/gitlab4j/api/models/Identity.java +++ b/src/main/java/org/gitlab4j/api/models/Identity.java @@ -1,11 +1,7 @@ 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 Identity { private String provider; diff --git a/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 1fa3c385fd95a156749fa99795efb27bdc5d99c0..d0032a2064b589cc82ec3d514e0260726d317341 100644 --- a/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java +++ b/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java @@ -3,16 +3,12 @@ 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 org.gitlab4j.api.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -@XmlAccessorType(XmlAccessType.FIELD) public class ImpersonationToken { /** Enum to specify the scope of an ImpersonationToken. */ diff --git a/src/main/java/org/gitlab4j/api/models/Issue.java b/src/main/java/org/gitlab4j/api/models/Issue.java index 90d50e32fe7b11a1f685da08e6f7fef2b8d1c2ce..b1cc6881060101721fc9bd1c85c2dc193b9b71d4 100644 --- a/src/main/java/org/gitlab4j/api/models/Issue.java +++ b/src/main/java/org/gitlab4j/api/models/Issue.java @@ -4,15 +4,9 @@ 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.Constants.IssueState; import org.gitlab4j.api.utils.JacksonJson; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class Issue { private Assignee assignee; diff --git a/src/main/java/org/gitlab4j/api/models/Job.java b/src/main/java/org/gitlab4j/api/models/Job.java index 6aebee81f15e1ebb45b66eefe8ca4fd6235e5d73..11c16594a9349a8d523d706ba46f182c3920829e 100644 --- a/src/main/java/org/gitlab4j/api/models/Job.java +++ b/src/main/java/org/gitlab4j/api/models/Job.java @@ -3,14 +3,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 Job { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/Key.java b/src/main/java/org/gitlab4j/api/models/Key.java index 8f3bb5fdb217140fc40c78fae7f5edcbe1fc1b16..20b500b6e8c66be579150497818cf9a91e581fcf 100644 --- a/src/main/java/org/gitlab4j/api/models/Key.java +++ b/src/main/java/org/gitlab4j/api/models/Key.java @@ -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 Key { private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/Label.java b/src/main/java/org/gitlab4j/api/models/Label.java index 2dcb66b8bb1ce154f85902072d63716daf04a4e9..103f3018356b2873fa815d7a1701abb8052232b4 100644 --- a/src/main/java/org/gitlab4j/api/models/Label.java +++ b/src/main/java/org/gitlab4j/api/models/Label.java @@ -1,13 +1,7 @@ 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 Label { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java b/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java index 10531aab495bd27e369dee332d3c29096f34d787..dc0f8d56f2e5eb7db9a06a36119fc0ebc6f3ca21 100644 --- a/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java +++ b/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java @@ -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 LicenseTemplate { private String key; diff --git a/src/main/java/org/gitlab4j/api/models/Markdown.java b/src/main/java/org/gitlab4j/api/models/Markdown.java index 4a0d6af84520f3acbff86fdfa53f2c303077ec8e..09c35cbe468aaf7278f7229a5b39df2c864b8d66 100644 --- a/src/main/java/org/gitlab4j/api/models/Markdown.java +++ b/src/main/java/org/gitlab4j/api/models/Markdown.java @@ -1,13 +1,7 @@ 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 Markdown { private String html; diff --git a/src/main/java/org/gitlab4j/api/models/Member.java b/src/main/java/org/gitlab4j/api/models/Member.java index 8c8440f0d735e2075c9f8ffe61d2ae8757d04c94..b036a7ffc50c5d1df4dc0687e7db2771f8ab229e 100644 --- a/src/main/java/org/gitlab4j/api/models/Member.java +++ b/src/main/java/org/gitlab4j/api/models/Member.java @@ -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 Member { private AccessLevel accessLevel; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/src/main/java/org/gitlab4j/api/models/MergeRequest.java index 19c7804ba08c99cb87378fc313ca1fb1e1c85009..49710b2cd0d583689e24e5b68efbb6b1de89daf9 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequest.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequest.java @@ -3,17 +3,11 @@ 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; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class MergeRequest { private Integer approvalsBeforeMerge; diff --git a/src/main/java/org/gitlab4j/api/models/Milestone.java b/src/main/java/org/gitlab4j/api/models/Milestone.java index 6db0cfcea13146fd6eb82f4de2198e8dfc01f74f..5b28909402ac78db570fa6ff55515117a7d445ba 100644 --- a/src/main/java/org/gitlab4j/api/models/Milestone.java +++ b/src/main/java/org/gitlab4j/api/models/Milestone.java @@ -2,14 +2,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 Milestone { private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/Namespace.java b/src/main/java/org/gitlab4j/api/models/Namespace.java index 3db65aaf441dfecef92492ffa40b14104f1856e6..6afa32653b58e4dc17828dd01e078cbe5faa1631 100644 --- a/src/main/java/org/gitlab4j/api/models/Namespace.java +++ b/src/main/java/org/gitlab4j/api/models/Namespace.java @@ -1,13 +1,7 @@ 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 Namespace { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/Note.java b/src/main/java/org/gitlab4j/api/models/Note.java index 7db47c6155faa93c65d80963862f07723d7be73a..cf06348b1c2d7022ee848e1b0fc71e1b7e00aef3 100644 --- a/src/main/java/org/gitlab4j/api/models/Note.java +++ b/src/main/java/org/gitlab4j/api/models/Note.java @@ -2,18 +2,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 Note { /** Enum to use for ordering the results. */ diff --git a/src/main/java/org/gitlab4j/api/models/NotificationSettings.java b/src/main/java/org/gitlab4j/api/models/NotificationSettings.java index eedd50756c6a5bf7f0ab55ecc217da3bcdc0e0a2..f51e1026d06f2e2e4e0a11168f0f3647aad22198 100644 --- a/src/main/java/org/gitlab4j/api/models/NotificationSettings.java +++ b/src/main/java/org/gitlab4j/api/models/NotificationSettings.java @@ -1,17 +1,11 @@ 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 NotificationSettings { /** Notification level */ diff --git a/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java b/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java index c0f4396a62a0f12ade085dd26f7eed3e8119a698..3b30e0c8776b5895a3f90bd77455b356d9f955d7 100644 --- a/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java +++ b/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java @@ -1,11 +1,5 @@ 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 { private String accessToken; diff --git a/src/main/java/org/gitlab4j/api/models/Owner.java b/src/main/java/org/gitlab4j/api/models/Owner.java index 97e651de9358ad6d48a653b6e9bac556a461857f..5dadf6f4dde9f90d33d8992ff10037ff64a40a9e 100644 --- a/src/main/java/org/gitlab4j/api/models/Owner.java +++ b/src/main/java/org/gitlab4j/api/models/Owner.java @@ -2,14 +2,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 Owner { private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/Package.java b/src/main/java/org/gitlab4j/api/models/Package.java index f5fe9c15f52c3895758ff948b258f7f5887587e5..ae3497cc27df984422fa1bb0a4e7f55c244158d7 100644 --- a/src/main/java/org/gitlab4j/api/models/Package.java +++ b/src/main/java/org/gitlab4j/api/models/Package.java @@ -1,10 +1,7 @@ package org.gitlab4j.api.models; -import javax.xml.bind.annotation.XmlRootElement; - import org.gitlab4j.api.utils.JacksonJson; -@XmlRootElement public class Package { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/Participant.java b/src/main/java/org/gitlab4j/api/models/Participant.java index 1c78d6cf5aa612012725f715200ace5ec802cb41..83ac5b526145034949157ec7c896ac755f4bbda0 100644 --- a/src/main/java/org/gitlab4j/api/models/Participant.java +++ b/src/main/java/org/gitlab4j/api/models/Participant.java @@ -1,7 +1,4 @@ package org.gitlab4j.api.models; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement public class Participant extends AbstractUser { } \ No newline at end of file diff --git a/src/main/java/org/gitlab4j/api/models/Permissions.java b/src/main/java/org/gitlab4j/api/models/Permissions.java index eb22c69e62f3bf9734c908eef7015dc95eb03b01..cbc561307eb98d60bb17ac61916bc4507b55899c 100644 --- a/src/main/java/org/gitlab4j/api/models/Permissions.java +++ b/src/main/java/org/gitlab4j/api/models/Permissions.java @@ -1,13 +1,7 @@ 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 Permissions { private ProjectAccess projectAccess; diff --git a/src/main/java/org/gitlab4j/api/models/Pipeline.java b/src/main/java/org/gitlab4j/api/models/Pipeline.java index 1e6c302f1033eb5f8778f3bde6b7ddf11ed1e305..bae7b3e2dd0f6c72b848095ebcebcd548d079324 100644 --- a/src/main/java/org/gitlab4j/api/models/Pipeline.java +++ b/src/main/java/org/gitlab4j/api/models/Pipeline.java @@ -2,14 +2,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 Pipeline { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java b/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java index 354576e1f3bdd3151497821094795b0352dacd68..c9cd38533a1f682c41339eaf4e8041780e67a7cc 100644 --- a/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java +++ b/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java @@ -1,14 +1,9 @@ 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; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) +import org.gitlab4j.api.utils.JacksonJson; + public class PipelineSchedule { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/Position.java b/src/main/java/org/gitlab4j/api/models/Position.java index 0e98269e05cdca809f7b2ffe5cc994e00c3b5ba4..fe7e90ea0224618f569197bd7d663e64214a47fd 100644 --- a/src/main/java/org/gitlab4j/api/models/Position.java +++ b/src/main/java/org/gitlab4j/api/models/Position.java @@ -1,17 +1,11 @@ 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 Position { public static enum PositionType { diff --git a/src/main/java/org/gitlab4j/api/models/Project.java b/src/main/java/org/gitlab4j/api/models/Project.java index 8dcf39c883b98a0516bf8eb20697c4a508d82fec..56c56651aba82add79141c0b28914913ee2f2c21 100644 --- a/src/main/java/org/gitlab4j/api/models/Project.java +++ b/src/main/java/org/gitlab4j/api/models/Project.java @@ -4,18 +4,12 @@ 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; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class Project { // Enum for the merge_method of the Project instance. diff --git a/src/main/java/org/gitlab4j/api/models/ProjectAccess.java b/src/main/java/org/gitlab4j/api/models/ProjectAccess.java index 58cd3c5dd8c772d021cce80c7cb5d5e2cc4efd42..3d35183b3a97e96ede6afb39c47f952b4be999a9 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectAccess.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectAccess.java @@ -1,11 +1,7 @@ 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 ProjectAccess { private AccessLevel accessLevel; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/src/main/java/org/gitlab4j/api/models/ProjectHook.java index c0887f562f6d1ff0eb83536b24c05cc2df1b4e62..cc23bc9154fa8f2a127afa182a3be1aaaab292b1 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -3,16 +3,10 @@ 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 com.fasterxml.jackson.annotation.JsonIgnore; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class ProjectHook { private Boolean buildEvents; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectSharedGroup.java b/src/main/java/org/gitlab4j/api/models/ProjectSharedGroup.java index 9558640e8410efffe5ac4e1f3efd562a9555a11f..b4d10dd4d82a4fd5ae8c9220025b1d2a7edc2195 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectSharedGroup.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectSharedGroup.java @@ -1,11 +1,7 @@ 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 ProjectSharedGroup { private Integer groupId; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java b/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java index dfaa058c6c5a7637619640d4200485b4c1de0492..df5dd82f6ecd31a3a1ac7f94f51119d51f7264c3 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java @@ -1,9 +1,6 @@ package org.gitlab4j.api.models; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - 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 * which is only allowed for GitLab admins. */ -@XmlAccessorType(XmlAccessType.FIELD) public class ProjectStatistics { long commitCount; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectUser.java b/src/main/java/org/gitlab4j/api/models/ProjectUser.java index 142d547b0194afd255d0b39a4af3a3185f654902..23ccf9edea44db7ad48b1c38832b4e7d1204c2a1 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectUser.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectUser.java @@ -1,13 +1,7 @@ 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 ProjectUser { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java b/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java index 534af62054cfebbf6e20af62dff0173cab448da4..ec067242b0609b42824d2b11ff864cdadfa9190b 100644 --- a/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java +++ b/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java @@ -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 ProtectedBranch { private String name; diff --git a/src/main/java/org/gitlab4j/api/models/PushData.java b/src/main/java/org/gitlab4j/api/models/PushData.java index 11a7d480db7ab5087f9a9ee08d78e9ada06dd20b..8d420c76cccfb7cf43b88356cd268dc87a43d000 100644 --- a/src/main/java/org/gitlab4j/api/models/PushData.java +++ b/src/main/java/org/gitlab4j/api/models/PushData.java @@ -1,15 +1,9 @@ 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.Constants.ActionType; import org.gitlab4j.api.utils.JacksonJson; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class PushData { private Integer commit_count; diff --git a/src/main/java/org/gitlab4j/api/models/PushRules.java b/src/main/java/org/gitlab4j/api/models/PushRules.java index 7e573087a638fc1fb032d0185abf4a1b1ac13b73..c2c0b6e8718e9c0e1111226544a605aea23e4f11 100644 --- a/src/main/java/org/gitlab4j/api/models/PushRules.java +++ b/src/main/java/org/gitlab4j/api/models/PushRules.java @@ -2,14 +2,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 PushRules { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/Release.java b/src/main/java/org/gitlab4j/api/models/Release.java index ecb56b28802ec43204ac56e75c74f72f34a9080c..b41d688b920d6c318ba33b2642805747cdef233a 100644 --- a/src/main/java/org/gitlab4j/api/models/Release.java +++ b/src/main/java/org/gitlab4j/api/models/Release.java @@ -1,13 +1,7 @@ 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 Release { private String tagName; diff --git a/src/main/java/org/gitlab4j/api/models/Repository.java b/src/main/java/org/gitlab4j/api/models/Repository.java index 9fa08f4cbadf8e4aaaef74c81ea8639b1eae4010..5265b99e367cf5f8b8a5832892cc6e5aa46f0972 100644 --- a/src/main/java/org/gitlab4j/api/models/Repository.java +++ b/src/main/java/org/gitlab4j/api/models/Repository.java @@ -1,13 +1,7 @@ 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 Repository { private String description; diff --git a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java index 3137769aea28d649df8751a7ea68475e262a215d..daafdbaa264dcc8c5ee6bc26a7c792b3dd5545e4 100644 --- a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java +++ b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java @@ -3,16 +3,10 @@ package org.gitlab4j.api.models; import java.util.Base64; -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 com.fasterxml.jackson.annotation.JsonIgnore; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class RepositoryFile { private String fileName; // file name only, Ex. class.rb diff --git a/src/main/java/org/gitlab4j/api/models/Runner.java b/src/main/java/org/gitlab4j/api/models/Runner.java index 0d5ee5313910f3c539acaaac238dcc72c47a7fc9..04d855e19a313b8117a3259c014f558ede81e4ac 100644 --- a/src/main/java/org/gitlab4j/api/models/Runner.java +++ b/src/main/java/org/gitlab4j/api/models/Runner.java @@ -1,17 +1,11 @@ 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 Runner { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/RunnerDetail.java b/src/main/java/org/gitlab4j/api/models/RunnerDetail.java index 35562638706004c6ec8a0b25f0109cae410d6fbb..4d3785495792c32447cd45f6a847b1109de7aa58 100644 --- a/src/main/java/org/gitlab4j/api/models/RunnerDetail.java +++ b/src/main/java/org/gitlab4j/api/models/RunnerDetail.java @@ -3,18 +3,12 @@ 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; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class RunnerDetail extends Runner { private String architecture; diff --git a/src/main/java/org/gitlab4j/api/models/Session.java b/src/main/java/org/gitlab4j/api/models/Session.java index 1bcb2105ce4c201e6114366cb5bacc37fe724599..74da9b3811421d8a082e3c2fe62554cd11d428f3 100644 --- a/src/main/java/org/gitlab4j/api/models/Session.java +++ b/src/main/java/org/gitlab4j/api/models/Session.java @@ -3,14 +3,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 Session { private String avatarUrl; diff --git a/src/main/java/org/gitlab4j/api/models/Snippet.java b/src/main/java/org/gitlab4j/api/models/Snippet.java index bc0ca53b697fda8cea39a7661147dc22e933b21d..18a30158b9b5acf5986530ec0c3db57565bd94e8 100644 --- a/src/main/java/org/gitlab4j/api/models/Snippet.java +++ b/src/main/java/org/gitlab4j/api/models/Snippet.java @@ -25,14 +25,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 Snippet { private Author author; diff --git a/src/main/java/org/gitlab4j/api/models/SshKey.java b/src/main/java/org/gitlab4j/api/models/SshKey.java index 24235e49ca943d87c73b83729532ebc8e1818c11..62f2e2a81733453d20b9fe669587543aa06a81ea 100644 --- a/src/main/java/org/gitlab4j/api/models/SshKey.java +++ b/src/main/java/org/gitlab4j/api/models/SshKey.java @@ -2,14 +2,10 @@ package org.gitlab4j.api.models; import java.util.Date; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnore; -@XmlAccessorType(XmlAccessType.FIELD) public class SshKey { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/SystemHook.java b/src/main/java/org/gitlab4j/api/models/SystemHook.java index 88bee162d2513651da7d580ac957d988205ed5f6..81277a08889e9f45cdc6883fd9bc95b235560895 100644 --- a/src/main/java/org/gitlab4j/api/models/SystemHook.java +++ b/src/main/java/org/gitlab4j/api/models/SystemHook.java @@ -2,14 +2,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 SystemHook { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/Tag.java b/src/main/java/org/gitlab4j/api/models/Tag.java index b86ce6493ba59bbabb3ef8f06848207b862424e5..aa1a48e735f49694fede7ea91b681692d1b7ce56 100644 --- a/src/main/java/org/gitlab4j/api/models/Tag.java +++ b/src/main/java/org/gitlab4j/api/models/Tag.java @@ -1,13 +1,7 @@ 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 Tag { private Commit commit; diff --git a/src/main/java/org/gitlab4j/api/models/TimeStats.java b/src/main/java/org/gitlab4j/api/models/TimeStats.java index cc677c49e9a0decc6f8c45257a8bbb8fa090ecf6..cc3ed0c085d256d3e9aa175fddd442d3c0918329 100644 --- a/src/main/java/org/gitlab4j/api/models/TimeStats.java +++ b/src/main/java/org/gitlab4j/api/models/TimeStats.java @@ -1,13 +1,7 @@ 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 TimeStats { private Integer timeEstimate; diff --git a/src/main/java/org/gitlab4j/api/models/TreeItem.java b/src/main/java/org/gitlab4j/api/models/TreeItem.java index 21fb147314bc09f8d4bd35303d6c2f3e7d2c425f..fe18083d22c2f67ffdf66f2b28ec5e0026e1b1d0 100644 --- a/src/main/java/org/gitlab4j/api/models/TreeItem.java +++ b/src/main/java/org/gitlab4j/api/models/TreeItem.java @@ -1,13 +1,7 @@ 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 TreeItem { public enum Type { diff --git a/src/main/java/org/gitlab4j/api/models/User.java b/src/main/java/org/gitlab4j/api/models/User.java index 4124775cd5177f7f85dba74fbcb8cc2c33983503..ddddee68824625223df0db9984caf2c0cb61d377 100644 --- a/src/main/java/org/gitlab4j/api/models/User.java +++ b/src/main/java/org/gitlab4j/api/models/User.java @@ -1,10 +1,7 @@ package org.gitlab4j.api.models; -import javax.xml.bind.annotation.XmlRootElement; - import org.gitlab4j.api.utils.JacksonJson; -@XmlRootElement public class User extends AbstractUser { private String externUid; diff --git a/src/main/java/org/gitlab4j/api/models/Variable.java b/src/main/java/org/gitlab4j/api/models/Variable.java index 30dbb1baa6af1f94d9c7e009c653206dd42a342b..a602410ed1b89233642f11a7dbd7123d7818909f 100644 --- a/src/main/java/org/gitlab4j/api/models/Variable.java +++ b/src/main/java/org/gitlab4j/api/models/Variable.java @@ -1,15 +1,9 @@ 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 com.fasterxml.jackson.annotation.JsonProperty; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class Variable { private String key; diff --git a/src/main/java/org/gitlab4j/api/models/Version.java b/src/main/java/org/gitlab4j/api/models/Version.java index 46c94adb6015e48a1d36dfaac1d006678ac8f854..d27aecd93334d4f839815d45742cc41c46340c42 100644 --- a/src/main/java/org/gitlab4j/api/models/Version.java +++ b/src/main/java/org/gitlab4j/api/models/Version.java @@ -1,11 +1,5 @@ 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 Version { private String version; diff --git a/src/main/java/org/gitlab4j/api/models/WikiAttachment.java b/src/main/java/org/gitlab4j/api/models/WikiAttachment.java index b4f010b79ee01ce56dba7f0748f21b62e8c2625d..4bccb691ef2b21446a591e63667c915c7a4f313e 100644 --- a/src/main/java/org/gitlab4j/api/models/WikiAttachment.java +++ b/src/main/java/org/gitlab4j/api/models/WikiAttachment.java @@ -1,13 +1,7 @@ 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 WikiAttachment { public static class Link { diff --git a/src/main/java/org/gitlab4j/api/models/WikiPage.java b/src/main/java/org/gitlab4j/api/models/WikiPage.java index 898e7c4de08ed8bad61657de2e0ba74b90e9da0a..b274796b13d1f8d2571c121cef8a33299856301c 100644 --- a/src/main/java/org/gitlab4j/api/models/WikiPage.java +++ b/src/main/java/org/gitlab4j/api/models/WikiPage.java @@ -23,14 +23,8 @@ 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 WikiPage { private String title; diff --git a/src/main/java/org/gitlab4j/api/services/ExternalWikiService.java b/src/main/java/org/gitlab4j/api/services/ExternalWikiService.java index 24fc2a6a542b270693591e10b3e36024ee7f1779..bc72de39803f21be2e76ed0ce7f88c0d3be5be23 100644 --- a/src/main/java/org/gitlab4j/api/services/ExternalWikiService.java +++ b/src/main/java/org/gitlab4j/api/services/ExternalWikiService.java @@ -1,11 +1,5 @@ package org.gitlab4j.api.services; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class ExternalWikiService extends NotificationService { public static final String WIKIURL_KEY_PROP = "external_wiki_url"; diff --git a/src/main/java/org/gitlab4j/api/services/HipChatService.java b/src/main/java/org/gitlab4j/api/services/HipChatService.java index 66f0ebd67296a5f48b8af4f5f149b40f490a60d7..f2ce4289e709b141893d0dd3183d85021174f9b2 100644 --- a/src/main/java/org/gitlab4j/api/services/HipChatService.java +++ b/src/main/java/org/gitlab4j/api/services/HipChatService.java @@ -1,13 +1,7 @@ package org.gitlab4j.api.services; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import com.fasterxml.jackson.annotation.JsonIgnore; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class HipChatService extends NotificationService { public static final String TOKEN_PROP = "token"; diff --git a/src/main/java/org/gitlab4j/api/services/JiraService.java b/src/main/java/org/gitlab4j/api/services/JiraService.java index 53d4745658e077e1426591e5473ffadc23e942e7..de694509357ea01fa45e6dfd3f6d8ebc0634f6c2 100644 --- a/src/main/java/org/gitlab4j/api/services/JiraService.java +++ b/src/main/java/org/gitlab4j/api/services/JiraService.java @@ -2,14 +2,8 @@ package org.gitlab4j.api.services; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import com.fasterxml.jackson.annotation.JsonIgnore; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class JiraService extends NotificationService { public static final String URL_PROP = "url"; diff --git a/src/main/java/org/gitlab4j/api/services/NotificationService.java b/src/main/java/org/gitlab4j/api/services/NotificationService.java index 5c8ba32fd8d771d622e43b834e92fd171df1782b..db2bfb120ee36739394068e09ce5e6e0d6de9fe0 100644 --- a/src/main/java/org/gitlab4j/api/services/NotificationService.java +++ b/src/main/java/org/gitlab4j/api/services/NotificationService.java @@ -4,12 +4,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import com.fasterxml.jackson.annotation.JsonIgnore; -@XmlAccessorType(XmlAccessType.FIELD) public abstract class NotificationService { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/services/SlackService.java b/src/main/java/org/gitlab4j/api/services/SlackService.java index 3ce7df66f2ff1a1bc5c3bf425da5444aedbefc3c..99cfd764eecf7e658015c882d911059d3840f420 100644 --- a/src/main/java/org/gitlab4j/api/services/SlackService.java +++ b/src/main/java/org/gitlab4j/api/services/SlackService.java @@ -1,13 +1,7 @@ package org.gitlab4j.api.services; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import com.fasterxml.jackson.annotation.JsonIgnore; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class SlackService extends NotificationService { public static final String WEBHOOK_PROP = "webhook"; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java index efd96ecb74c4d28cf4e5eb948d05b7ec4b7d0797..e63a2f3b4675e67772faf2421c7cf3f4807c495a 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java @@ -2,14 +2,8 @@ package org.gitlab4j.api.systemhooks; 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 GroupMemberSystemHookEvent extends AbstractSystemHookEvent { public static final String NEW_GROUP_MEMBER_EVENT = "user_add_to_group"; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java index 83acfdc8e315deef3db9835e05f38c111ea31954..ed08fc5b7f7c33a514acb39e20bf476c9ff661bd 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java @@ -2,14 +2,8 @@ package org.gitlab4j.api.systemhooks; 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 GroupSystemHookEvent extends AbstractSystemHookEvent { public static final String GROUP_CREATE_EVENT = "group_create"; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java index f5a9146ea2f6ca4f23f8141142ca4571f22e29f3..1d3820529a64d00be71d9ff3ab7fbf42725fa4bc 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java @@ -2,14 +2,8 @@ package org.gitlab4j.api.systemhooks; 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 KeySystemHookEvent extends AbstractSystemHookEvent { public static final String KEY_CREATE_EVENT = "key_create"; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java index 0160dafe401d2fffe94d3b4d6ce1fb9c7096ee03..4dad26db3e0d4d4203ff33cf9dc2ea72019210dc 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java @@ -2,15 +2,9 @@ package org.gitlab4j.api.systemhooks; 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.models.Visibility; import org.gitlab4j.api.utils.JacksonJson; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class ProjectSystemHookEvent extends AbstractSystemHookEvent { public static final String PROJECT_CREATE_EVENT = "project_create"; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/PushSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/PushSystemHookEvent.java index 9ba1d2bc94c932cc325966c672f907a35e8a54ae..95d1bc8fcf04fbac825dcfe9c807e03c723f79cf 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/PushSystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/PushSystemHookEvent.java @@ -1,14 +1,8 @@ package org.gitlab4j.api.systemhooks; -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.webhook.AbstractPushEvent; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class PushSystemHookEvent extends AbstractPushEvent implements SystemHookEvent { public static final String PUSH_EVENT = "push"; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java b/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java index 6b80dfbf798c949efe1f5191339b76be65756af1..e44238680ded1c8710c2ddcdc87552bd2c284e4a 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java @@ -1,13 +1,7 @@ package org.gitlab4j.api.systemhooks; -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 RepositoryChange { private String after; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java index abd336d48b76e87a8ed62e3c37f9cd52c42f0142..b969d2f3b623122a753b60d26d1472d110549dd2 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java @@ -2,15 +2,9 @@ package org.gitlab4j.api.systemhooks; 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.webhook.EventProject; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class RepositorySystemHookEvent extends AbstractSystemHookEvent { public static final String REPOSITORY_UPDATE_EVENT = "repository_update"; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/SystemHookListener.java b/src/main/java/org/gitlab4j/api/systemhooks/SystemHookListener.java index cb0442a49c8e799d062d664337d9f718435f4ffb..f7da6e691187df22f1daf77ff3970713b6d60f85 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/SystemHookListener.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/SystemHookListener.java @@ -78,4 +78,12 @@ public interface SystemHookListener extends java.util.EventListener { */ default void onRepositoryEvent(RepositorySystemHookEvent event) { } + + /** + * This method is called when a System Hook merge_request event has been received. + * + * @param event the MergeRequestSystemHookEvent instance containing info on the key event + */ + default void onMergeRequestEvent(MergeRequestSystemHookEvent event) { + } } diff --git a/src/main/java/org/gitlab4j/api/systemhooks/TagPushSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/TagPushSystemHookEvent.java index b675a5bc4a819ecfd0d2044516f0625af8458c8d..7833bb7eaaff813494c64076819a7a45498ad433 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/TagPushSystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/TagPushSystemHookEvent.java @@ -1,14 +1,8 @@ package org.gitlab4j.api.systemhooks; -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.webhook.AbstractPushEvent; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class TagPushSystemHookEvent extends AbstractPushEvent implements SystemHookEvent { public static final String TAG_PUSH_EVENT = "tag_push"; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java index 153d6c6e8aee5e90c1f08c1ec926b3a2d1905898..c0080b0a0392906d1095c2781fef1ca0c3a19e45 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java @@ -2,15 +2,9 @@ package org.gitlab4j.api.systemhooks; 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.models.Visibility; import org.gitlab4j.api.utils.JacksonJson; -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { public static final String NEW_TEAM_MEMBER_EVENT = "user_add_to_team"; diff --git a/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java index 4b7bc25b8033e7a3eb4e8aabb8a4158c2d2f4e3f..8de4d4b71a1530ce87d77a0b8e0007ba07c699a2 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java @@ -2,14 +2,8 @@ package org.gitlab4j.api.systemhooks; 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 UserSystemHookEvent extends AbstractSystemHookEvent { public static final String USER_CREATE_EVENT = "user_create"; diff --git a/src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java b/src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java index bbcf1796ecc8cc8bdc549bad07c12ee9e198dc56..1743cdddc90cd66a7edfdcd242c6f896900c9146 100644 --- a/src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java @@ -2,12 +2,8 @@ package org.gitlab4j.api.webhook; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import com.fasterxml.jackson.annotation.JsonIgnore; -@XmlAccessorType(XmlAccessType.FIELD) public abstract class AbstractPushEvent { private String eventName; diff --git a/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java b/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java index 05071dff8fc2496625fc5e4aa541791f14fd96ff..00c18164c9e204cb348f65abc6cd306c1d0b83ae 100644 --- a/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java @@ -2,13 +2,9 @@ package org.gitlab4j.api.webhook; import java.util.Date; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.User; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class BuildEvent extends AbstractEvent { /** X-Gitlab-Event header value pre GitLab v9.3.0 */ diff --git a/src/main/java/org/gitlab4j/api/webhook/BuildEventCommit.java b/src/main/java/org/gitlab4j/api/webhook/BuildEventCommit.java index 7d344266cbcdc05c2c1cbaa2e30acf799c984cfd..bc0dfdad1fb1da740e01752537d0ba3dbc648405 100644 --- a/src/main/java/org/gitlab4j/api/webhook/BuildEventCommit.java +++ b/src/main/java/org/gitlab4j/api/webhook/BuildEventCommit.java @@ -2,12 +2,8 @@ package org.gitlab4j.api.webhook; import java.util.Date; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class BuildEventCommit { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/webhook/EventChanges.java b/src/main/java/org/gitlab4j/api/webhook/EventChanges.java index 67d0f3f5c9b67a9c298d5c0de99d83e9e733adbf..1f9656046064a34aa0049a2dd2c8b0509ef163e0 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventChanges.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventChanges.java @@ -3,13 +3,9 @@ package org.gitlab4j.api.webhook; import java.util.Date; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.Assignee; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class EventChanges { private ChangeContainer updatedAt; diff --git a/src/main/java/org/gitlab4j/api/webhook/EventCommit.java b/src/main/java/org/gitlab4j/api/webhook/EventCommit.java index 8e99643109c3a2f771281775dd9b65c79aa8327e..b558980e2e859ac81e5d5f6b6e5ab9d2a163ccea 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventCommit.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventCommit.java @@ -3,13 +3,9 @@ package org.gitlab4j.api.webhook; import java.util.Date; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.Author; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class EventCommit { private String id; diff --git a/src/main/java/org/gitlab4j/api/webhook/EventIssue.java b/src/main/java/org/gitlab4j/api/webhook/EventIssue.java index 00627ce3368dd016baab30953c977575fe455f62..842b49a2e732ff172e3c0c65e4d08bf599e203f2 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventIssue.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventIssue.java @@ -2,12 +2,8 @@ package org.gitlab4j.api.webhook; import java.util.Date; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class EventIssue { private Integer assigneeId; diff --git a/src/main/java/org/gitlab4j/api/webhook/EventLabel.java b/src/main/java/org/gitlab4j/api/webhook/EventLabel.java index 3e225d558ef75aadccc563332bf08dbaf2e40c71..c106983b868d6c5829510f4923402cfc3db97b71 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventLabel.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventLabel.java @@ -2,18 +2,12 @@ package org.gitlab4j.api.webhook; 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 EventLabel { public enum LabelType { diff --git a/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java b/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java index ecb997483d10d5e1b917ecdb7bf4f63a0ed142bb..6c3dcadfee484bbf7a030a546b8345d2ff698c44 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java @@ -1,14 +1,12 @@ package org.gitlab4j.api.webhook; import java.util.Date; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import java.util.Map; import org.gitlab4j.api.models.Assignee; +import org.gitlab4j.api.models.Duration; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class EventMergeRequest { private Integer assigneeId; @@ -42,6 +40,25 @@ public class EventMergeRequest { private String action; private Assignee assignee; + private Integer updatedById; + private String mergeError; + private Map mergeParams; + private Boolean mergeWhenPipelineSucceeds; + private Integer mergeUserId; + private Date deletedAt; + private String inProgressMergeCommitSha; + private Integer lockVersion; + + private Date last_editedAt; + private Integer lastEditedById; + private Integer headPipelineId; + private Boolean refFetched; + private Integer mergeIid; + private Integer totalTimeSpent; + private Duration humanTotalTimeSpent; + private Integer timeEstimate; + private Duration humanTimeEstimate; + public Integer getAssigneeId() { return this.assigneeId; } @@ -274,6 +291,142 @@ public class EventMergeRequest { this.assignee = assignee; } + public Integer getUpdatedById() { + return updatedById; + } + + public void setUpdatedById(Integer updatedById) { + this.updatedById = updatedById; + } + + public String getMergeError() { + return mergeError; + } + + public void setMergeError(String mergeError) { + this.mergeError = mergeError; + } + + public Map getMergeParams() { + return mergeParams; + } + + public void setMergeParams(Map mergeParams) { + this.mergeParams = mergeParams; + } + + public Boolean getMergeWhenPipelineSucceeds() { + return mergeWhenPipelineSucceeds; + } + + public void setMergeWhenPipelineSucceeds(Boolean mergeWhenPipelineSucceeds) { + this.mergeWhenPipelineSucceeds = mergeWhenPipelineSucceeds; + } + + public Integer getMergeUserId() { + return mergeUserId; + } + + public void setMergeUserId(Integer mergeUserId) { + this.mergeUserId = mergeUserId; + } + + public Date getDeletedAt() { + return deletedAt; + } + + public void setDeletedAt(Date deletedAt) { + this.deletedAt = deletedAt; + } + + public String getInProgressMergeCommitSha() { + return inProgressMergeCommitSha; + } + + public void setInProgressMergeCommitSha(String inProgressMergeCommitSha) { + this.inProgressMergeCommitSha = inProgressMergeCommitSha; + } + + public Integer getLockVersion() { + return lockVersion; + } + + public void setLockVersion(Integer lockVersion) { + this.lockVersion = lockVersion; + } + + public Date getLast_editedAt() { + return last_editedAt; + } + + public void setLast_editedAt(Date last_editedAt) { + this.last_editedAt = last_editedAt; + } + + public Integer getLastEditedById() { + return lastEditedById; + } + + public void setLastEditedById(Integer lastEditedById) { + this.lastEditedById = lastEditedById; + } + + public Integer getHeadPipelineId() { + return headPipelineId; + } + + public void setHeadPipelineId(Integer headPipelineId) { + this.headPipelineId = headPipelineId; + } + + public Boolean getRefFetched() { + return refFetched; + } + + public void setRefFetched(Boolean refFetched) { + this.refFetched = refFetched; + } + + public Integer getMergeIid() { + return mergeIid; + } + + public void setMergeIid(Integer mergeIid) { + this.mergeIid = mergeIid; + } + + public Integer getTotalTimeSpent() { + return totalTimeSpent; + } + + public void setTotalTimeSpent(Integer totalTimeSpent) { + this.totalTimeSpent = totalTimeSpent; + } + + public Duration getHumanTotalTimeSpent() { + return humanTotalTimeSpent; + } + + public void setHumanTotalTimeSpent(Duration humanTotalTimeSpent) { + this.humanTotalTimeSpent = humanTotalTimeSpent; + } + + public Integer getTimeEstimate() { + return timeEstimate; + } + + public void setTimeEstimate(Integer timeEstimate) { + this.timeEstimate = timeEstimate; + } + + public Duration getHumanTimeEstimate() { + return humanTimeEstimate; + } + + public void setHumanTimeEstimate(Duration humanTimeEstimate) { + this.humanTimeEstimate = humanTimeEstimate; + } + @Override public String toString() { return (JacksonJson.toJsonString(this)); diff --git a/src/main/java/org/gitlab4j/api/webhook/EventProject.java b/src/main/java/org/gitlab4j/api/webhook/EventProject.java index 2f97b54cc7bb35e6c5a6532e8f687efa88ff56f8..4ddeed207a49dac5d96acbe7ee9fe037c99a6ece 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventProject.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventProject.java @@ -1,12 +1,8 @@ package org.gitlab4j.api.webhook; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class EventProject { private Integer id; @@ -20,6 +16,7 @@ public class EventProject { private AccessLevel visibilityLevel; private String pathWithNamespace; private String defaultBranch; + private String ciConfigPath; private String homepage; private String url; private String sshUrl; @@ -113,6 +110,14 @@ public class EventProject { this.defaultBranch = defaultBranch; } + public String getCiConfigPath() { + return ciConfigPath; + } + + public void setCiConfigPath(String ciConfigPath) { + this.ciConfigPath = ciConfigPath; + } + public String getHomepage() { return homepage; } diff --git a/src/main/java/org/gitlab4j/api/webhook/EventRepository.java b/src/main/java/org/gitlab4j/api/webhook/EventRepository.java index a5696de2719694d610e18a9e0225acfbdd7917e6..a87efa96d42bda4583a3fd1c2755f18d6b50a5d1 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventRepository.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventRepository.java @@ -1,12 +1,8 @@ package org.gitlab4j.api.webhook; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class EventRepository { private String name; diff --git a/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java b/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java index 141a7936fb9bce806a9a86298d004a3900a21f4d..ed4e80d5823e20818b6bcadf2b48c2cae16c646b 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventSnippet.java @@ -2,13 +2,9 @@ package org.gitlab4j.api.webhook; import java.util.Date; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.AccessLevel; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class EventSnippet { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java b/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java index 4e729a1b613f9d2d31ec2520e2dbaaa2ee37397d..22f972b15f4220ceccff0eec9f6a2037e67aa357 100644 --- a/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/IssueEvent.java @@ -2,14 +2,10 @@ package org.gitlab4j.api.webhook; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.Assignee; import org.gitlab4j.api.models.User; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class IssueEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Issue Hook"; diff --git a/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java b/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java index 4c1704a6fa9675169c31c575830850d4d3cba3ac..235a1fe2cf2c52d2a650bbce00e38d675a2af14c 100644 --- a/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java @@ -2,13 +2,9 @@ package org.gitlab4j.api.webhook; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.User; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class MergeRequestEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Merge Request Hook"; @@ -78,7 +74,6 @@ public class MergeRequestEvent extends AbstractEvent { this.changes = changes; } - @XmlAccessorType(XmlAccessType.FIELD) public static class ObjectAttributes extends EventMergeRequest { } diff --git a/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java b/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java index b13eed11655834c3d4d1af29cf856aadf3736749..4714425b6f007535236daabb1c2650de36bf4e05 100644 --- a/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/NoteEvent.java @@ -2,9 +2,6 @@ package org.gitlab4j.api.webhook; import java.util.Date; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.Diff; import org.gitlab4j.api.models.User; import org.gitlab4j.api.utils.JacksonJson; @@ -13,7 +10,6 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -@XmlAccessorType(XmlAccessType.FIELD) public class NoteEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Note Hook"; @@ -131,7 +127,6 @@ public class NoteEvent extends AbstractEvent { } } - @XmlAccessorType(XmlAccessType.FIELD) public static class ObjectAttributes { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java b/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java index 9d0febf44f80ec755b9b4cc6842c4da454067f2b..77a914c55dff6e5a14d97c2c95b8e24b1a4d0ee2 100644 --- a/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java @@ -3,14 +3,10 @@ package org.gitlab4j.api.webhook; import java.util.Date; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.ArtifactsFile; import org.gitlab4j.api.models.User; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class PipelineEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Pipeline Hook"; @@ -71,7 +67,6 @@ public class PipelineEvent extends AbstractEvent { this.builds = builds; } - @XmlAccessorType(XmlAccessType.FIELD) public static class Build { private Integer id; @@ -175,7 +170,6 @@ public class PipelineEvent extends AbstractEvent { } } - @XmlAccessorType(XmlAccessType.FIELD) public static class ObjectAttributes { private Integer id; diff --git a/src/main/java/org/gitlab4j/api/webhook/PushEvent.java b/src/main/java/org/gitlab4j/api/webhook/PushEvent.java index 5a0e857405fbe2b3d402af5da0b67def39641cd2..c81f19b64fdbd9478a5f439fc432d05911c13f27 100644 --- a/src/main/java/org/gitlab4j/api/webhook/PushEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/PushEvent.java @@ -1,12 +1,8 @@ package org.gitlab4j.api.webhook; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class PushEvent extends AbstractPushEvent implements Event { public static final String X_GITLAB_EVENT = "Push Hook"; diff --git a/src/main/java/org/gitlab4j/api/webhook/TagPushEvent.java b/src/main/java/org/gitlab4j/api/webhook/TagPushEvent.java index ae9ada4b10aed0dd96caf6649c70af79f439d087..b4f7f6ab69f5ba6bf4b56ce5b7039c382de8afe9 100644 --- a/src/main/java/org/gitlab4j/api/webhook/TagPushEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/TagPushEvent.java @@ -1,12 +1,8 @@ package org.gitlab4j.api.webhook; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class TagPushEvent extends AbstractPushEvent implements Event { public static final String X_GITLAB_EVENT = "Tag Push Hook"; diff --git a/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java b/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java index e5e0536a9194bd6ee98410619ec633e80b799719..7980c0529c0d6a061477d706358131bbd5719517 100644 --- a/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java @@ -1,12 +1,8 @@ package org.gitlab4j.api.webhook; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; - import org.gitlab4j.api.models.User; import org.gitlab4j.api.utils.JacksonJson; -@XmlAccessorType(XmlAccessType.FIELD) public class WikiPageEvent extends AbstractEvent { public static final String X_GITLAB_EVENT = "Wiki Page Hook"; @@ -58,7 +54,6 @@ public class WikiPageEvent extends AbstractEvent { this.objectAttributes = objectAttributes; } - @XmlAccessorType(XmlAccessType.FIELD) public static class Wiki { private String webUrl; @@ -108,7 +103,6 @@ public class WikiPageEvent extends AbstractEvent { } } - @XmlAccessorType(XmlAccessType.FIELD) public static class ObjectAttributes { private String title;