From ad6d8d4ff784fef4b9e3031cf34025fa29f3a29c Mon Sep 17 00:00:00 2001 From: nilchina Date: Thu, 21 Dec 2023 20:36:30 +0800 Subject: [PATCH] Add implements Serializable to all model classes to support native image (GraalVM) (#1074) --------- Co-authored-by: Jeremie Bresson --- .../org/gitlab4j/api/GitLabApiException.java | 2 +- .../org/gitlab4j/api/models/AbstractEpic.java | 19 ++-- .../gitlab4j/api/models/AbstractGroup.java | 6 +- .../gitlab4j/api/models/AbstractIssue.java | 18 ++-- .../api/models/AbstractMinimalEpic.java | 5 +- .../org/gitlab4j/api/models/AbstractUser.java | 9 +- .../api/models/AcceptMergeRequestParams.java | 5 +- .../gitlab4j/api/models/AccessRequest.java | 1 + .../org/gitlab4j/api/models/AllowedTo.java | 5 +- .../org/gitlab4j/api/models/Application.java | 5 +- .../api/models/ApplicationSettings.java | 4 +- .../org/gitlab4j/api/models/ApprovalRule.java | 4 +- .../api/models/ApprovalRuleParams.java | 6 +- .../gitlab4j/api/models/ApprovalState.java | 8 +- .../org/gitlab4j/api/models/ApprovedBy.java | 6 +- .../org/gitlab4j/api/models/Artifact.java | 8 +- .../gitlab4j/api/models/ArtifactsFile.java | 5 +- .../java/org/gitlab4j/api/models/Assets.java | 14 +-- .../org/gitlab4j/api/models/Assignee.java | 1 + .../org/gitlab4j/api/models/AuditEvent.java | 8 +- .../gitlab4j/api/models/AuditEventDetail.java | 5 +- .../java/org/gitlab4j/api/models/Author.java | 1 + .../org/gitlab4j/api/models/AwardEmoji.java | 11 +-- .../java/org/gitlab4j/api/models/Badge.java | 8 +- .../java/org/gitlab4j/api/models/Blame.java | 8 +- .../java/org/gitlab4j/api/models/Board.java | 8 +- .../org/gitlab4j/api/models/BoardList.java | 5 +- .../java/org/gitlab4j/api/models/Branch.java | 5 +- .../api/models/BranchAccessLevel.java | 5 +- .../java/org/gitlab4j/api/models/Bridge.java | 5 +- .../gitlab4j/api/models/ChangelogPayload.java | 4 +- .../java/org/gitlab4j/api/models/Changes.java | 8 +- .../org/gitlab4j/api/models/ChildEpic.java | 1 + .../java/org/gitlab4j/api/models/Comment.java | 8 +- .../java/org/gitlab4j/api/models/Commit.java | 8 +- .../org/gitlab4j/api/models/CommitAction.java | 15 ++-- .../gitlab4j/api/models/CommitPayload.java | 8 +- .../org/gitlab4j/api/models/CommitRef.java | 8 +- .../org/gitlab4j/api/models/CommitStats.java | 5 +- .../org/gitlab4j/api/models/CommitStatus.java | 8 +- .../api/models/CommitStatusFilter.java | 14 +-- .../gitlab4j/api/models/CompareResults.java | 8 +- .../org/gitlab4j/api/models/Contributor.java | 5 +- .../gitlab4j/api/models/CreatedChildEpic.java | 1 + .../gitlab4j/api/models/CustomAttribute.java | 6 +- .../org/gitlab4j/api/models/DeployKey.java | 12 +-- .../org/gitlab4j/api/models/DeployToken.java | 4 +- .../org/gitlab4j/api/models/Deployable.java | 10 ++- .../org/gitlab4j/api/models/Deployment.java | 8 +- .../gitlab4j/api/models/DeploymentFilter.java | 6 +- .../gitlab4j/api/models/DetailedStatus.java | 5 +- .../java/org/gitlab4j/api/models/Diff.java | 12 +-- .../java/org/gitlab4j/api/models/DiffRef.java | 6 +- .../org/gitlab4j/api/models/Discussion.java | 8 +- .../api/models/DownstreamPipeline.java | 5 +- .../org/gitlab4j/api/models/Duration.java | 8 +- .../java/org/gitlab4j/api/models/Email.java | 5 +- .../org/gitlab4j/api/models/Environment.java | 8 +- .../java/org/gitlab4j/api/models/Epic.java | 5 +- .../org/gitlab4j/api/models/EpicFilter.java | 18 ++-- .../org/gitlab4j/api/models/EpicInLink.java | 1 + .../gitlab4j/api/models/EpicIssueLink.java | 5 +- .../java/org/gitlab4j/api/models/Event.java | 8 +- .../org/gitlab4j/api/models/EventData.java | 8 +- .../org/gitlab4j/api/models/ExportStatus.java | 15 ++-- .../api/models/ExternalStatusCheck.java | 4 +- .../ExternalStatusCheckProtectedBranch.java | 4 +- .../api/models/ExternalStatusCheckResult.java | 5 +- .../api/models/ExternalStatusCheckStatus.java | 7 +- .../org/gitlab4j/api/models/FileUpload.java | 5 +- .../gitlab4j/api/models/GitLabCiTemplate.java | 5 +- .../api/models/GitLabCiTemplateElement.java | 5 +- .../org/gitlab4j/api/models/GpgSignature.java | 5 +- .../java/org/gitlab4j/api/models/Group.java | 1 + .../gitlab4j/api/models/GroupAccessToken.java | 2 + .../org/gitlab4j/api/models/GroupFilter.java | 10 ++- .../org/gitlab4j/api/models/GroupParams.java | 5 +- .../api/models/GroupProjectsFilter.java | 13 +-- .../gitlab4j/api/models/HealthCheckInfo.java | 4 +- .../gitlab4j/api/models/HealthCheckItem.java | 5 +- .../org/gitlab4j/api/models/Identity.java | 5 +- .../api/models/ImpersonationToken.java | 4 +- .../org/gitlab4j/api/models/ImportStatus.java | 4 +- .../java/org/gitlab4j/api/models/Issue.java | 1 + .../org/gitlab4j/api/models/IssueEvent.java | 6 +- .../org/gitlab4j/api/models/IssueFilter.java | 9 +- .../org/gitlab4j/api/models/IssueLink.java | 5 +- .../gitlab4j/api/models/IssuesStatistics.java | 13 ++- .../api/models/IssuesStatisticsFilter.java | 4 +- .../org/gitlab4j/api/models/Iteration.java | 12 +-- .../gitlab4j/api/models/IterationFilter.java | 4 +- .../java/org/gitlab4j/api/models/Job.java | 8 +- .../org/gitlab4j/api/models/JobAttribute.java | 7 +- .../gitlab4j/api/models/JobAttributes.java | 9 +- .../java/org/gitlab4j/api/models/Key.java | 8 +- .../java/org/gitlab4j/api/models/Label.java | 6 +- .../org/gitlab4j/api/models/LabelEvent.java | 8 +- .../gitlab4j/api/models/LdapGroupLink.java | 5 +- .../java/org/gitlab4j/api/models/License.java | 8 +- .../gitlab4j/api/models/LicenseTemplate.java | 4 +- .../java/org/gitlab4j/api/models/Link.java | 6 +- .../org/gitlab4j/api/models/Markdown.java | 5 +- .../gitlab4j/api/models/MarkdownRequest.java | 6 +- .../java/org/gitlab4j/api/models/Member.java | 5 +- .../org/gitlab4j/api/models/Membership.java | 5 +- .../org/gitlab4j/api/models/MergeRequest.java | 13 +-- .../gitlab4j/api/models/MergeRequestDiff.java | 1 + .../api/models/MergeRequestFilter.java | 4 +- .../api/models/MergeRequestParams.java | 4 +- .../api/models/MergeRequestVersion.java | 4 +- .../org/gitlab4j/api/models/Metadata.java | 5 +- .../org/gitlab4j/api/models/Milestone.java | 9 +- .../org/gitlab4j/api/models/Namespace.java | 5 +- .../java/org/gitlab4j/api/models/Note.java | 11 +-- .../api/models/NotificationSettings.java | 13 +-- .../api/models/OauthTokenResponse.java | 5 +- .../java/org/gitlab4j/api/models/Owner.java | 1 + .../java/org/gitlab4j/api/models/Package.java | 10 ++- .../org/gitlab4j/api/models/PackageFile.java | 4 +- .../gitlab4j/api/models/PackageFilter.java | 7 +- .../org/gitlab4j/api/models/Participant.java | 3 +- .../org/gitlab4j/api/models/Permissions.java | 5 +- .../org/gitlab4j/api/models/Pipeline.java | 4 +- .../gitlab4j/api/models/PipelineFilter.java | 13 +-- .../gitlab4j/api/models/PipelineSchedule.java | 4 +- .../org/gitlab4j/api/models/Position.java | 8 +- .../java/org/gitlab4j/api/models/Project.java | 15 ++-- .../gitlab4j/api/models/ProjectAccess.java | 5 +- .../api/models/ProjectAccessToken.java | 5 +- .../api/models/ProjectApprovalsConfig.java | 5 +- .../gitlab4j/api/models/ProjectFetches.java | 16 ++-- .../gitlab4j/api/models/ProjectFilter.java | 10 ++- .../org/gitlab4j/api/models/ProjectGroup.java | 1 + .../api/models/ProjectGroupsFilter.java | 4 +- .../org/gitlab4j/api/models/ProjectHook.java | 8 +- .../api/models/ProjectStatistics.java | 5 +- .../org/gitlab4j/api/models/ProjectUser.java | 1 + .../gitlab4j/api/models/ProtectedBranch.java | 4 +- .../org/gitlab4j/api/models/ProtectedTag.java | 11 ++- .../org/gitlab4j/api/models/PushRules.java | 8 +- .../org/gitlab4j/api/models/References.java | 5 +- .../api/models/RegistryRepository.java | 4 +- .../api/models/RegistryRepositoryTag.java | 5 +- .../org/gitlab4j/api/models/RelatedEpic.java | 5 +- .../gitlab4j/api/models/RelatedEpicLink.java | 4 +- .../java/org/gitlab4j/api/models/Release.java | 13 +-- .../gitlab4j/api/models/ReleaseParams.java | 8 +- .../org/gitlab4j/api/models/RemoteMirror.java | 8 +- .../org/gitlab4j/api/models/Repository.java | 5 +- .../gitlab4j/api/models/RepositoryFile.java | 11 +-- .../org/gitlab4j/api/models/Reviewer.java | 1 + .../java/org/gitlab4j/api/models/Runner.java | 8 +- .../org/gitlab4j/api/models/RunnerDetail.java | 10 +-- .../gitlab4j/api/models/SamlGroupLink.java | 5 +- .../org/gitlab4j/api/models/SearchBlob.java | 5 +- .../org/gitlab4j/api/models/SharedGroup.java | 9 +- .../java/org/gitlab4j/api/models/Snippet.java | 8 +- .../java/org/gitlab4j/api/models/SshKey.java | 9 +- .../org/gitlab4j/api/models/SystemHook.java | 8 +- .../java/org/gitlab4j/api/models/Tag.java | 5 +- .../api/models/TaskCompletionStatus.java | 5 +- .../org/gitlab4j/api/models/TimeStats.java | 5 +- .../java/org/gitlab4j/api/models/Todo.java | 19 ++-- .../java/org/gitlab4j/api/models/Topic.java | 5 +- .../org/gitlab4j/api/models/TopicParams.java | 4 +- .../org/gitlab4j/api/models/TreeItem.java | 5 +- .../java/org/gitlab4j/api/models/Trigger.java | 4 +- .../java/org/gitlab4j/api/models/User.java | 5 +- .../org/gitlab4j/api/models/Variable.java | 17 ++-- .../java/org/gitlab4j/api/models/Version.java | 5 +- .../gitlab4j/api/models/WikiAttachment.java | 14 +-- .../org/gitlab4j/api/models/WikiPage.java | 5 +- .../api/services/NotificationService.java | 4 +- .../gitlab4j/api/services/SlackService.java | 3 +- .../api/webhook/ExternalStatusCheckEvent.java | 4 +- src/test/java/org/gitlab4j/api/JsonUtils.java | 87 ++++++++++++++++++- 176 files changed, 861 insertions(+), 398 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/GitLabApiException.java b/src/main/java/org/gitlab4j/api/GitLabApiException.java index b8faeff7..084ebb44 100755 --- a/src/main/java/org/gitlab4j/api/GitLabApiException.java +++ b/src/main/java/org/gitlab4j/api/GitLabApiException.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.JsonNode; * with a GitLab API endpoint. */ public class GitLabApiException extends Exception { - private static final long serialVersionUID = 1L; + private StatusType statusInfo; private int httpStatus; private String message; diff --git a/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index b531f2c2..61ff3dec 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -1,20 +1,21 @@ package org.gitlab4j.api.models; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import org.gitlab4j.api.utils.JacksonJson; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import org.gitlab4j.api.utils.JacksonJson; +import org.gitlab4j.api.utils.JacksonJsonEnumHelper; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import java.util.Map; -public class AbstractEpic> extends AbstractMinimalEpic { +public class AbstractEpic> extends AbstractMinimalEpic implements Serializable { + private static final long serialVersionUID = 1L; - public enum EpicState { + public enum EpicState { OPENED, CLOSED, ALL; private static JacksonJsonEnumHelper enumHelper = new JacksonJsonEnumHelper<>(EpicState.class); diff --git a/src/main/java/org/gitlab4j/api/models/AbstractGroup.java b/src/main/java/org/gitlab4j/api/models/AbstractGroup.java index ac990e89..c4def6fb 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractGroup.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractGroup.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.gitlab4j.api.utils.JacksonJson; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import java.io.Serializable; @JsonIgnoreProperties(ignoreUnknown = true) -public abstract class AbstractGroup> { +public abstract class AbstractGroup> implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index d618b21d..ab096d03 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -1,22 +1,24 @@ package org.gitlab4j.api.models; -import java.util.Date; -import java.util.List; - -import org.gitlab4j.api.Constants.IssueState; -import org.gitlab4j.api.utils.JacksonJson; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.LongNode; import com.fasterxml.jackson.databind.node.TextNode; import com.fasterxml.jackson.databind.node.ValueNode; +import org.gitlab4j.api.Constants.IssueState; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; -public abstract class AbstractIssue { +public abstract class AbstractIssue implements Serializable { + private static final long serialVersionUID = 1L; - public static class TaskCompletionStatus { + public static class TaskCompletionStatus implements Serializable { + private static final long serialVersionUID = 1L; private Integer count; private Integer completedCount; diff --git a/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java b/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java index a65634a8..8861058a 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class AbstractMinimalEpic> { +import java.io.Serializable; + +public class AbstractMinimalEpic> implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Long iid; diff --git a/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/src/main/java/org/gitlab4j/api/models/AbstractUser.java index 8b10d23b..f4d72b18 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -1,13 +1,14 @@ package org.gitlab4j.api.models; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.gitlab4j.api.utils.JacksonJson; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import java.io.Serializable; +import java.util.Date; @JsonIgnoreProperties(ignoreUnknown = true) -public abstract class AbstractUser> { +public abstract class AbstractUser> implements Serializable { + private static final long serialVersionUID = 1L; private String avatarUrl; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java b/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java index c37dc766..d2f5ae16 100644 --- a/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java +++ b/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.GitLabApiForm; -public class AcceptMergeRequestParams { +import java.io.Serializable; + +public class AcceptMergeRequestParams implements Serializable { + private static final long serialVersionUID = 1L; private String mergeCommitMessage; private Boolean mergeWhenPipelineSucceeds; diff --git a/src/main/java/org/gitlab4j/api/models/AccessRequest.java b/src/main/java/org/gitlab4j/api/models/AccessRequest.java index cc923fb1..6167e2fb 100644 --- a/src/main/java/org/gitlab4j/api/models/AccessRequest.java +++ b/src/main/java/org/gitlab4j/api/models/AccessRequest.java @@ -3,6 +3,7 @@ package org.gitlab4j.api.models; import java.util.Date; public class AccessRequest extends AbstractUser { + private static final long serialVersionUID = 1L; private Date requestedAt; private AccessLevel accessLevel; diff --git a/src/main/java/org/gitlab4j/api/models/AllowedTo.java b/src/main/java/org/gitlab4j/api/models/AllowedTo.java index a3c01135..9a63ae11 100644 --- a/src/main/java/org/gitlab4j/api/models/AllowedTo.java +++ b/src/main/java/org/gitlab4j/api/models/AllowedTo.java @@ -2,11 +2,14 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.GitLabApiForm; +import java.io.Serializable; + /** * This class is used by the ProtectedBranchesAPi to set up the * allowed_to_push, allowed_to_merge, and allowed_to_unprotect values. */ -public class AllowedTo { +public class AllowedTo implements Serializable { + private static final long serialVersionUID = 1L; private AccessLevel accessLevel; private Long userId; diff --git a/src/main/java/org/gitlab4j/api/models/Application.java b/src/main/java/org/gitlab4j/api/models/Application.java index 9d70f588..8550c266 100644 --- a/src/main/java/org/gitlab4j/api/models/Application.java +++ b/src/main/java/org/gitlab4j/api/models/Application.java @@ -1,6 +1,9 @@ package org.gitlab4j.api.models; -public class Application { +import java.io.Serializable; + +public class Application implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String applicationId; diff --git a/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java b/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java index 62d081bd..9d3c33ac 100644 --- a/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java +++ b/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -17,7 +18,8 @@ import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.TextNode; -public class ApplicationSettings { +public class ApplicationSettings implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/ApprovalRule.java b/src/main/java/org/gitlab4j/api/models/ApprovalRule.java index e1249fdb..d6593dd3 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovalRule.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovalRule.java @@ -2,9 +2,11 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; import java.util.List; -public class ApprovalRule { +public class ApprovalRule implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java b/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java index d61d3701..310f1872 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.List; import org.gitlab4j.api.GitLabApiForm; -public class ApprovalRuleParams { +public class ApprovalRuleParams implements Serializable { + private static final long serialVersionUID = 1L; - private Integer approvalsRequired; + private Integer approvalsRequired; private String name; private Boolean appliesToAllProtectedBranches; private List groupIds; diff --git a/src/main/java/org/gitlab4j/api/models/ApprovalState.java b/src/main/java/org/gitlab4j/api/models/ApprovalState.java index bc8ef912..29f81b3e 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovalState.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovalState.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; -import java.util.List; - import org.gitlab4j.api.utils.JacksonJson; -public class ApprovalState { +import java.io.Serializable; +import java.util.List; + +public class ApprovalState implements Serializable { + private static final long serialVersionUID = 1L; private Boolean approvalRulesOverwritten; private List rules; diff --git a/src/main/java/org/gitlab4j/api/models/ApprovedBy.java b/src/main/java/org/gitlab4j/api/models/ApprovedBy.java index 205bb67f..4270569a 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovedBy.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovedBy.java @@ -1,9 +1,10 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.gitlab4j.api.utils.JacksonJson; -import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.Serializable; /** * This class is used by various models to represent the approved_by property, @@ -11,7 +12,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; * * @since 4.19.0 */ -public class ApprovedBy { +public class ApprovedBy implements Serializable { + private static final long serialVersionUID = 1L; private User user; private Group group; diff --git a/src/main/java/org/gitlab4j/api/models/Artifact.java b/src/main/java/org/gitlab4j/api/models/Artifact.java index dbaf6755..7378019c 100644 --- a/src/main/java/org/gitlab4j/api/models/Artifact.java +++ b/src/main/java/org/gitlab4j/api/models/Artifact.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; -public class Artifact { +public class Artifact implements Serializable { + private static final long serialVersionUID = 1L; public enum FileType { ARCHIVE, METADATA, TRACE, JUNIT; diff --git a/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java b/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java index 201d57c2..b52851ee 100644 --- a/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java +++ b/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class ArtifactsFile { +import java.io.Serializable; + +public class ArtifactsFile implements Serializable { + private static final long serialVersionUID = 1L; private String filename; private Long size; diff --git a/src/main/java/org/gitlab4j/api/models/Assets.java b/src/main/java/org/gitlab4j/api/models/Assets.java index 60fd81e6..ee925093 100644 --- a/src/main/java/org/gitlab4j/api/models/Assets.java +++ b/src/main/java/org/gitlab4j/api/models/Assets.java @@ -1,16 +1,19 @@ package org.gitlab4j.api.models; -import java.util.List; - import org.gitlab4j.api.Constants.ArchiveFormat; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; +import java.util.List; + /** * This class is part of the Release class model. */ -public class Assets { +public class Assets implements Serializable { + private static final long serialVersionUID = 1L; - public static class Source { + public static class Source implements Serializable { + private static final long serialVersionUID = 1L; private ArchiveFormat format; private String url; @@ -37,7 +40,8 @@ public class Assets { } } - public static class Link { + public static class Link implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/Assignee.java b/src/main/java/org/gitlab4j/api/models/Assignee.java index 68497ddb..b1017db5 100644 --- a/src/main/java/org/gitlab4j/api/models/Assignee.java +++ b/src/main/java/org/gitlab4j/api/models/Assignee.java @@ -4,6 +4,7 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; public class Assignee extends AbstractUser { + private static final long serialVersionUID = 1L; @Override public String toString() { diff --git a/src/main/java/org/gitlab4j/api/models/AuditEvent.java b/src/main/java/org/gitlab4j/api/models/AuditEvent.java index 2b336ad1..1d599907 100644 --- a/src/main/java/org/gitlab4j/api/models/AuditEvent.java +++ b/src/main/java/org/gitlab4j/api/models/AuditEvent.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class AuditEvent { +import java.io.Serializable; +import java.util.Date; + +public class AuditEvent implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Long authorId; diff --git a/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java b/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java index cc4af61d..4769c4ac 100644 --- a/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java +++ b/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java @@ -3,7 +3,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class AuditEventDetail { +import java.io.Serializable; + +public class AuditEventDetail implements Serializable { + private static final long serialVersionUID = 1L; private String change; private String from; diff --git a/src/main/java/org/gitlab4j/api/models/Author.java b/src/main/java/org/gitlab4j/api/models/Author.java index b7735c25..8cba63c0 100644 --- a/src/main/java/org/gitlab4j/api/models/Author.java +++ b/src/main/java/org/gitlab4j/api/models/Author.java @@ -2,4 +2,5 @@ package org.gitlab4j.api.models; public class Author extends AbstractUser { + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/org/gitlab4j/api/models/AwardEmoji.java b/src/main/java/org/gitlab4j/api/models/AwardEmoji.java index beab5c8b..3b0ce9de 100644 --- a/src/main/java/org/gitlab4j/api/models/AwardEmoji.java +++ b/src/main/java/org/gitlab4j/api/models/AwardEmoji.java @@ -1,15 +1,16 @@ package org.gitlab4j.api.models; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; +import java.util.Date; -public class AwardEmoji { +public class AwardEmoji implements Serializable { + private static final long serialVersionUID = 1L; public enum AwardableType { ISSUE, MERGE_REQUEST, NOTE, SNIPPET; diff --git a/src/main/java/org/gitlab4j/api/models/Badge.java b/src/main/java/org/gitlab4j/api/models/Badge.java index 71c4d24a..dd4404a7 100644 --- a/src/main/java/org/gitlab4j/api/models/Badge.java +++ b/src/main/java/org/gitlab4j/api/models/Badge.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; -public class Badge { +public class Badge implements Serializable { + private static final long serialVersionUID = 1L; public enum BadgeKind { PROJECT, GROUP; diff --git a/src/main/java/org/gitlab4j/api/models/Blame.java b/src/main/java/org/gitlab4j/api/models/Blame.java index ea09f315..34820907 100644 --- a/src/main/java/org/gitlab4j/api/models/Blame.java +++ b/src/main/java/org/gitlab4j/api/models/Blame.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; -import java.util.List; - import org.gitlab4j.api.utils.JacksonJson; -public class Blame { +import java.io.Serializable; +import java.util.List; + +public class Blame implements Serializable { + private static final long serialVersionUID = 1L; private Commit commit; private List lines; diff --git a/src/main/java/org/gitlab4j/api/models/Board.java b/src/main/java/org/gitlab4j/api/models/Board.java index 7ac373d0..673cabb4 100644 --- a/src/main/java/org/gitlab4j/api/models/Board.java +++ b/src/main/java/org/gitlab4j/api/models/Board.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; -import java.util.List; - import org.gitlab4j.api.utils.JacksonJson; -public class Board { +import java.io.Serializable; +import java.util.List; + +public class Board implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/BoardList.java b/src/main/java/org/gitlab4j/api/models/BoardList.java index 602aa7e4..27528a5f 100644 --- a/src/main/java/org/gitlab4j/api/models/BoardList.java +++ b/src/main/java/org/gitlab4j/api/models/BoardList.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class BoardList { +import java.io.Serializable; + +public class BoardList implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Label label; diff --git a/src/main/java/org/gitlab4j/api/models/Branch.java b/src/main/java/org/gitlab4j/api/models/Branch.java index c4254fe3..83dcef1f 100644 --- a/src/main/java/org/gitlab4j/api/models/Branch.java +++ b/src/main/java/org/gitlab4j/api/models/Branch.java @@ -3,7 +3,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Branch { +import java.io.Serializable; + +public class Branch implements Serializable { + private static final long serialVersionUID = 1L; private Commit commit; private Boolean developersCanMerge; diff --git a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java index bf97b96d..643338a6 100644 --- a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java +++ b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class BranchAccessLevel { +import java.io.Serializable; + +public class BranchAccessLevel implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private AccessLevel accessLevel; diff --git a/src/main/java/org/gitlab4j/api/models/Bridge.java b/src/main/java/org/gitlab4j/api/models/Bridge.java index 999e6fea..5ea56e03 100644 --- a/src/main/java/org/gitlab4j/api/models/Bridge.java +++ b/src/main/java/org/gitlab4j/api/models/Bridge.java @@ -2,9 +2,12 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; import java.util.Date; -public class Bridge { +public class Bridge implements Serializable { + private static final long serialVersionUID = 1L; + private Commit commit; private boolean allowFailure; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java b/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java index 3fe63a53..a8fe742b 100644 --- a/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java +++ b/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java @@ -5,9 +5,11 @@ import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.utils.ISO8601; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; import java.util.Date; -public class ChangelogPayload { +public class ChangelogPayload implements Serializable { + private static final long serialVersionUID = 1L; private String version; private String from; diff --git a/src/main/java/org/gitlab4j/api/models/Changes.java b/src/main/java/org/gitlab4j/api/models/Changes.java index 92c3ae78..74026469 100644 --- a/src/main/java/org/gitlab4j/api/models/Changes.java +++ b/src/main/java/org/gitlab4j/api/models/Changes.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; -import org.gitlab4j.api.utils.JacksonJson; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; -public class Changes { +public class Changes implements Serializable { + private static final long serialVersionUID = 1L; @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("a_mode") diff --git a/src/main/java/org/gitlab4j/api/models/ChildEpic.java b/src/main/java/org/gitlab4j/api/models/ChildEpic.java index 365c7020..4c066444 100644 --- a/src/main/java/org/gitlab4j/api/models/ChildEpic.java +++ b/src/main/java/org/gitlab4j/api/models/ChildEpic.java @@ -3,6 +3,7 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; public class ChildEpic extends AbstractEpic { + private static final long serialVersionUID = 1L; public String toString() { return (JacksonJson.toJsonString(this)); diff --git a/src/main/java/org/gitlab4j/api/models/Comment.java b/src/main/java/org/gitlab4j/api/models/Comment.java index 7eaf60b3..75c68219 100644 --- a/src/main/java/org/gitlab4j/api/models/Comment.java +++ b/src/main/java/org/gitlab4j/api/models/Comment.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.Constants.LineType; import org.gitlab4j.api.utils.JacksonJson; -public class Comment { +import java.io.Serializable; +import java.util.Date; + +public class Comment implements Serializable { + private static final long serialVersionUID = 1L; private Author author; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/Commit.java b/src/main/java/org/gitlab4j/api/models/Commit.java index 55745433..d63288ae 100644 --- a/src/main/java/org/gitlab4j/api/models/Commit.java +++ b/src/main/java/org/gitlab4j/api/models/Commit.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; import java.util.Date; import java.util.List; -import org.gitlab4j.api.utils.JacksonJson; - -public class Commit { +public class Commit implements Serializable { + private static final long serialVersionUID = 1L; private Author author; private Date authoredDate; diff --git a/src/main/java/org/gitlab4j/api/models/CommitAction.java b/src/main/java/org/gitlab4j/api/models/CommitAction.java index 0b133502..54e93686 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitAction.java +++ b/src/main/java/org/gitlab4j/api/models/CommitAction.java @@ -1,18 +1,19 @@ package org.gitlab4j.api.models; -import java.io.File; -import java.io.IOException; - +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.Constants.Encoding; import org.gitlab4j.api.GitLabApiException; import org.gitlab4j.api.utils.FileUtils; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.File; +import java.io.IOException; +import java.io.Serializable; -public class CommitAction { +public class CommitAction implements Serializable { + private static final long serialVersionUID = 1L; public enum Action { @@ -142,7 +143,7 @@ public class CommitAction { public CommitAction withFileContent(File file, String filePath, Encoding encoding) throws GitLabApiException { - this.encoding = (encoding != null ? encoding : Encoding.TEXT); + this.encoding = (encoding != null ? encoding : Encoding.TEXT); this.filePath = filePath; try { diff --git a/src/main/java/org/gitlab4j/api/models/CommitPayload.java b/src/main/java/org/gitlab4j/api/models/CommitPayload.java index 077d4e20..af009a8d 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitPayload.java +++ b/src/main/java/org/gitlab4j/api/models/CommitPayload.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.gitlab4j.api.utils.JacksonJson; - -public class CommitPayload { +public class CommitPayload implements Serializable { + private static final long serialVersionUID = 1L; private String branch; private String commitMessage; diff --git a/src/main/java/org/gitlab4j/api/models/CommitRef.java b/src/main/java/org/gitlab4j/api/models/CommitRef.java index 39415594..4244601d 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitRef.java +++ b/src/main/java/org/gitlab4j/api/models/CommitRef.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; -public class CommitRef { +public class CommitRef implements Serializable { + private static final long serialVersionUID = 1L; private RefType type; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/CommitStats.java b/src/main/java/org/gitlab4j/api/models/CommitStats.java index d43bc626..ee22c253 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStats.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStats.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class CommitStats { +import java.io.Serializable; + +public class CommitStats implements Serializable { + private static final long serialVersionUID = 1L; private Integer additions; private Integer deletions; diff --git a/src/main/java/org/gitlab4j/api/models/CommitStatus.java b/src/main/java/org/gitlab4j/api/models/CommitStatus.java index cff7a577..2e09f4d6 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStatus.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStatus.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class CommitStatus { +import java.io.Serializable; +import java.util.Date; + +public class CommitStatus implements Serializable { + private static final long serialVersionUID = 1L; private Boolean allowFailure; private Author author; diff --git a/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java b/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java index fdc06f70..94bceacb 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java @@ -1,20 +1,22 @@ package org.gitlab4j.api.models; import com.fasterxml.jackson.annotation.JsonIgnore; - import org.gitlab4j.api.Constants; import org.gitlab4j.api.GitLabApiForm; +import java.io.Serializable; + /** * This class is used to filter commit status when getting lists of them. */ -public class CommitStatusFilter { +public class CommitStatusFilter implements Serializable { + private static final long serialVersionUID = 1L; private String ref; private String stage; private String name; private Boolean all; - + public CommitStatusFilter withRef(String ref) { this.ref = ref; return this; @@ -30,7 +32,7 @@ public class CommitStatusFilter { return this; } - + public CommitStatusFilter withAll(Boolean all) { this.all = all; return this; @@ -43,12 +45,12 @@ public class CommitStatusFilter { .withParam(Constants.PER_PAGE_PARAM, perPage)); } - @JsonIgnore + @JsonIgnore public GitLabApiForm getQueryParams() { return (new GitLabApiForm() .withParam("ref", ref) .withParam("stage", stage) .withParam("name", name) - .withParam("all", all)); + .withParam("all", all)); } } diff --git a/src/main/java/org/gitlab4j/api/models/CompareResults.java b/src/main/java/org/gitlab4j/api/models/CompareResults.java index ffb09019..cc76309a 100644 --- a/src/main/java/org/gitlab4j/api/models/CompareResults.java +++ b/src/main/java/org/gitlab4j/api/models/CompareResults.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; -import java.util.List; - import org.gitlab4j.api.utils.JacksonJson; -public class CompareResults { +import java.io.Serializable; +import java.util.List; + +public class CompareResults implements Serializable { + private static final long serialVersionUID = 1L; private Commit commit; private List commits;; diff --git a/src/main/java/org/gitlab4j/api/models/Contributor.java b/src/main/java/org/gitlab4j/api/models/Contributor.java index b6670ae9..dd2072e4 100644 --- a/src/main/java/org/gitlab4j/api/models/Contributor.java +++ b/src/main/java/org/gitlab4j/api/models/Contributor.java @@ -4,7 +4,8 @@ package org.gitlab4j.api.models; * This class models the object for a repository contributor. * See Contributors at GitLab. */ -public class Contributor extends AbstractUser { +public class Contributor extends AbstractUser{ + private static final long serialVersionUID = 1L; private Integer commits; private Integer additions; @@ -33,4 +34,4 @@ public class Contributor extends AbstractUser { public void setDeletions(Integer deletions) { this.deletions = deletions; } -} \ No newline at end of file +} diff --git a/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java b/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java index 065f9660..c255800a 100644 --- a/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java +++ b/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java @@ -3,6 +3,7 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; public class CreatedChildEpic extends AbstractMinimalEpic { + private static final long serialVersionUID = 1L; private Boolean hasChildren; private Boolean hasIssues; diff --git a/src/main/java/org/gitlab4j/api/models/CustomAttribute.java b/src/main/java/org/gitlab4j/api/models/CustomAttribute.java index 6b965ae6..f5b928fb 100644 --- a/src/main/java/org/gitlab4j/api/models/CustomAttribute.java +++ b/src/main/java/org/gitlab4j/api/models/CustomAttribute.java @@ -1,6 +1,10 @@ package org.gitlab4j.api.models; -public class CustomAttribute { +import java.io.Serializable; + +public class CustomAttribute implements Serializable { + private static final long serialVersionUID = 1L; + 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 b96012f1..18758fa2 100644 --- a/src/main/java/org/gitlab4j/api/models/DeployKey.java +++ b/src/main/java/org/gitlab4j/api/models/DeployKey.java @@ -1,18 +1,20 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class DeployKey { +import java.io.Serializable; +import java.util.Date; + +public class DeployKey implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String title; private String key; private Boolean canPush; private Date createdAt; - + public Long getId() { return this.id; } @@ -44,7 +46,7 @@ public class DeployKey { public void setCanPush(Boolean canPush) { this.canPush = canPush; } - + public Date getCreatedAt() { return this.createdAt; } diff --git a/src/main/java/org/gitlab4j/api/models/DeployToken.java b/src/main/java/org/gitlab4j/api/models/DeployToken.java index 65c469fb..29207556 100644 --- a/src/main/java/org/gitlab4j/api/models/DeployToken.java +++ b/src/main/java/org/gitlab4j/api/models/DeployToken.java @@ -3,10 +3,12 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.Constants; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; import java.util.Date; import java.util.List; -public class DeployToken { +public class DeployToken implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/Deployable.java b/src/main/java/org/gitlab4j/api/models/Deployable.java index 1638b012..cb160308 100644 --- a/src/main/java/org/gitlab4j/api/models/Deployable.java +++ b/src/main/java/org/gitlab4j/api/models/Deployable.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; -import java.util.Date; -import java.util.List; - import org.gitlab4j.api.Constants.DeploymentStatus; import org.gitlab4j.api.utils.JacksonJson; -public class Deployable { +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +public class Deployable implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private DeploymentStatus status; diff --git a/src/main/java/org/gitlab4j/api/models/Deployment.java b/src/main/java/org/gitlab4j/api/models/Deployment.java index 3b477716..f090754f 100644 --- a/src/main/java/org/gitlab4j/api/models/Deployment.java +++ b/src/main/java/org/gitlab4j/api/models/Deployment.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.Constants.DeploymentStatus; import org.gitlab4j.api.utils.JacksonJson; -public class Deployment { +import java.io.Serializable; +import java.util.Date; + +public class Deployment implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Long iid; diff --git a/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java b/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java index 3fc37b82..c87b18ac 100644 --- a/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java +++ b/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import org.gitlab4j.api.Constants; @@ -11,9 +12,10 @@ import org.gitlab4j.api.utils.ISO8601; import com.fasterxml.jackson.annotation.JsonIgnore; -public class DeploymentFilter { +public class DeploymentFilter implements Serializable { + private static final long serialVersionUID = 1L; - /** + /** * Return deployments ordered by either one of id, iid, created_at, updated_at or ref fields. Default is id. */ private DeploymentOrderBy orderBy; diff --git a/src/main/java/org/gitlab4j/api/models/DetailedStatus.java b/src/main/java/org/gitlab4j/api/models/DetailedStatus.java index e5e80623..ce67b3a4 100644 --- a/src/main/java/org/gitlab4j/api/models/DetailedStatus.java +++ b/src/main/java/org/gitlab4j/api/models/DetailedStatus.java @@ -2,10 +2,13 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; + /** * This class is part of the Pipeline message. */ -public class DetailedStatus { +public class DetailedStatus implements Serializable { + private static final long serialVersionUID = 1L; private String icon; private String text; diff --git a/src/main/java/org/gitlab4j/api/models/Diff.java b/src/main/java/org/gitlab4j/api/models/Diff.java index 9abeae4c..7545273c 100644 --- a/src/main/java/org/gitlab4j/api/models/Diff.java +++ b/src/main/java/org/gitlab4j/api/models/Diff.java @@ -1,17 +1,19 @@ package org.gitlab4j.api.models; -import org.gitlab4j.api.utils.JacksonJson; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; + +public class Diff implements Serializable { + private static final long serialVersionUID = 1L; -public class Diff { - @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("a_mode") private String a_mode; - + @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("b_mode") private String b_mode; diff --git a/src/main/java/org/gitlab4j/api/models/DiffRef.java b/src/main/java/org/gitlab4j/api/models/DiffRef.java index f65f1caa..2f05e11d 100644 --- a/src/main/java/org/gitlab4j/api/models/DiffRef.java +++ b/src/main/java/org/gitlab4j/api/models/DiffRef.java @@ -2,7 +2,11 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class DiffRef { +import java.io.Serializable; + +public class DiffRef implements Serializable { + private static final long serialVersionUID = 1L; + private String baseSha; private String headSha; private String startSha; diff --git a/src/main/java/org/gitlab4j/api/models/Discussion.java b/src/main/java/org/gitlab4j/api/models/Discussion.java index d15204e8..2f16575e 100644 --- a/src/main/java/org/gitlab4j/api/models/Discussion.java +++ b/src/main/java/org/gitlab4j/api/models/Discussion.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; -import java.util.List; - import org.gitlab4j.api.utils.JacksonJson; -public class Discussion { +import java.io.Serializable; +import java.util.List; + +public class Discussion implements Serializable { + private static final long serialVersionUID = 1L; private String id; private Boolean individualNote; diff --git a/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java b/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java index ff8cb237..6e458414 100644 --- a/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java +++ b/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java @@ -2,9 +2,12 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; import java.util.Date; -public class DownstreamPipeline { +public class DownstreamPipeline implements Serializable { + private static final long serialVersionUID = 1L; + private int id; private String sha; private String ref; diff --git a/src/main/java/org/gitlab4j/api/models/Duration.java b/src/main/java/org/gitlab4j/api/models/Duration.java index 0866cfc4..3aef718e 100644 --- a/src/main/java/org/gitlab4j/api/models/Duration.java +++ b/src/main/java/org/gitlab4j/api/models/Duration.java @@ -1,14 +1,16 @@ package org.gitlab4j.api.models; -import org.gitlab4j.api.utils.DurationUtils; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import org.gitlab4j.api.utils.DurationUtils; + +import java.io.Serializable; /** * This class represents a duration in time. */ -public class Duration { +public class Duration implements Serializable { + private static final long serialVersionUID = 1L; private int seconds; private String durationString; diff --git a/src/main/java/org/gitlab4j/api/models/Email.java b/src/main/java/org/gitlab4j/api/models/Email.java index 7af50a38..8d9ffa87 100644 --- a/src/main/java/org/gitlab4j/api/models/Email.java +++ b/src/main/java/org/gitlab4j/api/models/Email.java @@ -1,6 +1,9 @@ package org.gitlab4j.api.models; -public class Email { +import java.io.Serializable; + +public class Email implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String email; diff --git a/src/main/java/org/gitlab4j/api/models/Environment.java b/src/main/java/org/gitlab4j/api/models/Environment.java index 4efa9855..1a2ecb59 100644 --- a/src/main/java/org/gitlab4j/api/models/Environment.java +++ b/src/main/java/org/gitlab4j/api/models/Environment.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; -public class Environment { +public class Environment implements Serializable { + private static final long serialVersionUID = 1L; public enum EnvironmentState { AVAILABLE, STOPPED; diff --git a/src/main/java/org/gitlab4j/api/models/Epic.java b/src/main/java/org/gitlab4j/api/models/Epic.java index 31883337..89ca2501 100644 --- a/src/main/java/org/gitlab4j/api/models/Epic.java +++ b/src/main/java/org/gitlab4j/api/models/Epic.java @@ -1,10 +1,11 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; +import java.util.Date; + public class Epic extends AbstractEpic { + private static final long serialVersionUID = 1L; private Boolean startDateIsFixed; private Boolean dueDateIsFixed; diff --git a/src/main/java/org/gitlab4j/api/models/EpicFilter.java b/src/main/java/org/gitlab4j/api/models/EpicFilter.java index a30bf0bd..db31a7db 100644 --- a/src/main/java/org/gitlab4j/api/models/EpicFilter.java +++ b/src/main/java/org/gitlab4j/api/models/EpicFilter.java @@ -1,24 +1,24 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.Constants.EpicOrderBy; import org.gitlab4j.api.Constants.SortOrder; - -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.Map; - import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.models.AbstractEpic.EpicState; import org.gitlab4j.api.utils.ISO8601; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; /** * This class is used to filter Groups when getting lists of epics. */ -public class EpicFilter { +public class EpicFilter implements Serializable { + private static final long serialVersionUID = 1L; private Long authorId; private String authorUsername; @@ -78,7 +78,7 @@ public class EpicFilter { this.authorUsername = authorUsername; return (this); } - + /** * Add 'labels' filter. * diff --git a/src/main/java/org/gitlab4j/api/models/EpicInLink.java b/src/main/java/org/gitlab4j/api/models/EpicInLink.java index 4eded2f8..0ef8adda 100644 --- a/src/main/java/org/gitlab4j/api/models/EpicInLink.java +++ b/src/main/java/org/gitlab4j/api/models/EpicInLink.java @@ -3,6 +3,7 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; public class EpicInLink extends AbstractEpic { + private static final long serialVersionUID = 1L; public String toString() { return (JacksonJson.toJsonString(this)); diff --git a/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java b/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java index b169b6c8..b6e49d91 100644 --- a/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java +++ b/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java @@ -3,7 +3,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class EpicIssueLink { +import java.io.Serializable; + +public class EpicIssueLink implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Integer relativePosition; diff --git a/src/main/java/org/gitlab4j/api/models/Event.java b/src/main/java/org/gitlab4j/api/models/Event.java index 904be682..e27dd876 100644 --- a/src/main/java/org/gitlab4j/api/models/Event.java +++ b/src/main/java/org/gitlab4j/api/models/Event.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.Constants.TargetType; import org.gitlab4j.api.utils.JacksonJson; -public class Event { +import java.io.Serializable; +import java.util.Date; + +public class Event implements Serializable { + private static final long serialVersionUID = 1L; private Long id; 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 ecd9ad42..f62dead6 100644 --- a/src/main/java/org/gitlab4j/api/models/EventData.java +++ b/src/main/java/org/gitlab4j/api/models/EventData.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; -import java.util.List; - import org.gitlab4j.api.utils.JacksonJson; -public class EventData { +import java.io.Serializable; +import java.util.List; + +public class EventData implements Serializable { + private static final long serialVersionUID = 1L; private String after; private String before; diff --git a/src/main/java/org/gitlab4j/api/models/ExportStatus.java b/src/main/java/org/gitlab4j/api/models/ExportStatus.java index e9b2af58..1e4fa2ea 100644 --- a/src/main/java/org/gitlab4j/api/models/ExportStatus.java +++ b/src/main/java/org/gitlab4j/api/models/ExportStatus.java @@ -1,17 +1,18 @@ package org.gitlab4j.api.models; -import java.util.Date; -import java.util.Map; - -import org.gitlab4j.api.utils.JacksonJson; -import org.gitlab4j.api.utils.JacksonJsonEnumHelper; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import org.gitlab4j.api.utils.JacksonJson; +import org.gitlab4j.api.utils.JacksonJsonEnumHelper; + +import java.io.Serializable; +import java.util.Date; +import java.util.Map; -public class ExportStatus { +public class ExportStatus implements Serializable { + private static final long serialVersionUID = 1L; /** * Enum representing the status of the export. diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java index 3d90d682..8a2d1430 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java @@ -2,9 +2,11 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; import java.util.List; -public class ExternalStatusCheck { +public class ExternalStatusCheck implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java index 6f0d9fcc..edd7827e 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import java.util.List; import org.gitlab4j.api.utils.JacksonJson; -public class ExternalStatusCheckProtectedBranch { +public class ExternalStatusCheckProtectedBranch implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Long projectId; diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java index 4a8ea927..e27a4611 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class ExternalStatusCheckResult { +import java.io.Serializable; + +public class ExternalStatusCheckResult implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private MergeRequest mergeRequest; diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java index c1e85824..c55acda3 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java @@ -6,7 +6,10 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public class ExternalStatusCheckStatus { +import java.io.Serializable; + +public class ExternalStatusCheckStatus implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; @@ -33,7 +36,7 @@ public class ExternalStatusCheckStatus { return (enumHelper.toString(this)); } } - + public Long getId() { return id; } diff --git a/src/main/java/org/gitlab4j/api/models/FileUpload.java b/src/main/java/org/gitlab4j/api/models/FileUpload.java index ba042dd5..70ad34ff 100644 --- a/src/main/java/org/gitlab4j/api/models/FileUpload.java +++ b/src/main/java/org/gitlab4j/api/models/FileUpload.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class FileUpload { +import java.io.Serializable; + +public class FileUpload implements Serializable { + private static final long serialVersionUID = 1L; private String alt; private String url; diff --git a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java index f0759611..601e5588 100644 --- a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java +++ b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class GitLabCiTemplate { +import java.io.Serializable; + +public class GitLabCiTemplate implements Serializable { + private static final long serialVersionUID = 1L; private String name; private String content; diff --git a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java index 8ff4642f..dd118229 100644 --- a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java +++ b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class GitLabCiTemplateElement { +import java.io.Serializable; + +public class GitLabCiTemplateElement implements Serializable { + private static final long serialVersionUID = 1L; private String key; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/GpgSignature.java b/src/main/java/org/gitlab4j/api/models/GpgSignature.java index 081d4ae9..494e6975 100644 --- a/src/main/java/org/gitlab4j/api/models/GpgSignature.java +++ b/src/main/java/org/gitlab4j/api/models/GpgSignature.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class GpgSignature { +import java.io.Serializable; + +public class GpgSignature implements Serializable { + private static final long serialVersionUID = 1L; private Long gpgKeyId; private String gpgKeyPrimaryKeyid; diff --git a/src/main/java/org/gitlab4j/api/models/Group.java b/src/main/java/org/gitlab4j/api/models/Group.java index 4df3895b..f658f018 100644 --- a/src/main/java/org/gitlab4j/api/models/Group.java +++ b/src/main/java/org/gitlab4j/api/models/Group.java @@ -8,6 +8,7 @@ import java.util.Date; import java.util.List; public class Group extends AbstractGroup { + private static final long serialVersionUID = 1L; public class Statistics { private Long storageSize; diff --git a/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java b/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java index 79329f0f..411eaa66 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java +++ b/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java @@ -3,6 +3,8 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; public class GroupAccessToken extends ImpersonationToken { + private static final long serialVersionUID = 1L; + private AccessLevel accessLevel; public AccessLevel getAccessLevel() { diff --git a/src/main/java/org/gitlab4j/api/models/GroupFilter.java b/src/main/java/org/gitlab4j/api/models/GroupFilter.java index 8782c7a6..6d8ebb2a 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupFilter.java +++ b/src/main/java/org/gitlab4j/api/models/GroupFilter.java @@ -1,16 +1,18 @@ package org.gitlab4j.api.models; -import java.util.List; - import org.gitlab4j.api.Constants.GroupOrderBy; import org.gitlab4j.api.Constants.SortOrder; -import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.GitLabApiForm; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; +import java.util.List; /** * This class is used to filter Groups when getting lists of groups. */ -public class GroupFilter { +public class GroupFilter implements Serializable { + private static final long serialVersionUID = 1L; private List skipGroups; private Boolean allAvailable; diff --git a/src/main/java/org/gitlab4j/api/models/GroupParams.java b/src/main/java/org/gitlab4j/api/models/GroupParams.java index c196f24e..1e1a7477 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupParams.java +++ b/src/main/java/org/gitlab4j/api/models/GroupParams.java @@ -2,12 +2,15 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.GitLabApiForm; +import java.io.Serializable; + /** * This class is utilized by the {@link org.gitlab4j.api.GroupApi#createGroup(GroupParams)} * and {@link org.gitlab4j.api.GroupApi#updateGroup(Object, GroupParams)} methods to set * the parameters for the call to the GitLab API. */ -public class GroupParams { +public class GroupParams implements Serializable { + private static final long serialVersionUID = 1L; /** * Constant to specify the project_creation_level for the group. diff --git a/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java b/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java index a797e04a..299ef667 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java +++ b/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java @@ -5,10 +5,13 @@ import org.gitlab4j.api.Constants.SortOrder; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.GitLabApiForm; +import java.io.Serializable; + /** * This class is used to filter Projects when getting lists of projects for a specified group. */ -public class GroupProjectsFilter { +public class GroupProjectsFilter implements Serializable { + private static final long serialVersionUID = 1L; private Boolean archived; private Visibility visibility; @@ -32,7 +35,7 @@ public class GroupProjectsFilter { */ public GroupProjectsFilter withArchived(Boolean archived) { this.archived = archived; - return (this); + return (this); } /** @@ -43,7 +46,7 @@ public class GroupProjectsFilter { */ public GroupProjectsFilter withVisibility(Visibility visibility) { this.visibility = visibility; - return (this); + return (this); } /** @@ -80,7 +83,7 @@ public class GroupProjectsFilter { } /** - * Return only limited fields for each project. This is a no-op without + * Return only limited fields for each project. This is a no-op without * authentication as then only simple fields are returned. * * @param simple if true, return only limited fields for each project @@ -115,7 +118,7 @@ public class GroupProjectsFilter { /** * Include custom attributes in response (admins only). - * + * * @param withCustomAttributes if true, include custom attributes in the repsonse * @return the reference to this ProjectFilter instance */ diff --git a/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java b/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java index 51adc8ad..87f5e42e 100644 --- a/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java +++ b/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java @@ -1,6 +1,7 @@ package org.gitlab4j.api.models; import java.io.IOException; +import java.io.Serializable; import org.gitlab4j.api.utils.JacksonJson; @@ -12,7 +13,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -public class HealthCheckInfo { +public class HealthCheckInfo implements Serializable { + private static final long serialVersionUID = 1L; @JsonDeserialize(using = HealthCheckItemDeserializer.class) private HealthCheckItem dbCheck; diff --git a/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java b/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java index 7d9261cd..1266fbe8 100644 --- a/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java +++ b/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java @@ -1,10 +1,13 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Map; import org.gitlab4j.api.utils.JacksonJson; -public class HealthCheckItem { +public class HealthCheckItem implements Serializable { + private static final long serialVersionUID = 1L; + private HealthCheckStatus status; private Map labels; private String message; diff --git a/src/main/java/org/gitlab4j/api/models/Identity.java b/src/main/java/org/gitlab4j/api/models/Identity.java index 5ca64058..64fa03e1 100644 --- a/src/main/java/org/gitlab4j/api/models/Identity.java +++ b/src/main/java/org/gitlab4j/api/models/Identity.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Identity { +import java.io.Serializable; + +public class Identity implements Serializable { + private static final long serialVersionUID = 1L; private String provider; private String externUid; diff --git a/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 79f80889..1b7a5024 100644 --- a/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java +++ b/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -9,7 +10,8 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public class ImpersonationToken { +public class ImpersonationToken implements Serializable { + private static final long serialVersionUID = 1L; /** Enum to specify the scope of an ImpersonationToken. */ public enum Scope { diff --git a/src/main/java/org/gitlab4j/api/models/ImportStatus.java b/src/main/java/org/gitlab4j/api/models/ImportStatus.java index dc731e38..a926f61f 100644 --- a/src/main/java/org/gitlab4j/api/models/ImportStatus.java +++ b/src/main/java/org/gitlab4j/api/models/ImportStatus.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import org.gitlab4j.api.utils.JacksonJson; @@ -8,7 +9,8 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public class ImportStatus { +public class ImportStatus implements Serializable { + private static final long serialVersionUID = 1L; /** * Enum representing the status of the import. diff --git a/src/main/java/org/gitlab4j/api/models/Issue.java b/src/main/java/org/gitlab4j/api/models/Issue.java index 5cd47f80..dcd38336 100644 --- a/src/main/java/org/gitlab4j/api/models/Issue.java +++ b/src/main/java/org/gitlab4j/api/models/Issue.java @@ -6,6 +6,7 @@ import java.util.Date; import org.gitlab4j.api.utils.JacksonJson; public class Issue extends AbstractIssue { + private static final long serialVersionUID = 1L; private Boolean subscribed; diff --git a/src/main/java/org/gitlab4j/api/models/IssueEvent.java b/src/main/java/org/gitlab4j/api/models/IssueEvent.java index 3e8a6a88..10f2e81f 100644 --- a/src/main/java/org/gitlab4j/api/models/IssueEvent.java +++ b/src/main/java/org/gitlab4j/api/models/IssueEvent.java @@ -5,7 +5,11 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -public class IssueEvent { +import java.io.Serializable; + +public class IssueEvent implements Serializable { + private static final long serialVersionUID = 1L; + /** Enum to use for specifying the state events resource type. */ public enum ResourceType { diff --git a/src/main/java/org/gitlab4j/api/models/IssueFilter.java b/src/main/java/org/gitlab4j/api/models/IssueFilter.java index 42c3cdd9..5d963352 100644 --- a/src/main/java/org/gitlab4j/api/models/IssueFilter.java +++ b/src/main/java/org/gitlab4j/api/models/IssueFilter.java @@ -1,8 +1,6 @@ package org.gitlab4j.api.models; import com.fasterxml.jackson.annotation.JsonIgnore; -import java.util.Date; -import java.util.List; import org.gitlab4j.api.Constants; import org.gitlab4j.api.Constants.IssueOrderBy; import org.gitlab4j.api.Constants.IssueScope; @@ -11,10 +9,15 @@ import org.gitlab4j.api.Constants.SortOrder; import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.utils.ISO8601; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + /** * This class is used to filter issues when getting lists of them. */ -public class IssueFilter { +public class IssueFilter implements Serializable { + private static final long serialVersionUID = 1L; /** * Return only the milestone having the given iid. diff --git a/src/main/java/org/gitlab4j/api/models/IssueLink.java b/src/main/java/org/gitlab4j/api/models/IssueLink.java index 77752dad..bca1f4df 100644 --- a/src/main/java/org/gitlab4j/api/models/IssueLink.java +++ b/src/main/java/org/gitlab4j/api/models/IssueLink.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class IssueLink { +import java.io.Serializable; + +public class IssueLink implements Serializable { + private static final long serialVersionUID = 1L; private Issue sourceIssue; private Issue targetIssue; diff --git a/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java b/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java index 9472a904..f1d2ccb3 100644 --- a/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java +++ b/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java @@ -4,7 +4,10 @@ import org.gitlab4j.api.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnore; -public class IssuesStatistics { +import java.io.Serializable; + +public class IssuesStatistics implements Serializable { + private static final long serialVersionUID = 1L; private Statistics statistics; @@ -21,7 +24,9 @@ public class IssuesStatistics { return (statistics != null ? statistics.counts : null); } - public static class Statistics { + public static class Statistics implements Serializable { + private static final long serialVersionUID = 1L; + private Counts counts; public Counts getCounts() { @@ -33,7 +38,9 @@ public class IssuesStatistics { } } - public static class Counts { + public static class Counts implements Serializable { + + private static final long serialVersionUID = 1L; private Integer all; private Integer closed; diff --git a/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java b/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java index 31b60c6c..a166581c 100644 --- a/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java +++ b/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -13,7 +14,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; /** * This class is used to filter issues when getting issue statistics. of them. */ -public class IssuesStatisticsFilter { +public class IssuesStatisticsFilter implements Serializable { + private static final long serialVersionUID = 1L; private List labels; private String milestone; diff --git a/src/main/java/org/gitlab4j/api/models/Iteration.java b/src/main/java/org/gitlab4j/api/models/Iteration.java index b3369d64..336e2a15 100644 --- a/src/main/java/org/gitlab4j/api/models/Iteration.java +++ b/src/main/java/org/gitlab4j/api/models/Iteration.java @@ -1,13 +1,15 @@ package org.gitlab4j.api.models; -import java.util.Date; - -import org.gitlab4j.api.utils.JacksonJson; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; +import java.util.Date; + +public class Iteration implements Serializable { + private static final long serialVersionUID = 1L; -public class Iteration { public enum IterationState { UPCOMMING(1), CURRENT(2), CLOSED(3); diff --git a/src/main/java/org/gitlab4j/api/models/IterationFilter.java b/src/main/java/org/gitlab4j/api/models/IterationFilter.java index 58c99cd6..0b055603 100644 --- a/src/main/java/org/gitlab4j/api/models/IterationFilter.java +++ b/src/main/java/org/gitlab4j/api/models/IterationFilter.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import org.gitlab4j.api.Constants; @@ -11,7 +12,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonValue; -public class IterationFilter { +public class IterationFilter implements Serializable { + private static final long serialVersionUID = 1L; public enum IterationFilterState { OPENED, UPCOMING, CURRENT, CLOSED, ALL; diff --git a/src/main/java/org/gitlab4j/api/models/Job.java b/src/main/java/org/gitlab4j/api/models/Job.java index f4ffdb87..904e24f8 100644 --- a/src/main/java/org/gitlab4j/api/models/Job.java +++ b/src/main/java/org/gitlab4j/api/models/Job.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; import java.util.Date; import java.util.List; -import org.gitlab4j.api.utils.JacksonJson; - -public class Job { +public class Job implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Commit commit; diff --git a/src/main/java/org/gitlab4j/api/models/JobAttribute.java b/src/main/java/org/gitlab4j/api/models/JobAttribute.java index 85784d27..cc625e6a 100644 --- a/src/main/java/org/gitlab4j/api/models/JobAttribute.java +++ b/src/main/java/org/gitlab4j/api/models/JobAttribute.java @@ -2,9 +2,12 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class JobAttribute { +import java.io.Serializable; - private String key; +public class JobAttribute implements Serializable { + private static final long serialVersionUID = 1L; + + private String key; private String value; public JobAttribute(String key, String value) { diff --git a/src/main/java/org/gitlab4j/api/models/JobAttributes.java b/src/main/java/org/gitlab4j/api/models/JobAttributes.java index 5b254474..677a2127 100644 --- a/src/main/java/org/gitlab4j/api/models/JobAttributes.java +++ b/src/main/java/org/gitlab4j/api/models/JobAttributes.java @@ -1,12 +1,15 @@ package org.gitlab4j.api.models; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; import org.gitlab4j.api.utils.JacksonJson; -public class JobAttributes { +import java.io.Serializable; +import java.util.List; + +public class JobAttributes implements Serializable { + private static final long serialVersionUID = 1L; - @JsonProperty("job_variables_attributes") + @JsonProperty("job_variables_attributes") private List jobAttributes; public JobAttributes(List jobAttributes) { diff --git a/src/main/java/org/gitlab4j/api/models/Key.java b/src/main/java/org/gitlab4j/api/models/Key.java index ed5e406f..9ee90f48 100644 --- a/src/main/java/org/gitlab4j/api/models/Key.java +++ b/src/main/java/org/gitlab4j/api/models/Key.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class Key { +import java.io.Serializable; +import java.util.Date; + +public class Key implements Serializable { + private static final long serialVersionUID = 1L; private Date createdAt; private Long id; diff --git a/src/main/java/org/gitlab4j/api/models/Label.java b/src/main/java/org/gitlab4j/api/models/Label.java index 636b5b4e..35b0057a 100644 --- a/src/main/java/org/gitlab4j/api/models/Label.java +++ b/src/main/java/org/gitlab4j/api/models/Label.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.utils.JacksonJson; -import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.Serializable; -public class Label { +public class Label implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/LabelEvent.java b/src/main/java/org/gitlab4j/api/models/LabelEvent.java index 3ceae653..e0ac581e 100644 --- a/src/main/java/org/gitlab4j/api/models/LabelEvent.java +++ b/src/main/java/org/gitlab4j/api/models/LabelEvent.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; -public class LabelEvent { +public class LabelEvent implements Serializable { + private static final long serialVersionUID = 1L; /** Enum to use for specifying the label event resource type. */ public enum ResourceType { diff --git a/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java b/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java index 8830b247..0d9c3056 100644 --- a/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java +++ b/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java @@ -3,7 +3,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class LdapGroupLink { +import java.io.Serializable; + +public class LdapGroupLink implements Serializable { + private static final long serialVersionUID = 1L; private String cn; diff --git a/src/main/java/org/gitlab4j/api/models/License.java b/src/main/java/org/gitlab4j/api/models/License.java index db2d9a15..57252be8 100644 --- a/src/main/java/org/gitlab4j/api/models/License.java +++ b/src/main/java/org/gitlab4j/api/models/License.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; import java.util.Date; import java.util.Map; -import org.gitlab4j.api.utils.JacksonJson; - -public class License { +public class License implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String plan; diff --git a/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java b/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java index dc0f8d56..c658f082 100644 --- a/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java +++ b/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.List; import org.gitlab4j.api.utils.JacksonJson; -public class LicenseTemplate { +public class LicenseTemplate implements Serializable { + private static final long serialVersionUID = 1L; private String key; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/Link.java b/src/main/java/org/gitlab4j/api/models/Link.java index f222a8ce..82a40378 100644 --- a/src/main/java/org/gitlab4j/api/models/Link.java +++ b/src/main/java/org/gitlab4j/api/models/Link.java @@ -2,10 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -import java.util.Date; -import java.util.List; +import java.io.Serializable; -public class Link { +public class Link implements Serializable{ + private static final long serialVersionUID = 1L; private Integer id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/Markdown.java b/src/main/java/org/gitlab4j/api/models/Markdown.java index 09c35cbe..8cea4089 100644 --- a/src/main/java/org/gitlab4j/api/models/Markdown.java +++ b/src/main/java/org/gitlab4j/api/models/Markdown.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Markdown { +import java.io.Serializable; + +public class Markdown implements Serializable { + private static final long serialVersionUID = 1L; private String html; diff --git a/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java b/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java index ca33b15f..f91509bf 100644 --- a/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java +++ b/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java @@ -1,6 +1,10 @@ package org.gitlab4j.api.models; -public class MarkdownRequest { +import java.io.Serializable; + +public class MarkdownRequest implements Serializable { + private static final long serialVersionUID = 1L; + private String text; private boolean gfm; diff --git a/src/main/java/org/gitlab4j/api/models/Member.java b/src/main/java/org/gitlab4j/api/models/Member.java index 13f88e28..1c460c31 100644 --- a/src/main/java/org/gitlab4j/api/models/Member.java +++ b/src/main/java/org/gitlab4j/api/models/Member.java @@ -1,11 +1,12 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; +import java.util.Date; + public class Member extends AbstractUser { + private static final long serialVersionUID = 1L; private AccessLevel accessLevel; private Date expiresAt; diff --git a/src/main/java/org/gitlab4j/api/models/Membership.java b/src/main/java/org/gitlab4j/api/models/Membership.java index c58a8067..28e3dab2 100644 --- a/src/main/java/org/gitlab4j/api/models/Membership.java +++ b/src/main/java/org/gitlab4j/api/models/Membership.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Membership { +import java.io.Serializable; + +public class Membership implements Serializable { + private static final long serialVersionUID = 1L; private Long sourceId; private String sourceName; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/src/main/java/org/gitlab4j/api/models/MergeRequest.java index 614b54bf..c4e171f2 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequest.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequest.java @@ -1,14 +1,15 @@ package org.gitlab4j.api.models; -import java.util.Date; -import java.util.List; - -import org.gitlab4j.api.utils.JacksonJson; - import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; -public class MergeRequest { +public class MergeRequest implements Serializable { + private static final long serialVersionUID = 1L; private Boolean allowCollaboration; private Boolean allowMaintainerToPush; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java b/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java index a2193556..bb62a745 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java @@ -5,6 +5,7 @@ import java.util.List; import org.gitlab4j.api.utils.JacksonJson; public class MergeRequestDiff extends MergeRequestVersion { + private static final long serialVersionUID = 1L; private List commits; private List diffs; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java b/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java index d463a416..cfb91051 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java @@ -3,6 +3,7 @@ package org.gitlab4j.api.models; import static org.gitlab4j.api.Constants.MergeRequestScope.ALL; import static org.gitlab4j.api.Constants.MergeRequestScope.ASSIGNED_TO_ME; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -20,7 +21,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; /** * This class is used to filter merge requests when getting lists of them. */ -public class MergeRequestFilter { +public class MergeRequestFilter implements Serializable { + private static final long serialVersionUID = 1L; private Long projectId; private Long groupId; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java b/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java index 4cad740c..3215a2bc 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Arrays; import java.util.List; @@ -9,7 +10,8 @@ import org.gitlab4j.api.GitLabApiForm; /** * This class provides the form parameters for creating and updating merge requests. */ -public class MergeRequestParams { +public class MergeRequestParams implements Serializable { + private static final long serialVersionUID = 1L; private String sourceBranch; private String targetBranch; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java b/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java index 801e9fca..016afd37 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import org.gitlab4j.api.utils.JacksonJson; -public class MergeRequestVersion { +public class MergeRequestVersion implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String headCommitSha; diff --git a/src/main/java/org/gitlab4j/api/models/Metadata.java b/src/main/java/org/gitlab4j/api/models/Metadata.java index 2b91dd4c..e4b0e730 100644 --- a/src/main/java/org/gitlab4j/api/models/Metadata.java +++ b/src/main/java/org/gitlab4j/api/models/Metadata.java @@ -3,7 +3,10 @@ package org.gitlab4j.api.models; import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.utils.JacksonJson; -public class Metadata { +import java.io.Serializable; + +public class Metadata implements Serializable { + private static final long serialVersionUID = 1L; private String version; private String revision; diff --git a/src/main/java/org/gitlab4j/api/models/Milestone.java b/src/main/java/org/gitlab4j/api/models/Milestone.java index 92ec8f36..16579d65 100644 --- a/src/main/java/org/gitlab4j/api/models/Milestone.java +++ b/src/main/java/org/gitlab4j/api/models/Milestone.java @@ -1,12 +1,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.gitlab4j.api.utils.JacksonJson; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.io.Serializable; +import java.util.Date; -public class Milestone { +public class Milestone implements Serializable { + private static final long serialVersionUID = 1L; private Date createdAt; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/Namespace.java b/src/main/java/org/gitlab4j/api/models/Namespace.java index cbdd9c48..95e026ac 100644 --- a/src/main/java/org/gitlab4j/api/models/Namespace.java +++ b/src/main/java/org/gitlab4j/api/models/Namespace.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Namespace { +import java.io.Serializable; + +public class Namespace implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/Note.java b/src/main/java/org/gitlab4j/api/models/Note.java index aad1244b..430584b6 100644 --- a/src/main/java/org/gitlab4j/api/models/Note.java +++ b/src/main/java/org/gitlab4j/api/models/Note.java @@ -1,14 +1,15 @@ package org.gitlab4j.api.models; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; +import java.util.Date; -public class Note { +public class Note implements Serializable { + private static final long serialVersionUID = 1L; /** Enum to use for ordering the results. */ public static enum OrderBy { diff --git a/src/main/java/org/gitlab4j/api/models/NotificationSettings.java b/src/main/java/org/gitlab4j/api/models/NotificationSettings.java index f51e1026..127a5eb6 100644 --- a/src/main/java/org/gitlab4j/api/models/NotificationSettings.java +++ b/src/main/java/org/gitlab4j/api/models/NotificationSettings.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; -public class NotificationSettings { +public class NotificationSettings implements Serializable { + private static final long serialVersionUID = 1L; /** Notification level */ public static enum Level { @@ -31,7 +33,8 @@ public class NotificationSettings { } } - public static class Events { + public static class Events implements Serializable { + private static final long serialVersionUID = 1L; private Boolean newNote; private Boolean newIssue; @@ -180,4 +183,4 @@ public class NotificationSettings { public String toString() { return (JacksonJson.toJsonString(this)); } -} \ No newline at end of file +} diff --git a/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java b/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java index 3b30e0c8..a4c1049c 100644 --- a/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java +++ b/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java @@ -1,6 +1,9 @@ package org.gitlab4j.api.models; -public class OauthTokenResponse { +import java.io.Serializable; + +public class OauthTokenResponse implements Serializable { + private static final long serialVersionUID = 1L; private String accessToken; private String tokenType; diff --git a/src/main/java/org/gitlab4j/api/models/Owner.java b/src/main/java/org/gitlab4j/api/models/Owner.java index 441666fd..ad0eec26 100644 --- a/src/main/java/org/gitlab4j/api/models/Owner.java +++ b/src/main/java/org/gitlab4j/api/models/Owner.java @@ -1,4 +1,5 @@ package org.gitlab4j.api.models; public class Owner extends AbstractUser { + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/org/gitlab4j/api/models/Package.java b/src/main/java/org/gitlab4j/api/models/Package.java index 62efb7d8..6a92a7aa 100644 --- a/src/main/java/org/gitlab4j/api/models/Package.java +++ b/src/main/java/org/gitlab4j/api/models/Package.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class Package { +import java.io.Serializable; +import java.util.Date; + +public class Package implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; @@ -56,4 +58,4 @@ public class Package { public String toString() { return (JacksonJson.toJsonString(this)); } -} \ No newline at end of file +} diff --git a/src/main/java/org/gitlab4j/api/models/PackageFile.java b/src/main/java/org/gitlab4j/api/models/PackageFile.java index fee85bd2..011043c1 100644 --- a/src/main/java/org/gitlab4j/api/models/PackageFile.java +++ b/src/main/java/org/gitlab4j/api/models/PackageFile.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import org.gitlab4j.api.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnore; -public class PackageFile { +public class PackageFile implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Long packageId; diff --git a/src/main/java/org/gitlab4j/api/models/PackageFilter.java b/src/main/java/org/gitlab4j/api/models/PackageFilter.java index 36a5b18e..2b18911a 100644 --- a/src/main/java/org/gitlab4j/api/models/PackageFilter.java +++ b/src/main/java/org/gitlab4j/api/models/PackageFilter.java @@ -1,14 +1,17 @@ package org.gitlab4j.api.models; -import org.gitlab4j.api.Constants.PackageStatus; import org.gitlab4j.api.Constants.PackageOrderBy; +import org.gitlab4j.api.Constants.PackageStatus; import org.gitlab4j.api.Constants.SortOrder; import org.gitlab4j.api.GitLabApiForm; +import java.io.Serializable; + /** * This class is used to filter Projects when getting lists of projects for a specified group. */ -public class PackageFilter { +public class PackageFilter implements Serializable { + private static final long serialVersionUID = 1L; private Boolean excludeSubgroups; private PackageOrderBy orderBy; diff --git a/src/main/java/org/gitlab4j/api/models/Participant.java b/src/main/java/org/gitlab4j/api/models/Participant.java index 83ac5b52..01b8e0eb 100644 --- a/src/main/java/org/gitlab4j/api/models/Participant.java +++ b/src/main/java/org/gitlab4j/api/models/Participant.java @@ -1,4 +1,5 @@ package org.gitlab4j.api.models; public class Participant extends AbstractUser { -} \ No newline at end of file + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/org/gitlab4j/api/models/Permissions.java b/src/main/java/org/gitlab4j/api/models/Permissions.java index cbc56130..8ea86640 100644 --- a/src/main/java/org/gitlab4j/api/models/Permissions.java +++ b/src/main/java/org/gitlab4j/api/models/Permissions.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Permissions { +import java.io.Serializable; + +public class Permissions implements Serializable { + private static final long serialVersionUID = 1L; private ProjectAccess projectAccess; private ProjectAccess groupAccess; diff --git a/src/main/java/org/gitlab4j/api/models/Pipeline.java b/src/main/java/org/gitlab4j/api/models/Pipeline.java index 50f140a5..92f889e3 100644 --- a/src/main/java/org/gitlab4j/api/models/Pipeline.java +++ b/src/main/java/org/gitlab4j/api/models/Pipeline.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import com.fasterxml.jackson.annotation.JsonIgnore; import org.gitlab4j.api.utils.JacksonJson; -public class Pipeline { +public class Pipeline implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Long iid; diff --git a/src/main/java/org/gitlab4j/api/models/PipelineFilter.java b/src/main/java/org/gitlab4j/api/models/PipelineFilter.java index a149ba88..3ec389b6 100644 --- a/src/main/java/org/gitlab4j/api/models/PipelineFilter.java +++ b/src/main/java/org/gitlab4j/api/models/PipelineFilter.java @@ -1,24 +1,25 @@ package org.gitlab4j.api.models; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonIgnore; import org.gitlab4j.api.Constants.PipelineOrderBy; import org.gitlab4j.api.Constants.PipelineScope; import org.gitlab4j.api.Constants.SortOrder; -import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.GitLabApiForm; +import org.gitlab4j.api.utils.JacksonJson; -import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.Serializable; +import java.util.Date; /** * This class is used to filter Pipelines when getting lists of them. */ -public class PipelineFilter { +public class PipelineFilter implements Serializable { + private static final long serialVersionUID = 1L; /** {@link org.gitlab4j.api.Constants.PipelineScope} The scope of pipelines, one of: running, pending, finished, branches, tags */ private PipelineScope scope; - /** {@link org.gitlab4j.api.Constants.PipelineScope} The status of pipelines, one of: running, pending, success, failed, canceled, skipped, created */ + /** {@link org.gitlab4j.api.Constants.PipelineScope} The status of pipelines, one of: running, pending, success, failed, canceled, skipped, created */ private PipelineStatus status; /** The ref of pipelines. */ diff --git a/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java b/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java index 56bb9696..085650e8 100644 --- a/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java +++ b/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import java.util.List; import org.gitlab4j.api.utils.JacksonJson; -public class PipelineSchedule { +public class PipelineSchedule implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/Position.java b/src/main/java/org/gitlab4j/api/models/Position.java index 78c5b390..dafc69be 100644 --- a/src/main/java/org/gitlab4j/api/models/Position.java +++ b/src/main/java/org/gitlab4j/api/models/Position.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; -public class Position { +public class Position implements Serializable { + private static final long serialVersionUID = 1L; 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 55c9f574..b76c2a5d 100644 --- a/src/main/java/org/gitlab4j/api/models/Project.java +++ b/src/main/java/org/gitlab4j/api/models/Project.java @@ -1,9 +1,9 @@ package org.gitlab4j.api.models; -import java.util.Date; -import java.util.List; - +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.gitlab4j.api.Constants.AutoDevopsDeployStrategy; import org.gitlab4j.api.Constants.BuildGitStrategy; import org.gitlab4j.api.Constants.SquashOption; @@ -12,11 +12,12 @@ import org.gitlab4j.api.models.ImportStatus.Status; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.io.Serializable; +import java.util.Date; +import java.util.List; -public class Project { +public class Project implements Serializable { + private static final long serialVersionUID = 1L; // Enum for the merge_method of the Project instance. public enum MergeMethod { diff --git a/src/main/java/org/gitlab4j/api/models/ProjectAccess.java b/src/main/java/org/gitlab4j/api/models/ProjectAccess.java index 3d35183b..d22e5f21 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectAccess.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectAccess.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class ProjectAccess { +import java.io.Serializable; + +public class ProjectAccess implements Serializable { + private static final long serialVersionUID = 1L; private AccessLevel accessLevel; private int notificationLevel; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java b/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java index 1acae21e..2d2e4009 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.Constants; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; import java.util.Date; import java.util.List; -public class ProjectAccessToken { +public class ProjectAccessToken implements Serializable { + private static final long serialVersionUID = 1L; + private Long userId; private List scopes; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java b/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java index 5bf887f7..8696f1b4 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java @@ -4,7 +4,10 @@ import org.gitlab4j.api.GitLabApiForm; import com.fasterxml.jackson.annotation.JsonIgnore; -public class ProjectApprovalsConfig { +import java.io.Serializable; + +public class ProjectApprovalsConfig implements Serializable { + private static final long serialVersionUID = 1L; private Integer approvalsBeforeMerge; private Boolean resetApprovalsOnPush; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectFetches.java b/src/main/java/org/gitlab4j/api/models/ProjectFetches.java index 03fe2716..93bb7a79 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectFetches.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectFetches.java @@ -1,15 +1,18 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; import java.util.Date; import java.util.List; -import org.gitlab4j.api.utils.JacksonJson; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +public class ProjectFetches implements Serializable { + private static final long serialVersionUID = 1L; -public class ProjectFetches { + public static class DateCount implements Serializable { - public static class DateCount { + private static final long serialVersionUID = 1L; private Integer count; @@ -33,7 +36,8 @@ public class ProjectFetches { } } - public static class Fetches { + public static class Fetches implements Serializable { + private static final long serialVersionUID = 1L; private Integer total; private List days; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectFilter.java b/src/main/java/org/gitlab4j/api/models/ProjectFilter.java index 9a167c5e..9fbbbe04 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectFilter.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectFilter.java @@ -1,17 +1,19 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.Constants; import org.gitlab4j.api.Constants.ProjectOrderBy; import org.gitlab4j.api.Constants.SortOrder; -import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.GitLabApiForm; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; +import java.util.Date; /** * This class is used to filter Projects when getting lists of projects for a specified user. */ -public class ProjectFilter { +public class ProjectFilter implements Serializable { + private static final long serialVersionUID = 1L; private Boolean archived; private Visibility visibility; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectGroup.java b/src/main/java/org/gitlab4j/api/models/ProjectGroup.java index b918d411..f106e999 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectGroup.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectGroup.java @@ -1,4 +1,5 @@ package org.gitlab4j.api.models; public class ProjectGroup extends AbstractGroup { + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java b/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java index fec74474..c7cd5330 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.List; import org.gitlab4j.api.GitLabApiForm; @@ -7,7 +8,8 @@ import org.gitlab4j.api.GitLabApiForm; /** * This class is used to filter Groups when getting lists of groups for a specified project. */ -public class ProjectGroupsFilter { +public class ProjectGroupsFilter implements Serializable { + private static final long serialVersionUID = 1L; private String search; private AccessLevel sharedMinAccessLevel; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/src/main/java/org/gitlab4j/api/models/ProjectHook.java index 12714b3e..2a11ff02 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class ProjectHook { +import java.io.Serializable; +import java.util.Date; + +public class ProjectHook implements Serializable { + private static final long serialVersionUID = 1L; private Boolean buildEvents; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java b/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java index ee29511a..5d547aa6 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java @@ -3,12 +3,15 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; + /** * This class contains the sizing information from the project. To get this information, * ProjectApi.getProject() has to be called with parameter statistics=true * which is only allowed for GitLab admins. */ -public class ProjectStatistics { +public class ProjectStatistics implements Serializable { + private static final long serialVersionUID = 1L; long commitCount; long storageSize; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectUser.java b/src/main/java/org/gitlab4j/api/models/ProjectUser.java index 135b96a7..46be7cd9 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectUser.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectUser.java @@ -1,4 +1,5 @@ package org.gitlab4j.api.models; public class ProjectUser extends AbstractUser { + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java b/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java index ee195896..a92ae788 100644 --- a/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java +++ b/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.List; import org.gitlab4j.api.utils.JacksonJson; -public class ProtectedBranch { +public class ProtectedBranch implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/ProtectedTag.java b/src/main/java/org/gitlab4j/api/models/ProtectedTag.java index 90aa07b6..5b92eb4c 100644 --- a/src/main/java/org/gitlab4j/api/models/ProtectedTag.java +++ b/src/main/java/org/gitlab4j/api/models/ProtectedTag.java @@ -1,12 +1,15 @@ package org.gitlab4j.api.models; -import java.util.List; - import org.gitlab4j.api.utils.JacksonJson; -public class ProtectedTag { +import java.io.Serializable; +import java.util.List; + +public class ProtectedTag implements Serializable { + private static final long serialVersionUID = 1L; - public static class CreateAccessLevel { + public static class CreateAccessLevel implements Serializable { + private static final long serialVersionUID = 1L; private AccessLevel access_level; private String accessLevelDescription; diff --git a/src/main/java/org/gitlab4j/api/models/PushRules.java b/src/main/java/org/gitlab4j/api/models/PushRules.java index e86df7d5..0d9c74c8 100644 --- a/src/main/java/org/gitlab4j/api/models/PushRules.java +++ b/src/main/java/org/gitlab4j/api/models/PushRules.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class PushRules { +import java.io.Serializable; +import java.util.Date; + +public class PushRules implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Long projectId; diff --git a/src/main/java/org/gitlab4j/api/models/References.java b/src/main/java/org/gitlab4j/api/models/References.java index e982f823..983e500e 100644 --- a/src/main/java/org/gitlab4j/api/models/References.java +++ b/src/main/java/org/gitlab4j/api/models/References.java @@ -3,8 +3,11 @@ package org.gitlab4j.api.models; import com.fasterxml.jackson.annotation.JsonProperty; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; -public class References { + +public class References implements Serializable { + private static final long serialVersionUID = 1L; @JsonProperty("short") private String _short; diff --git a/src/main/java/org/gitlab4j/api/models/RegistryRepository.java b/src/main/java/org/gitlab4j/api/models/RegistryRepository.java index bcff1b66..fcae9620 100644 --- a/src/main/java/org/gitlab4j/api/models/RegistryRepository.java +++ b/src/main/java/org/gitlab4j/api/models/RegistryRepository.java @@ -2,9 +2,11 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; import java.util.Date; -public class RegistryRepository { +public class RegistryRepository implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java b/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java index 9365f639..d83fff2d 100644 --- a/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java +++ b/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java @@ -2,9 +2,12 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; +import java.io.Serializable; import java.util.Date; -public class RegistryRepositoryTag { +public class RegistryRepositoryTag implements Serializable { + private static final long serialVersionUID = 1L; + private String name; private String path; private String location; diff --git a/src/main/java/org/gitlab4j/api/models/RelatedEpic.java b/src/main/java/org/gitlab4j/api/models/RelatedEpic.java index 4315a1b5..d5f7b669 100644 --- a/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/src/main/java/org/gitlab4j/api/models/RelatedEpic.java @@ -1,10 +1,11 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; +import java.util.Date; + public class RelatedEpic extends AbstractEpic { + private static final long serialVersionUID = 1L; private Boolean startDateIsFixed; private Boolean dueDateIsFixed; diff --git a/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java b/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java index d33f60b6..4e4e43b0 100644 --- a/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java +++ b/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; import org.gitlab4j.api.utils.JacksonJson; -public class RelatedEpicLink { +public class RelatedEpicLink implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private EpicInLink sourceEpic; diff --git a/src/main/java/org/gitlab4j/api/models/Release.java b/src/main/java/org/gitlab4j/api/models/Release.java index 4ebbc83e..d511baf2 100644 --- a/src/main/java/org/gitlab4j/api/models/Release.java +++ b/src/main/java/org/gitlab4j/api/models/Release.java @@ -1,15 +1,16 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.Map; -import org.gitlab4j.api.utils.JacksonJson; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -public class Release { +public class Release implements Serializable { + private static final long serialVersionUID = 1L; private String name; private String tagName; diff --git a/src/main/java/org/gitlab4j/api/models/ReleaseParams.java b/src/main/java/org/gitlab4j/api/models/ReleaseParams.java index 5ed81cb1..84015215 100644 --- a/src/main/java/org/gitlab4j/api/models/ReleaseParams.java +++ b/src/main/java/org/gitlab4j/api/models/ReleaseParams.java @@ -1,11 +1,13 @@ package org.gitlab4j.api.models; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.Serializable; import java.util.Date; import java.util.List; -import org.gitlab4j.api.utils.JacksonJson; - -public class ReleaseParams { +public class ReleaseParams implements Serializable { + private static final long serialVersionUID = 1L; private String name; private String tagName; diff --git a/src/main/java/org/gitlab4j/api/models/RemoteMirror.java b/src/main/java/org/gitlab4j/api/models/RemoteMirror.java index 7f8d3884..21f857eb 100644 --- a/src/main/java/org/gitlab4j/api/models/RemoteMirror.java +++ b/src/main/java/org/gitlab4j/api/models/RemoteMirror.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class RemoteMirror { +import java.io.Serializable; +import java.util.Date; + +public class RemoteMirror implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Boolean enabled; diff --git a/src/main/java/org/gitlab4j/api/models/Repository.java b/src/main/java/org/gitlab4j/api/models/Repository.java index 5265b99e..a391a540 100644 --- a/src/main/java/org/gitlab4j/api/models/Repository.java +++ b/src/main/java/org/gitlab4j/api/models/Repository.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Repository { +import java.io.Serializable; + +public class Repository implements Serializable { + private static final long serialVersionUID = 1L; private String description; private String homepage; diff --git a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java index d3a05d12..a7bba3e3 100644 --- a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java +++ b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java @@ -1,14 +1,15 @@ package org.gitlab4j.api.models; -import java.util.Base64; - +import com.fasterxml.jackson.annotation.JsonIgnore; import org.gitlab4j.api.Constants.Encoding; import org.gitlab4j.api.utils.JacksonJson; -import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.Serializable; +import java.util.Base64; -public class RepositoryFile { +public class RepositoryFile implements Serializable { + private static final long serialVersionUID = 1L; private String fileName; // file name only, Ex. class.rb private String filePath; // full path to file. Ex. lib/class.rb @@ -103,7 +104,7 @@ public class RepositoryFile { /** * Returns the content as a String, base64 decoding it if necessary. - * For binary files it is recommended to use getDecodedContentAsBytes() + * For binary files it is recommended to use getDecodedContentAsBytes() * * @return the content as a String, base64 decoding it if necessary */ diff --git a/src/main/java/org/gitlab4j/api/models/Reviewer.java b/src/main/java/org/gitlab4j/api/models/Reviewer.java index 694457aa..8b4b55ca 100644 --- a/src/main/java/org/gitlab4j/api/models/Reviewer.java +++ b/src/main/java/org/gitlab4j/api/models/Reviewer.java @@ -1,4 +1,5 @@ package org.gitlab4j.api.models; public class Reviewer extends AbstractUser { + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/org/gitlab4j/api/models/Runner.java b/src/main/java/org/gitlab4j/api/models/Runner.java index 8e4380d9..8325e506 100644 --- a/src/main/java/org/gitlab4j/api/models/Runner.java +++ b/src/main/java/org/gitlab4j/api/models/Runner.java @@ -1,12 +1,14 @@ package org.gitlab4j.api.models; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.io.Serializable; -public class Runner { +public class Runner implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/RunnerDetail.java b/src/main/java/org/gitlab4j/api/models/RunnerDetail.java index 4d378549..c89cab0b 100644 --- a/src/main/java/org/gitlab4j/api/models/RunnerDetail.java +++ b/src/main/java/org/gitlab4j/api/models/RunnerDetail.java @@ -1,15 +1,15 @@ package org.gitlab4j.api.models; -import java.util.Date; -import java.util.List; - +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Date; +import java.util.List; public class RunnerDetail extends Runner { + private static final long serialVersionUID = 1L; private String architecture; private String platform; diff --git a/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java b/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java index 2d85058d..b7fbdbab 100644 --- a/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java +++ b/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java @@ -3,7 +3,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class SamlGroupLink { +import java.io.Serializable; + +public class SamlGroupLink implements Serializable { + private static final long serialVersionUID = 1L; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/SearchBlob.java b/src/main/java/org/gitlab4j/api/models/SearchBlob.java index 21377499..f3606940 100644 --- a/src/main/java/org/gitlab4j/api/models/SearchBlob.java +++ b/src/main/java/org/gitlab4j/api/models/SearchBlob.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class SearchBlob { +import java.io.Serializable; + +public class SearchBlob implements Serializable { + private static final long serialVersionUID = 1L; private String basename; private String data; diff --git a/src/main/java/org/gitlab4j/api/models/SharedGroup.java b/src/main/java/org/gitlab4j/api/models/SharedGroup.java index 6aa64813..dc6ad795 100644 --- a/src/main/java/org/gitlab4j/api/models/SharedGroup.java +++ b/src/main/java/org/gitlab4j/api/models/SharedGroup.java @@ -1,12 +1,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.gitlab4j.api.utils.JacksonJson; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.io.Serializable; +import java.util.Date; -public class SharedGroup { +public class SharedGroup implements Serializable { + private static final long serialVersionUID = 1L; private Long groupId; private String groupName; diff --git a/src/main/java/org/gitlab4j/api/models/Snippet.java b/src/main/java/org/gitlab4j/api/models/Snippet.java index edccab18..47c009e4 100644 --- a/src/main/java/org/gitlab4j/api/models/Snippet.java +++ b/src/main/java/org/gitlab4j/api/models/Snippet.java @@ -23,11 +23,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class Snippet { +import java.io.Serializable; +import java.util.Date; + +public class Snippet implements Serializable { + private static final long serialVersionUID = 1L; private Author author; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/SshKey.java b/src/main/java/org/gitlab4j/api/models/SshKey.java index 2e06f641..a7f38137 100644 --- a/src/main/java/org/gitlab4j/api/models/SshKey.java +++ b/src/main/java/org/gitlab4j/api/models/SshKey.java @@ -1,12 +1,13 @@ package org.gitlab4j.api.models; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonIgnore; import org.gitlab4j.api.utils.JacksonJson; -import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.Serializable; +import java.util.Date; -public class SshKey { +public class SshKey implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String title; diff --git a/src/main/java/org/gitlab4j/api/models/SystemHook.java b/src/main/java/org/gitlab4j/api/models/SystemHook.java index e373fd20..be36847c 100644 --- a/src/main/java/org/gitlab4j/api/models/SystemHook.java +++ b/src/main/java/org/gitlab4j/api/models/SystemHook.java @@ -1,10 +1,12 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class SystemHook { +import java.io.Serializable; +import java.util.Date; + +public class SystemHook implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String url; diff --git a/src/main/java/org/gitlab4j/api/models/Tag.java b/src/main/java/org/gitlab4j/api/models/Tag.java index aa1a48e7..2d58a4b1 100644 --- a/src/main/java/org/gitlab4j/api/models/Tag.java +++ b/src/main/java/org/gitlab4j/api/models/Tag.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Tag { +import java.io.Serializable; + +public class Tag implements Serializable { + private static final long serialVersionUID = 1L; private Commit commit; private String message; diff --git a/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java b/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java index 69be9fb6..f348cac6 100644 --- a/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java +++ b/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class TaskCompletionStatus { +import java.io.Serializable; + +public class TaskCompletionStatus implements Serializable { + private static final long serialVersionUID = 1L; private Integer count; private Integer completedCount; diff --git a/src/main/java/org/gitlab4j/api/models/TimeStats.java b/src/main/java/org/gitlab4j/api/models/TimeStats.java index cc3ed0c0..c92cc90d 100644 --- a/src/main/java/org/gitlab4j/api/models/TimeStats.java +++ b/src/main/java/org/gitlab4j/api/models/TimeStats.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class TimeStats { +import java.io.Serializable; + +public class TimeStats implements Serializable { + private static final long serialVersionUID = 1L; private Integer timeEstimate; private Integer totalTimeSpent; diff --git a/src/main/java/org/gitlab4j/api/models/Todo.java b/src/main/java/org/gitlab4j/api/models/Todo.java index 69bdc597..2237077e 100644 --- a/src/main/java/org/gitlab4j/api/models/Todo.java +++ b/src/main/java/org/gitlab4j/api/models/Todo.java @@ -1,13 +1,5 @@ package org.gitlab4j.api.models; -import java.io.IOException; -import java.util.Date; - -import org.gitlab4j.api.Constants.TodoAction; -import org.gitlab4j.api.Constants.TodoState; -import org.gitlab4j.api.Constants.TodoType; -import org.gitlab4j.api.utils.JacksonJson; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -16,8 +8,17 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.gitlab4j.api.Constants.TodoAction; +import org.gitlab4j.api.Constants.TodoState; +import org.gitlab4j.api.Constants.TodoType; +import org.gitlab4j.api.utils.JacksonJson; + +import java.io.IOException; +import java.io.Serializable; +import java.util.Date; -public class Todo { +public class Todo implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private Project project; diff --git a/src/main/java/org/gitlab4j/api/models/Topic.java b/src/main/java/org/gitlab4j/api/models/Topic.java index 667723ba..7ce72c21 100644 --- a/src/main/java/org/gitlab4j/api/models/Topic.java +++ b/src/main/java/org/gitlab4j/api/models/Topic.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Topic { +import java.io.Serializable; + +public class Topic implements Serializable { + private static final long serialVersionUID = 1L; private Integer id; diff --git a/src/main/java/org/gitlab4j/api/models/TopicParams.java b/src/main/java/org/gitlab4j/api/models/TopicParams.java index e3513489..b5ccb15d 100644 --- a/src/main/java/org/gitlab4j/api/models/TopicParams.java +++ b/src/main/java/org/gitlab4j/api/models/TopicParams.java @@ -4,6 +4,7 @@ import org.gitlab4j.api.GitLabApiForm; import org.gitlab4j.api.TopicsApi; import java.io.File; +import java.io.Serializable; /** * This class is utilized by the {@link TopicsApi#createTopic(TopicParams)} @@ -12,7 +13,8 @@ import java.io.File; * * Avatar Upload has its own Upload in {@link TopicsApi#updateTopicAvatar(Integer,File)} */ -public class TopicParams { +public class TopicParams implements Serializable { + private static final long serialVersionUID = 1L; private String name; private String title; diff --git a/src/main/java/org/gitlab4j/api/models/TreeItem.java b/src/main/java/org/gitlab4j/api/models/TreeItem.java index fe18083d..7bf3e6c5 100644 --- a/src/main/java/org/gitlab4j/api/models/TreeItem.java +++ b/src/main/java/org/gitlab4j/api/models/TreeItem.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class TreeItem { +import java.io.Serializable; + +public class TreeItem implements Serializable { + private static final long serialVersionUID = 1L; public enum Type { TREE, BLOB, COMMIT; diff --git a/src/main/java/org/gitlab4j/api/models/Trigger.java b/src/main/java/org/gitlab4j/api/models/Trigger.java index f284cc09..6ebb0c84 100644 --- a/src/main/java/org/gitlab4j/api/models/Trigger.java +++ b/src/main/java/org/gitlab4j/api/models/Trigger.java @@ -1,8 +1,10 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.Date; -public class Trigger { +public class Trigger implements Serializable { + private static final long serialVersionUID = 1L; private Long id; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/User.java b/src/main/java/org/gitlab4j/api/models/User.java index 96ca37d0..d106e403 100644 --- a/src/main/java/org/gitlab4j/api/models/User.java +++ b/src/main/java/org/gitlab4j/api/models/User.java @@ -1,11 +1,12 @@ package org.gitlab4j.api.models; +import org.gitlab4j.api.utils.JacksonJson; + import java.util.Date; import java.util.List; -import org.gitlab4j.api.utils.JacksonJson; - public class User extends AbstractUser { + private static final long serialVersionUID = 1L; private String bio; private Boolean bot; diff --git a/src/main/java/org/gitlab4j/api/models/Variable.java b/src/main/java/org/gitlab4j/api/models/Variable.java index af1378d4..8eb59cb3 100644 --- a/src/main/java/org/gitlab4j/api/models/Variable.java +++ b/src/main/java/org/gitlab4j/api/models/Variable.java @@ -1,17 +1,18 @@ package org.gitlab4j.api.models; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.gitlab4j.api.utils.JacksonJson; -import org.gitlab4j.api.utils.JacksonJsonEnumHelper; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import org.gitlab4j.api.utils.JacksonJson; +import org.gitlab4j.api.utils.JacksonJsonEnumHelper; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; -public class Variable { +public class Variable implements Serializable { + private static final long serialVersionUID = 1L; /** * Enum for the various Commit build status values. diff --git a/src/main/java/org/gitlab4j/api/models/Version.java b/src/main/java/org/gitlab4j/api/models/Version.java index 36d940f1..c0745b98 100644 --- a/src/main/java/org/gitlab4j/api/models/Version.java +++ b/src/main/java/org/gitlab4j/api/models/Version.java @@ -2,7 +2,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class Version { +import java.io.Serializable; + +public class Version implements Serializable { + private static final long serialVersionUID = 1L; private String version; private String revision; diff --git a/src/main/java/org/gitlab4j/api/models/WikiAttachment.java b/src/main/java/org/gitlab4j/api/models/WikiAttachment.java index 4bccb691..fe261f3c 100644 --- a/src/main/java/org/gitlab4j/api/models/WikiAttachment.java +++ b/src/main/java/org/gitlab4j/api/models/WikiAttachment.java @@ -2,9 +2,13 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class WikiAttachment { +import java.io.Serializable; - public static class Link { +public class WikiAttachment implements Serializable { + private static final long serialVersionUID = 1L; + + public static class Link implements Serializable { + private static final long serialVersionUID = 1L; private String url; private String markdown; @@ -12,15 +16,15 @@ public class WikiAttachment { public String getUrl() { return url; } - + public void setUrl(String url) { this.url = url; } - + public String getMarkdown() { return markdown; } - + public void setMarkdown(String markdown) { this.markdown = markdown; } diff --git a/src/main/java/org/gitlab4j/api/models/WikiPage.java b/src/main/java/org/gitlab4j/api/models/WikiPage.java index b274796b..931d2564 100644 --- a/src/main/java/org/gitlab4j/api/models/WikiPage.java +++ b/src/main/java/org/gitlab4j/api/models/WikiPage.java @@ -25,7 +25,10 @@ package org.gitlab4j.api.models; import org.gitlab4j.api.utils.JacksonJson; -public class WikiPage { +import java.io.Serializable; + +public class WikiPage implements Serializable { + private static final long serialVersionUID = 1L; private String title; private String content; diff --git a/src/main/java/org/gitlab4j/api/services/NotificationService.java b/src/main/java/org/gitlab4j/api/services/NotificationService.java index c1d74634..d875e6a8 100644 --- a/src/main/java/org/gitlab4j/api/services/NotificationService.java +++ b/src/main/java/org/gitlab4j/api/services/NotificationService.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.services; +import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -9,7 +10,8 @@ import org.gitlab4j.api.utils.JacksonJson; import com.fasterxml.jackson.annotation.JsonIgnore; -public abstract class NotificationService { +public abstract class NotificationService implements Serializable{ + private static final long serialVersionUID = 1L; public static final String NOTIFY_ONLY_BROKEN_PIPELINES_PROP = "notify_only_broken_pipelines"; public static final String NOTIFY_ONLY_DEFAULT_BRANCH_PROP = "notify_only_default_branch"; diff --git a/src/main/java/org/gitlab4j/api/services/SlackService.java b/src/main/java/org/gitlab4j/api/services/SlackService.java index c41d2f6a..bfd47d2f 100644 --- a/src/main/java/org/gitlab4j/api/services/SlackService.java +++ b/src/main/java/org/gitlab4j/api/services/SlackService.java @@ -5,7 +5,8 @@ import org.gitlab4j.api.GitLabApiForm; import com.fasterxml.jackson.annotation.JsonIgnore; public class SlackService extends NotificationService { - + private static final long serialVersionUID = 1L; + private String defaultChannel; /** diff --git a/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java b/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java index 785df943..c2684b56 100644 --- a/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java @@ -1,5 +1,6 @@ package org.gitlab4j.api.webhook; +import java.io.Serializable; import java.util.List; import org.gitlab4j.api.models.Assignee; @@ -7,7 +8,8 @@ import org.gitlab4j.api.models.User; import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.webhook.MergeRequestEvent.ObjectAttributes; -public class ExternalStatusCheckEvent { +public class ExternalStatusCheckEvent implements Serializable { + private static final long serialVersionUID = 1L; private String objectKind; private String eventType; diff --git a/src/test/java/org/gitlab4j/api/JsonUtils.java b/src/test/java/org/gitlab4j/api/JsonUtils.java index b247677e..d90e095e 100644 --- a/src/test/java/org/gitlab4j/api/JsonUtils.java +++ b/src/test/java/org/gitlab4j/api/JsonUtils.java @@ -1,13 +1,24 @@ package org.gitlab4j.api; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.io.Serializable; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import org.gitlab4j.api.utils.JacksonJson; +import org.junit.jupiter.api.Assertions; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; @@ -26,7 +37,7 @@ public class JsonUtils { } static JsonNode readTreeFromMap(Map map) throws JsonParseException, JsonMappingException, IOException { - String jsonString = jacksonJson.getObjectMapper().writeValueAsString(map); + String jsonString = jacksonJson.getObjectMapper().writeValueAsString(map); return (jacksonJson.readTree(jsonString)); } @@ -40,48 +51,120 @@ public class JsonUtils { } static T unmarshalResource(Class returnType, String filename) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); InputStreamReader reader = new InputStreamReader(TestGitLabApiBeans.class.getResourceAsStream(filename)); return (jacksonJson.unmarshal(returnType, reader)); } - static List unmarshalResourceList(Class returnType, String filename) throws JsonParseException, JsonMappingException, IOException { + static List unmarshalResourceList(Class returnType, String filename) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); InputStreamReader reader = new InputStreamReader(TestGitLabApiBeans.class.getResourceAsStream(filename)); return (JsonUtils.unmarshalList(returnType, reader)); } static Map unmarshalResourceMap(Class returnType, String filename) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); InputStreamReader reader = new InputStreamReader(TestGitLabApiBeans.class.getResourceAsStream(filename)); return (jacksonJson.unmarshalMap(returnType, reader)); } static T unmarshal(Class returnType, Reader reader) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); return (jacksonJson.unmarshal(returnType, reader)); } static T unmarshal(Class returnType, JsonNode tree) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); return (jacksonJson.unmarshal(returnType, tree)); } static T unmarshal(Class returnType, String json) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); return (jacksonJson.unmarshal(returnType, json)); } static List unmarshalList(Class returnType, Reader reader) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); return (jacksonJson.unmarshalList(returnType, reader)); } static List unmarshalList(Class returnType, String json) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); return (jacksonJson.unmarshalList(returnType, json)); } static Map unmarshalMap(Class returnType, Reader reader) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); return (jacksonJson.unmarshalMap(returnType, reader)); } static Map unmarshalMap(Class returnType, String json) throws JsonParseException, JsonMappingException, IOException { + checkSerializable(returnType); return (jacksonJson.unmarshalMap(returnType, json)); } + static void checkSerializable(Class cls) { + if(!isSerializable(cls, new HashSet<>())) { + fail("Class " + cls.getCanonicalName() + " or one of its member does not implement Serializable"); + } + } + static boolean isSerializable(Class cls, Set> checkedTypes) { + if (checkedTypes.contains(cls)) { + return true; + } + checkedTypes.add(cls); + + if (!Serializable.class.isAssignableFrom(cls)) { + return false; + } + + Field[] fields = cls.getDeclaredFields(); + for (Field field : fields) { + if (!Modifier.isStatic(field.getModifiers()) && !Modifier.isTransient(field.getModifiers())) { + Class fieldClass = field.getType(); + if (!isSimpleType(fieldClass) && !isSerializable(fieldClass, checkedTypes) && !isCollectionSerializable(field, checkedTypes)) { + return false; + } + } + } + return true; + } + + private static boolean isSimpleType(Class type) { + return type.isPrimitive() || + type.equals(String.class) || + type.equals(Integer.class) || + type.equals(Long.class) || + type.equals(Double.class) || + type.equals(Float.class) || + type.equals(Boolean.class) || + type.equals(Character.class) || + type.equals(Byte.class) || + type.equals(Short.class); + } + + private static boolean isCollectionSerializable(Field field, Set> checkedTypes) { + Class fieldType = field.getType(); + if (Collection.class.isAssignableFrom(fieldType) || Map.class.isAssignableFrom(fieldType)) { + Type genericType = field.getGenericType(); + + if (genericType instanceof ParameterizedType) { + ParameterizedType parameterizedType = (ParameterizedType) genericType; + Type[] typeArguments = parameterizedType.getActualTypeArguments(); + + for (Type typeArg : typeArguments) { + if (typeArg instanceof Class) { + Class typeClass = (Class) typeArg; + if (!isSimpleType(typeClass) && !isSerializable(typeClass, checkedTypes)) { + return false; + } + } + } + } + } + return true; + } + static boolean compareJson(T apiObject, String filename) throws IOException { InputStreamReader reader = new InputStreamReader(TestGitLabApiBeans.class.getResourceAsStream(filename)); return (compareJson(apiObject, reader)); -- GitLab