From 45ff580c7ddafb6300fc3d413e7289f9758213ca Mon Sep 17 00:00:00 2001 From: Greg Messner Date: Tue, 16 Apr 2019 22:54:37 -0700 Subject: [PATCH] Removed use of JAXB (#327). --- pom.xml | 12 -- .../org/gitlab4j/api/MergeRequestApi.java | 5 +- .../org/gitlab4j/api/models/AbstractUser.java | 4 - .../org/gitlab4j/api/models/Artifact.java | 6 - .../gitlab4j/api/models/ArtifactsFile.java | 6 - .../org/gitlab4j/api/models/Assignee.java | 3 - .../java/org/gitlab4j/api/models/Author.java | 3 - .../org/gitlab4j/api/models/AwardEmoji.java | 6 - .../java/org/gitlab4j/api/models/Board.java | 6 - .../org/gitlab4j/api/models/BoardList.java | 6 - .../java/org/gitlab4j/api/models/Branch.java | 6 - .../api/models/BranchAccessLevel.java | 6 - .../java/org/gitlab4j/api/models/Comment.java | 6 - .../java/org/gitlab4j/api/models/Commit.java | 6 - .../org/gitlab4j/api/models/CommitRef.java | 9 - .../org/gitlab4j/api/models/CommitStats.java | 4 - .../org/gitlab4j/api/models/CommitStatus.java | 6 - .../gitlab4j/api/models/CompareResults.java | 6 - .../org/gitlab4j/api/models/Contributor.java | 3 - .../gitlab4j/api/models/CustomAttribute.java | 4 - .../org/gitlab4j/api/models/DeployKey.java | 6 - .../java/org/gitlab4j/api/models/Diff.java | 6 - .../org/gitlab4j/api/models/Discussion.java | 6 - .../java/org/gitlab4j/api/models/Epic.java | 6 - .../org/gitlab4j/api/models/EpicIssue.java | 4 - .../java/org/gitlab4j/api/models/Event.java | 6 - .../org/gitlab4j/api/models/EventData.java | 6 - .../org/gitlab4j/api/models/FileUpload.java | 6 - .../java/org/gitlab4j/api/models/Group.java | 6 - .../gitlab4j/api/models/HealthCheckInfo.java | 6 - .../gitlab4j/api/models/HealthCheckItem.java | 4 - .../org/gitlab4j/api/models/Identity.java | 4 - .../api/models/ImpersonationToken.java | 4 - .../java/org/gitlab4j/api/models/Issue.java | 6 - .../java/org/gitlab4j/api/models/Job.java | 6 - .../java/org/gitlab4j/api/models/Key.java | 6 - .../java/org/gitlab4j/api/models/Label.java | 6 - .../gitlab4j/api/models/LicenseTemplate.java | 6 - .../org/gitlab4j/api/models/Markdown.java | 6 - .../java/org/gitlab4j/api/models/Member.java | 6 - .../org/gitlab4j/api/models/MergeRequest.java | 6 - .../org/gitlab4j/api/models/Milestone.java | 6 - .../org/gitlab4j/api/models/Namespace.java | 6 - .../java/org/gitlab4j/api/models/Note.java | 6 - .../api/models/NotificationSettings.java | 6 - .../api/models/OauthTokenResponse.java | 6 - .../java/org/gitlab4j/api/models/Owner.java | 6 - .../java/org/gitlab4j/api/models/Package.java | 3 - .../org/gitlab4j/api/models/Participant.java | 3 - .../org/gitlab4j/api/models/Permissions.java | 6 - .../org/gitlab4j/api/models/Pipeline.java | 6 - .../gitlab4j/api/models/PipelineSchedule.java | 9 +- .../org/gitlab4j/api/models/Position.java | 6 - .../java/org/gitlab4j/api/models/Project.java | 6 - .../gitlab4j/api/models/ProjectAccess.java | 4 - .../org/gitlab4j/api/models/ProjectHook.java | 6 - .../api/models/ProjectSharedGroup.java | 4 - .../api/models/ProjectStatistics.java | 4 - .../org/gitlab4j/api/models/ProjectUser.java | 6 - .../gitlab4j/api/models/ProtectedBranch.java | 6 - .../org/gitlab4j/api/models/PushData.java | 6 - .../org/gitlab4j/api/models/PushRules.java | 6 - .../java/org/gitlab4j/api/models/Release.java | 6 - .../org/gitlab4j/api/models/Repository.java | 6 - .../gitlab4j/api/models/RepositoryFile.java | 6 - .../java/org/gitlab4j/api/models/Runner.java | 6 - .../org/gitlab4j/api/models/RunnerDetail.java | 6 - .../java/org/gitlab4j/api/models/Session.java | 6 - .../java/org/gitlab4j/api/models/Snippet.java | 6 - .../java/org/gitlab4j/api/models/SshKey.java | 4 - .../org/gitlab4j/api/models/SystemHook.java | 6 - .../java/org/gitlab4j/api/models/Tag.java | 6 - .../org/gitlab4j/api/models/TimeStats.java | 6 - .../org/gitlab4j/api/models/TreeItem.java | 6 - .../java/org/gitlab4j/api/models/User.java | 3 - .../org/gitlab4j/api/models/Variable.java | 6 - .../java/org/gitlab4j/api/models/Version.java | 6 - .../gitlab4j/api/models/WikiAttachment.java | 6 - .../org/gitlab4j/api/models/WikiPage.java | 6 - .../api/services/ExternalWikiService.java | 6 - .../gitlab4j/api/services/HipChatService.java | 6 - .../gitlab4j/api/services/JiraService.java | 6 - .../api/services/NotificationService.java | 4 - .../gitlab4j/api/services/SlackService.java | 6 - .../GroupMemberSystemHookEvent.java | 6 - .../api/systemhooks/GroupSystemHookEvent.java | 6 - .../api/systemhooks/KeySystemHookEvent.java | 6 - .../systemhooks/ProjectSystemHookEvent.java | 6 - .../api/systemhooks/PushSystemHookEvent.java | 6 - .../api/systemhooks/RepositoryChange.java | 6 - .../RepositorySystemHookEvent.java | 6 - .../api/systemhooks/SystemHookListener.java | 8 + .../systemhooks/TagPushSystemHookEvent.java | 6 - .../TeamMemberSystemHookEvent.java | 6 - .../api/systemhooks/UserSystemHookEvent.java | 6 - .../api/webhook/AbstractPushEvent.java | 4 - .../org/gitlab4j/api/webhook/BuildEvent.java | 4 - .../api/webhook/BuildEventCommit.java | 4 - .../gitlab4j/api/webhook/EventChanges.java | 4 - .../org/gitlab4j/api/webhook/EventCommit.java | 4 - .../org/gitlab4j/api/webhook/EventIssue.java | 4 - .../org/gitlab4j/api/webhook/EventLabel.java | 6 - .../api/webhook/EventMergeRequest.java | 161 +++++++++++++++++- .../gitlab4j/api/webhook/EventProject.java | 13 +- .../gitlab4j/api/webhook/EventRepository.java | 4 - .../gitlab4j/api/webhook/EventSnippet.java | 4 - .../org/gitlab4j/api/webhook/IssueEvent.java | 4 - .../api/webhook/MergeRequestEvent.java | 5 - .../org/gitlab4j/api/webhook/NoteEvent.java | 5 - .../gitlab4j/api/webhook/PipelineEvent.java | 6 - .../org/gitlab4j/api/webhook/PushEvent.java | 4 - .../gitlab4j/api/webhook/TagPushEvent.java | 4 - .../gitlab4j/api/webhook/WikiPageEvent.java | 6 - 113 files changed, 178 insertions(+), 609 deletions(-) diff --git a/pom.xml b/pom.xml index 59fc7aec..a2eec28b 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 c605111f..70ccda8c 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 cacb79ee..df7e5905 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 bee2a16a..2395f4ba 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 2567931d..6faa52af 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 4163ad24..6f3d8527 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 679c5b17..b7735c25 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 662213bb..c4cda2c0 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 e318113b..28544e44 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 38936233..b8f81121 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 7c3b4938..f8809250 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 ddc48132..36efe29a 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 80279b01..7eaf60b3 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 233911fd..3b3be3ed 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 75a6e33c..39415594 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 25bcb224..d43bc626 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 6f2983b1..9596f1cb 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 0ed8b22a..ffb09019 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 44272c64..17697594 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 c84e4b63..6b965ae6 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 c593ff1c..f33ea8de 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 35a91cfc..9abeae4c 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 97d4b224..d15204e8 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 2964c293..4b226f49 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 b154e778..db4d9922 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 ee14d839..dc9e3a28 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 3f129528..1ba98a98 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 195316be..ba042dd5 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 8d59711b..33ec5ca8 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 ca65d287..a757937d 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 44b6076c..7d9261cd 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 4e04f264..6ea3450b 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 1fa3c385..d0032a20 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 90d50e32..b1cc6881 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 6aebee81..11c16594 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 8f3bb5fd..20b500b6 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 2dcb66b8..103f3018 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 10531aab..dc0f8d56 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 4a0d6af8..09c35cbe 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 8c8440f0..b036a7ff 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 19c7804b..49710b2c 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 6db0cfce..5b289094 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 3db65aaf..6afa3265 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 7db47c61..cf06348b 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 eedd5075..f51e1026 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 c0f4396a..3b30e0c8 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 97e651de..5dadf6f4 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 f5fe9c15..ae3497cc 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 1c78d6cf..83ac5b52 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 eb22c69e..cbc56130 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 1e6c302f..bae7b3e2 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 354576e1..c9cd3853 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 0e98269e..fe7e90ea 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 8dcf39c8..56c56651 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 58cd3c5d..3d35183b 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 c0887f56..cc23bc91 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 9558640e..b4d10dd4 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 dfaa058c..df5dd82f 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 142d547b..23ccf9ed 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 534af620..ec067242 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 11a7d480..8d420c76 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 7e573087..c2c0b6e8 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 ecb56b28..b41d688b 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 9fa08f4c..5265b99e 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 3137769a..daafdbaa 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 0d5ee531..04d855e1 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 35562638..4d378549 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 1bcb2105..74da9b38 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 bc0ca53b..18a30158 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 24235e49..62f2e2a8 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 88bee162..81277a08 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 b86ce649..aa1a48e7 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 cc677c49..cc3ed0c0 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 21fb1473..fe18083d 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 4124775c..ddddee68 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 30dbb1ba..a602410e 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 46c94adb..d27aecd9 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 b4f010b7..4bccb691 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 898e7c4d..b274796b 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 24fc2a6a..bc72de39 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 66f0ebd6..f2ce4289 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 53d47456..de694509 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 5c8ba32f..db2bfb12 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 3ce7df66..99cfd764 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 efd96ecb..e63a2f3b 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 83acfdc8..ed08fc5b 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 f5a9146e..1d382052 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 0160dafe..4dad26db 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 9ba1d2bc..95d1bc8f 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 6b80dfbf..e4423868 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 abd336d4..b969d2f3 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 cb0442a4..f7da6e69 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 b675a5bc..7833bb7e 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 153d6c6e..c0080b0a 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 4b7bc25b..8de4d4b7 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 bbcf1796..1743cddd 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 05071dff..00c18164 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 7d344266..bc0dfdad 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 67d0f3f5..1f965604 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 8e996431..b558980e 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 00627ce3..842b49a2 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 3e225d55..c106983b 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 ecb99748..6c3dcadf 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 2f97b54c..4ddeed20 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 a5696de2..a87efa96 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 141a7936..ed4e80d5 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 4e729a1b..22f972b1 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 4c1704a6..235a1fe2 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 b13eed11..4714425b 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 9d0febf4..77a914c5 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 5a0e8574..c81f19b6 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 ae9ada4b..b4f7f6ab 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 e5e0536a..7980c052 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; -- GitLab