From ffeb82a039728cec0a80db8483db6d83a19b3c91 Mon Sep 17 00:00:00 2001 From: nilchina Date: Wed, 20 Dec 2023 14:21:37 +0800 Subject: [PATCH 1/5] The class under models package implements serializable interface to support native image(GraalVM). --- .../org/gitlab4j/api/models/AbstractEpic.java | 19 ++++++++++--------- .../gitlab4j/api/models/AbstractGroup.java | 7 ++++--- .../gitlab4j/api/models/AbstractIssue.java | 17 +++++++++-------- .../api/models/AbstractMinimalEpic.java | 4 +++- .../org/gitlab4j/api/models/AbstractUser.java | 10 +++++----- .../api/models/AcceptMergeRequestParams.java | 4 +++- .../gitlab4j/api/models/AccessRequest.java | 2 +- .../org/gitlab4j/api/models/AllowedTo.java | 6 ++++-- .../org/gitlab4j/api/models/Application.java | 4 +++- .../api/models/ApplicationSettings.java | 5 +++-- .../org/gitlab4j/api/models/ApprovalRule.java | 5 +++-- .../api/models/ApprovalRuleParams.java | 7 ++++--- .../gitlab4j/api/models/ApprovalState.java | 7 ++++--- .../org/gitlab4j/api/models/ApprovedBy.java | 7 ++++--- .../org/gitlab4j/api/models/Artifact.java | 8 +++++--- .../gitlab4j/api/models/ArtifactsFile.java | 4 +++- .../java/org/gitlab4j/api/models/Assets.java | 16 +++++++++------- .../org/gitlab4j/api/models/Assignee.java | 1 + .../org/gitlab4j/api/models/AuditEvent.java | 7 ++++--- .../gitlab4j/api/models/AuditEventDetail.java | 4 +++- .../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 | 7 ++++--- .../java/org/gitlab4j/api/models/Board.java | 7 ++++--- .../org/gitlab4j/api/models/BoardList.java | 4 +++- .../java/org/gitlab4j/api/models/Branch.java | 4 +++- .../api/models/BranchAccessLevel.java | 4 +++- .../java/org/gitlab4j/api/models/Bridge.java | 4 +++- .../gitlab4j/api/models/ChangelogPayload.java | 5 +++-- .../java/org/gitlab4j/api/models/Changes.java | 7 ++++--- .../org/gitlab4j/api/models/ChildEpic.java | 1 + .../java/org/gitlab4j/api/models/Comment.java | 7 ++++--- .../java/org/gitlab4j/api/models/Commit.java | 9 +++++---- .../org/gitlab4j/api/models/CommitAction.java | 15 ++++++++------- .../gitlab4j/api/models/CommitPayload.java | 9 +++++---- .../org/gitlab4j/api/models/CommitRef.java | 9 +++++---- .../org/gitlab4j/api/models/CommitStats.java | 4 +++- .../org/gitlab4j/api/models/CommitStatus.java | 7 ++++--- .../api/models/CommitStatusFilter.java | 15 ++++++++------- .../gitlab4j/api/models/CompareResults.java | 7 ++++--- .../org/gitlab4j/api/models/Contributor.java | 6 +++--- .../gitlab4j/api/models/CreatedChildEpic.java | 2 +- .../gitlab4j/api/models/CustomAttribute.java | 5 ++++- .../org/gitlab4j/api/models/DeployKey.java | 11 ++++++----- .../org/gitlab4j/api/models/DeployToken.java | 5 +++-- .../org/gitlab4j/api/models/Deployable.java | 9 +++++---- .../org/gitlab4j/api/models/Deployment.java | 7 ++++--- .../gitlab4j/api/models/DeploymentFilter.java | 7 ++++--- .../gitlab4j/api/models/DetailedStatus.java | 6 ++++-- .../java/org/gitlab4j/api/models/Diff.java | 11 ++++++----- .../java/org/gitlab4j/api/models/DiffRef.java | 5 ++++- .../org/gitlab4j/api/models/Discussion.java | 7 ++++--- .../api/models/DownstreamPipeline.java | 4 +++- .../org/gitlab4j/api/models/Duration.java | 9 +++++---- .../java/org/gitlab4j/api/models/Email.java | 4 +++- .../org/gitlab4j/api/models/Environment.java | 8 +++++--- .../java/org/gitlab4j/api/models/Epic.java | 6 +++--- .../org/gitlab4j/api/models/EpicFilter.java | 19 +++++++++---------- .../org/gitlab4j/api/models/EpicInLink.java | 1 + .../gitlab4j/api/models/EpicIssueLink.java | 4 +++- .../java/org/gitlab4j/api/models/Event.java | 7 ++++--- .../org/gitlab4j/api/models/EventData.java | 7 ++++--- .../org/gitlab4j/api/models/ExportStatus.java | 15 ++++++++------- .../api/models/ExternalStatusCheck.java | 5 +++-- .../ExternalStatusCheckProtectedBranch.java | 5 +++-- .../api/models/ExternalStatusCheckResult.java | 4 +++- .../api/models/ExternalStatusCheckStatus.java | 6 ++++-- .../org/gitlab4j/api/models/FileUpload.java | 4 +++- .../gitlab4j/api/models/GitLabCiTemplate.java | 4 +++- .../api/models/GitLabCiTemplateElement.java | 4 +++- .../org/gitlab4j/api/models/GpgSignature.java | 5 ++++- .../java/org/gitlab4j/api/models/Group.java | 2 ++ .../gitlab4j/api/models/GroupAccessToken.java | 1 + .../org/gitlab4j/api/models/GroupFilter.java | 10 ++++++---- .../org/gitlab4j/api/models/GroupParams.java | 6 +++++- .../api/models/GroupProjectsFilter.java | 13 ++++++++----- .../gitlab4j/api/models/HealthCheckInfo.java | 4 +++- .../gitlab4j/api/models/HealthCheckItem.java | 4 +++- .../org/gitlab4j/api/models/Identity.java | 5 ++++- .../api/models/ImpersonationToken.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 | 11 ++++++++--- .../api/models/IssuesStatisticsFilter.java | 4 +++- .../org/gitlab4j/api/models/Iteration.java | 12 +++++++----- .../gitlab4j/api/models/IterationFilter.java | 5 ++++- .../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 | 7 ++++--- .../java/org/gitlab4j/api/models/Label.java | 6 ++++-- .../org/gitlab4j/api/models/LabelEvent.java | 9 ++++++--- .../gitlab4j/api/models/LdapGroupLink.java | 5 ++++- .../java/org/gitlab4j/api/models/License.java | 8 +++++--- .../gitlab4j/api/models/LicenseTemplate.java | 4 +++- .../org/gitlab4j/api/models/Markdown.java | 5 ++++- .../gitlab4j/api/models/MarkdownRequest.java | 5 ++++- .../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 | 15 +++++++++------ .../api/models/OauthTokenResponse.java | 5 ++++- .../java/org/gitlab4j/api/models/Owner.java | 1 + .../java/org/gitlab4j/api/models/Package.java | 9 +++++---- .../gitlab4j/api/models/PackageFilter.java | 7 +++++-- .../org/gitlab4j/api/models/Participant.java | 3 ++- .../org/gitlab4j/api/models/Permissions.java | 5 ++++- .../gitlab4j/api/models/PipelineFilter.java | 13 +++++++------ .../gitlab4j/api/models/PipelineSchedule.java | 4 +++- .../org/gitlab4j/api/models/Position.java | 9 ++++++--- .../java/org/gitlab4j/api/models/Project.java | 15 ++++++++------- .../gitlab4j/api/models/ProjectAccess.java | 5 ++++- .../api/models/ProjectAccessToken.java | 4 +++- .../api/models/ProjectApprovalsConfig.java | 5 ++++- .../gitlab4j/api/models/ProjectFetches.java | 13 ++++++++----- .../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 | 4 +++- .../org/gitlab4j/api/models/RelatedEpic.java | 5 +++-- .../gitlab4j/api/models/RelatedEpicLink.java | 5 +++-- .../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 | 6 +++++- .../java/org/gitlab4j/api/models/Trigger.java | 4 +++- .../java/org/gitlab4j/api/models/User.java | 5 +++-- .../org/gitlab4j/api/models/Variable.java | 16 +++++++++------- .../java/org/gitlab4j/api/models/Version.java | 5 ++++- .../gitlab4j/api/models/WikiAttachment.java | 14 +++++++++----- .../org/gitlab4j/api/models/WikiPage.java | 5 ++++- 167 files changed, 715 insertions(+), 411 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index b531f2c2b..f52d49cad 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 = 8802254258764033205L; - 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 ac990e897..235a57ef5 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractGroup.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractGroup.java @@ -1,13 +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 = 2616198272324179140L; private Long id; private String name; private String avatarUrl; diff --git a/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index d618b21da..ca1e90ad9 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -1,23 +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; -public abstract class AbstractIssue { +import java.io.Serializable; +import java.util.Date; +import java.util.List; - public static class TaskCompletionStatus { +public abstract class AbstractIssue implements Serializable { + private static final long serialVersionUID = -9116273927092802149L; + public static class TaskCompletionStatus implements Serializable { + private static final long serialVersionUID = -7685544544331694460L; 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 a65634a80..53976ae95 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class AbstractMinimalEpic> { +import java.io.Serializable; +public class AbstractMinimalEpic> implements Serializable { + private static final long serialVersionUID = -1988058935141973607L; private Long id; private Long iid; private Long groupId; diff --git a/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/src/main/java/org/gitlab4j/api/models/AbstractUser.java index 8b10d23b4..9646cd6c4 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -1,14 +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 = -9021980908269047845L; private String avatarUrl; private Date createdAt; private String email; diff --git a/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java b/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java index c37dc7662..086101dcb 100644 --- a/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java +++ b/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.GitLabApiForm; -public class AcceptMergeRequestParams { +import java.io.Serializable; +public class AcceptMergeRequestParams implements Serializable { + private static final long serialVersionUID = -2261999999404292928L; private String mergeCommitMessage; private Boolean mergeWhenPipelineSucceeds; private String sha; diff --git a/src/main/java/org/gitlab4j/api/models/AccessRequest.java b/src/main/java/org/gitlab4j/api/models/AccessRequest.java index cc923fb1c..62916ade5 100644 --- a/src/main/java/org/gitlab4j/api/models/AccessRequest.java +++ b/src/main/java/org/gitlab4j/api/models/AccessRequest.java @@ -3,7 +3,7 @@ import java.util.Date; public class AccessRequest extends AbstractUser { - + private static final long serialVersionUID = 4063392072771491788L; 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 a3c01135b..38b9d7bfd 100644 --- a/src/main/java/org/gitlab4j/api/models/AllowedTo.java +++ b/src/main/java/org/gitlab4j/api/models/AllowedTo.java @@ -2,12 +2,14 @@ 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 = -2912839174502977874L; private AccessLevel accessLevel; private Long userId; private Long groupId; diff --git a/src/main/java/org/gitlab4j/api/models/Application.java b/src/main/java/org/gitlab4j/api/models/Application.java index 9d70f5885..4b7006202 100644 --- a/src/main/java/org/gitlab4j/api/models/Application.java +++ b/src/main/java/org/gitlab4j/api/models/Application.java @@ -1,7 +1,9 @@ package org.gitlab4j.api.models; -public class Application { +import java.io.Serializable; +public class Application implements Serializable { + private static final long serialVersionUID = -3074887863851381131L; private Long id; private String applicationId; private String applicationName; diff --git a/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java b/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java index 62d081bde..a185b8e4d 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,8 +18,8 @@ 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 = -4830677378866003355L; private Long id; private Date createdAt; private Date updatedAt; diff --git a/src/main/java/org/gitlab4j/api/models/ApprovalRule.java b/src/main/java/org/gitlab4j/api/models/ApprovalRule.java index e1249fdb6..6328a2a07 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovalRule.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovalRule.java @@ -2,10 +2,11 @@ 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 = -5607473655312877909L; private Long id; private String name; private String ruleType; diff --git a/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java b/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java index d61d37015..8c91df038 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java @@ -1,12 +1,13 @@ package org.gitlab4j.api.models; +import java.io.Serializable; import java.util.List; import org.gitlab4j.api.GitLabApiForm; -public class ApprovalRuleParams { - - private Integer approvalsRequired; +public class ApprovalRuleParams implements Serializable { + private static final long serialVersionUID = -1656517377374411043L; + 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 bc8ef912d..706933752 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovalState.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovalState.java @@ -1,11 +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 = -3848509790629188218L; 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 205bb67f0..0abeb6cc0 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,8 +12,8 @@ * * @since 4.19.0 */ -public class ApprovedBy { - +public class ApprovedBy implements Serializable { + private static final long serialVersionUID = 7527083171275917542L; 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 dbaf67550..26be34288 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 = 4700314154831526606L; 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 201d57c2d..9ba18d868 100644 --- a/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java +++ b/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class ArtifactsFile { +import java.io.Serializable; +public class ArtifactsFile implements Serializable { + private static final long serialVersionUID = -6852156410785558385L; 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 60fd81e68..d563e1696 100644 --- a/src/main/java/org/gitlab4j/api/models/Assets.java +++ b/src/main/java/org/gitlab4j/api/models/Assets.java @@ -1,17 +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 static class Source { +public class Assets implements Serializable { + private static final long serialVersionUID = 2384144246830837990L; + public static class Source implements Serializable { + private static final long serialVersionUID = 3024534253186638188L; private ArchiveFormat format; private String url; @@ -37,8 +39,8 @@ public String toString() { } } - public static class Link { - + public static class Link implements Serializable { + private static final long serialVersionUID = -2722442615226967526L; private Long id; private String name; private String url; diff --git a/src/main/java/org/gitlab4j/api/models/Assignee.java b/src/main/java/org/gitlab4j/api/models/Assignee.java index 68497ddb7..b6d5b4850 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 @@ import org.gitlab4j.api.utils.JacksonJson; public class Assignee extends AbstractUser { + private static final long serialVersionUID = -2458251622117638839L; @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 2b336ad11..0cbc25478 100644 --- a/src/main/java/org/gitlab4j/api/models/AuditEvent.java +++ b/src/main/java/org/gitlab4j/api/models/AuditEvent.java @@ -1,12 +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 = 1361335380835271609L; private Long id; private Long authorId; private Long entityId; diff --git a/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java b/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java index cc4af61dc..e38772df2 100644 --- a/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java +++ b/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java @@ -3,8 +3,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class AuditEventDetail { +import java.io.Serializable; +public class AuditEventDetail implements Serializable { + private static final long serialVersionUID = -407430313828885637L; private String change; private String from; private String to; diff --git a/src/main/java/org/gitlab4j/api/models/Author.java b/src/main/java/org/gitlab4j/api/models/Author.java index b7735c250..dea9aa314 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 = -4899398408742861106L; } diff --git a/src/main/java/org/gitlab4j/api/models/AwardEmoji.java b/src/main/java/org/gitlab4j/api/models/AwardEmoji.java index beab5c8b9..65290c1cb 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 = -1425405876922309702L; 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 71c4d24a1..0b5854658 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 = -4358146293064711740L; 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 ea09f3155..ba49421b4 100644 --- a/src/main/java/org/gitlab4j/api/models/Blame.java +++ b/src/main/java/org/gitlab4j/api/models/Blame.java @@ -1,11 +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 = -7605541188039758092L; 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 7ac373d0d..67f4d30b8 100644 --- a/src/main/java/org/gitlab4j/api/models/Board.java +++ b/src/main/java/org/gitlab4j/api/models/Board.java @@ -1,11 +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 = 2774787747056305357L; private Long id; private String name; private Project project; diff --git a/src/main/java/org/gitlab4j/api/models/BoardList.java b/src/main/java/org/gitlab4j/api/models/BoardList.java index 602aa7e4c..73dc13934 100644 --- a/src/main/java/org/gitlab4j/api/models/BoardList.java +++ b/src/main/java/org/gitlab4j/api/models/BoardList.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class BoardList { +import java.io.Serializable; +public class BoardList implements Serializable { + private static final long serialVersionUID = 1576257929374124267L; private Long id; private Label label; private Integer position; diff --git a/src/main/java/org/gitlab4j/api/models/Branch.java b/src/main/java/org/gitlab4j/api/models/Branch.java index c4254fe3b..8b3ce0189 100644 --- a/src/main/java/org/gitlab4j/api/models/Branch.java +++ b/src/main/java/org/gitlab4j/api/models/Branch.java @@ -3,8 +3,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Branch { +import java.io.Serializable; +public class Branch implements Serializable { + private static final long serialVersionUID = -8581563271712199201L; private Commit commit; private Boolean developersCanMerge; private Boolean developersCanPush; diff --git a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java index bf97b96d7..2f1e1c170 100644 --- a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java +++ b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class BranchAccessLevel { +import java.io.Serializable; +public class BranchAccessLevel implements Serializable { + private static final long serialVersionUID = 5766241722141581577L; private Long id; private AccessLevel accessLevel; private String accessLevelDescription; diff --git a/src/main/java/org/gitlab4j/api/models/Bridge.java b/src/main/java/org/gitlab4j/api/models/Bridge.java index 999e6fea1..a5483bdf9 100644 --- a/src/main/java/org/gitlab4j/api/models/Bridge.java +++ b/src/main/java/org/gitlab4j/api/models/Bridge.java @@ -2,9 +2,11 @@ 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 = 2971883600795290448L; 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 3fe63a531..04aee43e2 100644 --- a/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java +++ b/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java @@ -5,10 +5,11 @@ 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 = -4430138739965401359L; private String version; private String from; private String to; diff --git a/src/main/java/org/gitlab4j/api/models/Changes.java b/src/main/java/org/gitlab4j/api/models/Changes.java index 92c3ae78a..f3051bb79 100644 --- a/src/main/java/org/gitlab4j/api/models/Changes.java +++ b/src/main/java/org/gitlab4j/api/models/Changes.java @@ -1,12 +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; -public class Changes { +import java.io.Serializable; +public class Changes implements Serializable { + private static final long serialVersionUID = -1777640937801508683L; @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("a_mode") private String 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 365c7020b..bade38699 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 @@ import org.gitlab4j.api.utils.JacksonJson; public class ChildEpic extends AbstractEpic { + private static final long serialVersionUID = 3423897732994265591L; 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 7eaf60b38..92b2d10f3 100644 --- a/src/main/java/org/gitlab4j/api/models/Comment.java +++ b/src/main/java/org/gitlab4j/api/models/Comment.java @@ -1,12 +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 = 1917643760458643525L; private Author author; private Date createdAt; private LineType lineType; diff --git a/src/main/java/org/gitlab4j/api/models/Commit.java b/src/main/java/org/gitlab4j/api/models/Commit.java index 557454332..0ab273c22 100644 --- a/src/main/java/org/gitlab4j/api/models/Commit.java +++ b/src/main/java/org/gitlab4j/api/models/Commit.java @@ -1,13 +1,14 @@ package org.gitlab4j.api.models; -import java.util.Date; -import java.util.List; - import org.gitlab4j.api.utils.JacksonJson; -public class Commit { +import java.io.Serializable; +import java.util.Date; +import java.util.List; +public class Commit implements Serializable { + private static final long serialVersionUID = -5309295947818195004L; private Author author; private Date authoredDate; private String authorEmail; diff --git a/src/main/java/org/gitlab4j/api/models/CommitAction.java b/src/main/java/org/gitlab4j/api/models/CommitAction.java index 0b1335023..734fe6b6d 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 = 5720172990936523724L; public enum Action { @@ -142,7 +143,7 @@ public CommitAction withFileContent(String filePath, Encoding encoding) throws G 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 077d4e206..bfd11edc3 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitPayload.java +++ b/src/main/java/org/gitlab4j/api/models/CommitPayload.java @@ -1,12 +1,13 @@ package org.gitlab4j.api.models; -import java.util.ArrayList; -import java.util.List; - import org.gitlab4j.api.utils.JacksonJson; -public class CommitPayload { +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +public class CommitPayload implements Serializable { + private static final long serialVersionUID = -909264239788934196L; private String branch; private String commitMessage; private String startBranch; diff --git a/src/main/java/org/gitlab4j/api/models/CommitRef.java b/src/main/java/org/gitlab4j/api/models/CommitRef.java index 394155940..915c85fb1 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitRef.java +++ b/src/main/java/org/gitlab4j/api/models/CommitRef.java @@ -1,13 +1,14 @@ package org.gitlab4j.api.models; -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 org.gitlab4j.api.utils.JacksonJson; +import org.gitlab4j.api.utils.JacksonJsonEnumHelper; -public class CommitRef { +import java.io.Serializable; +public class CommitRef implements Serializable { + private static final long serialVersionUID = 2761193061188727620L; 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 d43bc626e..fce31b125 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStats.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStats.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class CommitStats { +import java.io.Serializable; +public class CommitStats implements Serializable { + private static final long serialVersionUID = -5607632904521556869L; private Integer additions; private Integer deletions; private Integer total; diff --git a/src/main/java/org/gitlab4j/api/models/CommitStatus.java b/src/main/java/org/gitlab4j/api/models/CommitStatus.java index cff7a5770..a6a7be89b 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStatus.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStatus.java @@ -1,12 +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 = -4986890666487972709L; private Boolean allowFailure; private Author author; private Float coverage; diff --git a/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java b/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java index fdc06f70f..c4c610f60 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java @@ -1,20 +1,21 @@ 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 = -9065214362591834155L; private String ref; private String stage; private String name; private Boolean all; - + public CommitStatusFilter withRef(String ref) { this.ref = ref; return this; @@ -30,7 +31,7 @@ public CommitStatusFilter withName(String name) { return this; } - + public CommitStatusFilter withAll(Boolean all) { this.all = all; return this; @@ -43,12 +44,12 @@ public GitLabApiForm getQueryParams(int page, int perPage) { .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 ffb09019b..c80399c05 100644 --- a/src/main/java/org/gitlab4j/api/models/CompareResults.java +++ b/src/main/java/org/gitlab4j/api/models/CompareResults.java @@ -1,12 +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 = -2871624622998850399L; private Commit commit; private List commits;; private List diffs; diff --git a/src/main/java/org/gitlab4j/api/models/Contributor.java b/src/main/java/org/gitlab4j/api/models/Contributor.java index b6670ae94..d8125f6de 100644 --- a/src/main/java/org/gitlab4j/api/models/Contributor.java +++ b/src/main/java/org/gitlab4j/api/models/Contributor.java @@ -4,8 +4,8 @@ * 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 = -4198040423122732070L; private Integer commits; private Integer additions; private Integer deletions; @@ -33,4 +33,4 @@ public Integer getDeletions() { 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 065f9660c..8c33cdaed 100644 --- a/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java +++ b/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java @@ -3,7 +3,7 @@ import org.gitlab4j.api.utils.JacksonJson; public class CreatedChildEpic extends AbstractMinimalEpic { - + private static final long serialVersionUID = -5686922693728608886L; private Boolean hasChildren; private Boolean hasIssues; private String url; diff --git a/src/main/java/org/gitlab4j/api/models/CustomAttribute.java b/src/main/java/org/gitlab4j/api/models/CustomAttribute.java index 6b965ae68..968857c40 100644 --- a/src/main/java/org/gitlab4j/api/models/CustomAttribute.java +++ b/src/main/java/org/gitlab4j/api/models/CustomAttribute.java @@ -1,6 +1,9 @@ package org.gitlab4j.api.models; -public class CustomAttribute { +import java.io.Serializable; + +public class CustomAttribute implements Serializable { + private static final long serialVersionUID = -4021719541521426021L; 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 b96012f1d..991ec8dd7 100644 --- a/src/main/java/org/gitlab4j/api/models/DeployKey.java +++ b/src/main/java/org/gitlab4j/api/models/DeployKey.java @@ -1,18 +1,19 @@ 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 = -5773240329719065765L; private Long id; private String title; private String key; private Boolean canPush; private Date createdAt; - + public Long getId() { return this.id; } @@ -44,7 +45,7 @@ public Boolean getCanPush() { 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 65c469fb8..86d88d266 100644 --- a/src/main/java/org/gitlab4j/api/models/DeployToken.java +++ b/src/main/java/org/gitlab4j/api/models/DeployToken.java @@ -3,11 +3,12 @@ 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 = -2137975534650973309L; private Long id; private String name; private String username; diff --git a/src/main/java/org/gitlab4j/api/models/Deployable.java b/src/main/java/org/gitlab4j/api/models/Deployable.java index 1638b012a..75b28f5d7 100644 --- a/src/main/java/org/gitlab4j/api/models/Deployable.java +++ b/src/main/java/org/gitlab4j/api/models/Deployable.java @@ -1,13 +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 = -2615572922445533790L; private Long id; private DeploymentStatus status; private String stage; diff --git a/src/main/java/org/gitlab4j/api/models/Deployment.java b/src/main/java/org/gitlab4j/api/models/Deployment.java index 3b4777161..40f5114b8 100644 --- a/src/main/java/org/gitlab4j/api/models/Deployment.java +++ b/src/main/java/org/gitlab4j/api/models/Deployment.java @@ -1,12 +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 = -7687358667670668078L; private Long id; private Long iid; private String ref; diff --git a/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java b/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java index 3fc37b821..a6dd5ed2e 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,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -public class DeploymentFilter { - - /** +public class DeploymentFilter implements Serializable { + private static final long serialVersionUID = 7839110225941520941L; + /** * 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 e5e806230..dac763165 100644 --- a/src/main/java/org/gitlab4j/api/models/DetailedStatus.java +++ b/src/main/java/org/gitlab4j/api/models/DetailedStatus.java @@ -2,11 +2,13 @@ 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 = -6621240797564980173L; private String icon; private String text; private String label; diff --git a/src/main/java/org/gitlab4j/api/models/Diff.java b/src/main/java/org/gitlab4j/api/models/Diff.java index 9abeae4c5..856529449 100644 --- a/src/main/java/org/gitlab4j/api/models/Diff.java +++ b/src/main/java/org/gitlab4j/api/models/Diff.java @@ -1,17 +1,18 @@ 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; -public class Diff { - +import java.io.Serializable; + +public class Diff implements Serializable { + private static final long serialVersionUID = -4483166688383479990L; @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 f65f1caad..6ff56f411 100644 --- a/src/main/java/org/gitlab4j/api/models/DiffRef.java +++ b/src/main/java/org/gitlab4j/api/models/DiffRef.java @@ -2,7 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class DiffRef { +import java.io.Serializable; + +public class DiffRef implements Serializable { + private static final long serialVersionUID = -9034081155654000901L; 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 d15204e89..dc78b0c00 100644 --- a/src/main/java/org/gitlab4j/api/models/Discussion.java +++ b/src/main/java/org/gitlab4j/api/models/Discussion.java @@ -1,11 +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 = 980803383743624987L; private String id; private Boolean individualNote; private List notes; diff --git a/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java b/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java index ff8cb2378..7c523a036 100644 --- a/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java +++ b/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java @@ -2,9 +2,11 @@ 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 = 6808739921188206517L; 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 0866cfc41..a48729dd6 100644 --- a/src/main/java/org/gitlab4j/api/models/Duration.java +++ b/src/main/java/org/gitlab4j/api/models/Duration.java @@ -1,15 +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 = 5088839932537037135L; 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 7af50a384..51446d4bf 100644 --- a/src/main/java/org/gitlab4j/api/models/Email.java +++ b/src/main/java/org/gitlab4j/api/models/Email.java @@ -1,7 +1,9 @@ package org.gitlab4j.api.models; -public class Email { +import java.io.Serializable; +public class Email implements Serializable { + private static final long serialVersionUID = -7852698606973146239L; 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 4efa9855b..f63fcad04 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 = 5680655830549448926L; 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 318833372..9892e62fd 100644 --- a/src/main/java/org/gitlab4j/api/models/Epic.java +++ b/src/main/java/org/gitlab4j/api/models/Epic.java @@ -1,11 +1,11 @@ package org.gitlab4j.api.models; -import java.util.Date; - import org.gitlab4j.api.utils.JacksonJson; -public class Epic extends AbstractEpic { +import java.util.Date; +public class Epic extends AbstractEpic { + private static final long serialVersionUID = -2039780947154320347L; private Boolean startDateIsFixed; private Boolean dueDateIsFixed; private Date dueDateFromInheritedSource; diff --git a/src/main/java/org/gitlab4j/api/models/EpicFilter.java b/src/main/java/org/gitlab4j/api/models/EpicFilter.java index a30bf0bd0..463a6c8ce 100644 --- a/src/main/java/org/gitlab4j/api/models/EpicFilter.java +++ b/src/main/java/org/gitlab4j/api/models/EpicFilter.java @@ -1,25 +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 = 1020596795849193660L; private Long authorId; private String authorUsername; private String labels; @@ -78,7 +77,7 @@ public EpicFilter withAuthorUsername(String authorUsername) { 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 4eded2f84..50600a5b7 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 @@ import org.gitlab4j.api.utils.JacksonJson; public class EpicInLink extends AbstractEpic { + private static final long serialVersionUID = 3050569265982322906L; 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 b169b6c8e..104ddf633 100644 --- a/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java +++ b/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java @@ -3,8 +3,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class EpicIssueLink { +import java.io.Serializable; +public class EpicIssueLink implements Serializable { + private static final long serialVersionUID = 8283764367558203361L; private Long id; private Integer relativePosition; private Epic epic; diff --git a/src/main/java/org/gitlab4j/api/models/Event.java b/src/main/java/org/gitlab4j/api/models/Event.java index 904be6823..21c234ed4 100644 --- a/src/main/java/org/gitlab4j/api/models/Event.java +++ b/src/main/java/org/gitlab4j/api/models/Event.java @@ -1,13 +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 = -8324645348073849814L; private Long id; private String actionName; private Author author; diff --git a/src/main/java/org/gitlab4j/api/models/EventData.java b/src/main/java/org/gitlab4j/api/models/EventData.java index ecd9ad42c..dd78a0de8 100644 --- a/src/main/java/org/gitlab4j/api/models/EventData.java +++ b/src/main/java/org/gitlab4j/api/models/EventData.java @@ -1,12 +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 = -1778675702778168859L; private String after; private String before; private List commits; diff --git a/src/main/java/org/gitlab4j/api/models/ExportStatus.java b/src/main/java/org/gitlab4j/api/models/ExportStatus.java index e9b2af58b..9ded31ab5 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 = -6479418376568344745L; /** * 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 3d90d6827..4a113e0fc 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java @@ -2,10 +2,11 @@ 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 = 2079093664740067505L; private Long id; private String name; private Long projectId; diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java index 6f0d9fcc4..157b2f4e4 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java @@ -1,13 +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 = 3702177459228966383L; private Long id; private Long projectId; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java index 4a8ea927b..29fd0df13 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class ExternalStatusCheckResult { +import java.io.Serializable; +public class ExternalStatusCheckResult implements Serializable { + private static final long serialVersionUID = 8696813682987928642L; private Long id; private MergeRequest mergeRequest; private ExternalStatusCheck externalStatusCheck; diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java index c1e858243..a6369eb86 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java @@ -6,8 +6,10 @@ 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 = -4975275665782772237L; private Long id; private String name; private String externalUrl; @@ -33,7 +35,7 @@ public String toString() { 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 ba042dd55..3a255feeb 100644 --- a/src/main/java/org/gitlab4j/api/models/FileUpload.java +++ b/src/main/java/org/gitlab4j/api/models/FileUpload.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class FileUpload { +import java.io.Serializable; +public class FileUpload implements Serializable { + private static final long serialVersionUID = 6666551122360550967L; private String alt; private String url; private String markdown; diff --git a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java index f07596115..8e8576c3e 100644 --- a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java +++ b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class GitLabCiTemplate { +import java.io.Serializable; +public class GitLabCiTemplate implements Serializable { + private static final long serialVersionUID = -8338332681415500765L; 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 8ff4642fe..1c9686555 100644 --- a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java +++ b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java @@ -2,8 +2,10 @@ import org.gitlab4j.api.utils.JacksonJson; -public class GitLabCiTemplateElement { +import java.io.Serializable; +public class GitLabCiTemplateElement implements Serializable { + private static final long serialVersionUID = 5775478350942742711L; 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 081d4ae96..60c9441ad 100644 --- a/src/main/java/org/gitlab4j/api/models/GpgSignature.java +++ b/src/main/java/org/gitlab4j/api/models/GpgSignature.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class GpgSignature { +import java.io.Serializable; +public class GpgSignature implements Serializable { + + private static final long serialVersionUID = -2146684278503477421L; private Long gpgKeyId; private String gpgKeyPrimaryKeyid; private String gpgKeyUserName; diff --git a/src/main/java/org/gitlab4j/api/models/Group.java b/src/main/java/org/gitlab4j/api/models/Group.java index 4df3895b9..71a5b0454 100644 --- a/src/main/java/org/gitlab4j/api/models/Group.java +++ b/src/main/java/org/gitlab4j/api/models/Group.java @@ -9,6 +9,8 @@ public class Group extends AbstractGroup { + private static final long serialVersionUID = -903904978831179687L; + public class Statistics { private Long storageSize; private Long repositorySize; diff --git a/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java b/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java index 79329f0f9..0f39e8999 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java +++ b/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java @@ -3,6 +3,7 @@ import org.gitlab4j.api.utils.JacksonJson; public class GroupAccessToken extends ImpersonationToken { + private static final long serialVersionUID = 338705544580605465L; 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 8782c7a60..79bbf120a 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupFilter.java +++ b/src/main/java/org/gitlab4j/api/models/GroupFilter.java @@ -1,17 +1,19 @@ 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 = -6089683763762350454L; private List skipGroups; private Boolean allAvailable; private String search; diff --git a/src/main/java/org/gitlab4j/api/models/GroupParams.java b/src/main/java/org/gitlab4j/api/models/GroupParams.java index c196f24ea..ca87138a0 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupParams.java +++ b/src/main/java/org/gitlab4j/api/models/GroupParams.java @@ -2,12 +2,16 @@ 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 = 4980649800188221721L; /** * 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 a797e04a1..a440a00a4 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java +++ b/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java @@ -5,11 +5,14 @@ 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 = -2606395891055016971L; private Boolean archived; private Visibility visibility; private ProjectOrderBy orderBy; @@ -32,7 +35,7 @@ public class GroupProjectsFilter { */ public GroupProjectsFilter withArchived(Boolean archived) { this.archived = archived; - return (this); + return (this); } /** @@ -43,7 +46,7 @@ public GroupProjectsFilter withArchived(Boolean archived) { */ public GroupProjectsFilter withVisibility(Visibility visibility) { this.visibility = visibility; - return (this); + return (this); } /** @@ -80,7 +83,7 @@ public GroupProjectsFilter withSearch(String search) { } /** - * 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 GroupProjectsFilter withStarred(Boolean starred) { /** * 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 51adc8ad9..71c54a43b 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,8 +13,9 @@ 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 = 6099547960016518839L; @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 7d9261cd2..4f6302dff 100644 --- a/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java +++ b/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java @@ -1,10 +1,12 @@ 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 = -9119476968963832367L; 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 5ca640583..2a40c2a88 100644 --- a/src/main/java/org/gitlab4j/api/models/Identity.java +++ b/src/main/java/org/gitlab4j/api/models/Identity.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Identity { +import java.io.Serializable; +public class Identity implements Serializable { + + private static final long serialVersionUID = -352988007246422134L; private String provider; private String externUid; private Integer samlProviderId; diff --git a/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 79f808897..0b06202e6 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 com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public class ImpersonationToken { +public class ImpersonationToken implements Serializable { + private static final long serialVersionUID = -5437477855918094475L; /** Enum to specify the scope of an ImpersonationToken. */ public enum Scope { diff --git a/src/main/java/org/gitlab4j/api/models/Issue.java b/src/main/java/org/gitlab4j/api/models/Issue.java index 5cd47f803..4fde622ec 100644 --- a/src/main/java/org/gitlab4j/api/models/Issue.java +++ b/src/main/java/org/gitlab4j/api/models/Issue.java @@ -7,6 +7,7 @@ public class Issue extends AbstractIssue { + private static final long serialVersionUID = 4408821491529505218L; private Boolean subscribed; private Long issueLinkId; diff --git a/src/main/java/org/gitlab4j/api/models/IssueEvent.java b/src/main/java/org/gitlab4j/api/models/IssueEvent.java index 3e8a6a887..5101c88e5 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 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 = -9172768252733688801L; + /** 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 42c3cdd9c..e1b303b8c 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,11 +9,16 @@ 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 = -6612905888724502274L; /** * 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 77752dadb..000d16a2f 100644 --- a/src/main/java/org/gitlab4j/api/models/IssueLink.java +++ b/src/main/java/org/gitlab4j/api/models/IssueLink.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class IssueLink { +import java.io.Serializable; +public class IssueLink implements Serializable { + + private static final long serialVersionUID = -489517714860533257L; private Issue sourceIssue; private Issue targetIssue; private LinkType linkType; diff --git a/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java b/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java index 9472a904d..db9b0bd3d 100644 --- a/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java +++ b/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java @@ -4,8 +4,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -public class IssuesStatistics { +import java.io.Serializable; +public class IssuesStatistics implements Serializable { + + private static final long serialVersionUID = -6581608490410246889L; private Statistics statistics; public Statistics getStatistics() { @@ -21,7 +24,8 @@ public Counts getCounts() { return (statistics != null ? statistics.counts : null); } - public static class Statistics { + public static class Statistics implements Serializable { + private static final long serialVersionUID = 1578060206571773512L; private Counts counts; public Counts getCounts() { @@ -33,8 +37,9 @@ public void setCounts(Counts counts) { } } - public static class Counts { + public static class Counts implements Serializable { + private static final long serialVersionUID = -1397426876566422385L; private Integer all; private Integer closed; private Integer opened; diff --git a/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java b/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java index 31b60c6c8..6ca048789 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,8 +14,9 @@ /** * 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 = -7501532011736965391L; private List labels; private String milestone; private IssueScope scope; diff --git a/src/main/java/org/gitlab4j/api/models/Iteration.java b/src/main/java/org/gitlab4j/api/models/Iteration.java index b3369d64c..1c7857903 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 = -7668584990220659049L; -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 58c99cd6c..79d940bd2 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,9 @@ 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 = -8121837351844663183L; 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 f4ffdb877..ffd657379 100644 --- a/src/main/java/org/gitlab4j/api/models/Job.java +++ b/src/main/java/org/gitlab4j/api/models/Job.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 Job { +public class Job implements Serializable { + private static final long serialVersionUID = 3324086159440132520L; private Long id; private Commit commit; private String coverage; diff --git a/src/main/java/org/gitlab4j/api/models/JobAttribute.java b/src/main/java/org/gitlab4j/api/models/JobAttribute.java index 85784d274..e4be98320 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 @@ 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 = -1898697909418913296L; + 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 5b2544747..f1354b4f9 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 { - @JsonProperty("job_variables_attributes") + private static final long serialVersionUID = 8339758909744590549L; + @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 ed5e406f3..81d2a700a 100644 --- a/src/main/java/org/gitlab4j/api/models/Key.java +++ b/src/main/java/org/gitlab4j/api/models/Key.java @@ -1,12 +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 = -2445059434057852073L; private Date createdAt; private Long id; private String key; diff --git a/src/main/java/org/gitlab4j/api/models/Label.java b/src/main/java/org/gitlab4j/api/models/Label.java index 636b5b4e2..903f49875 100644 --- a/src/main/java/org/gitlab4j/api/models/Label.java +++ b/src/main/java/org/gitlab4j/api/models/Label.java @@ -1,12 +1,14 @@ 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 = 2920944591804197634L; private Long id; private String name; private String color; diff --git a/src/main/java/org/gitlab4j/api/models/LabelEvent.java b/src/main/java/org/gitlab4j/api/models/LabelEvent.java index 3ceae6534..fe0a0465c 100644 --- a/src/main/java/org/gitlab4j/api/models/LabelEvent.java +++ b/src/main/java/org/gitlab4j/api/models/LabelEvent.java @@ -1,12 +1,15 @@ 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 implements Serializable { -public class LabelEvent { + private static final long serialVersionUID = 2844189986730654608L; /** 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 8830b2473..6f7b53e66 100644 --- a/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java +++ b/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java @@ -3,8 +3,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class LdapGroupLink { +import java.io.Serializable; +public class LdapGroupLink implements Serializable { + + private static final long serialVersionUID = -6725494282901246090L; private String cn; private AccessLevel groupAccess; diff --git a/src/main/java/org/gitlab4j/api/models/License.java b/src/main/java/org/gitlab4j/api/models/License.java index db2d9a15d..011015f09 100644 --- a/src/main/java/org/gitlab4j/api/models/License.java +++ b/src/main/java/org/gitlab4j/api/models/License.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.Map; -import org.gitlab4j.api.utils.JacksonJson; - -public class License { +public class License implements Serializable { + private static final long serialVersionUID = 8305426745567602018L; private Long id; private String plan; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java b/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java index dc0f8d56f..0684b0b8d 100644 --- a/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java +++ b/src/main/java/org/gitlab4j/api/models/LicenseTemplate.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 LicenseTemplate { +public class LicenseTemplate implements Serializable { + private static final long serialVersionUID = 7204719099700882956L; private String key; private String name; private String nickname; diff --git a/src/main/java/org/gitlab4j/api/models/Markdown.java b/src/main/java/org/gitlab4j/api/models/Markdown.java index 09c35cbe4..cc4f1a670 100644 --- a/src/main/java/org/gitlab4j/api/models/Markdown.java +++ b/src/main/java/org/gitlab4j/api/models/Markdown.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Markdown { +import java.io.Serializable; +public class Markdown implements Serializable { + + private static final long serialVersionUID = -5109074296844612091L; private String html; public String getHtml() { diff --git a/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java b/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java index ca33b15f8..13ac59701 100644 --- a/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java +++ b/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java @@ -1,6 +1,9 @@ package org.gitlab4j.api.models; -public class MarkdownRequest { +import java.io.Serializable; + +public class MarkdownRequest implements Serializable { + private static final long serialVersionUID = -2437075498227228875L; 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 13f88e282..1d88164b4 100644 --- a/src/main/java/org/gitlab4j/api/models/Member.java +++ b/src/main/java/org/gitlab4j/api/models/Member.java @@ -1,12 +1,13 @@ 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 = 6492073834943264389L; private AccessLevel accessLevel; private Date expiresAt; private Identity groupSamlIdentity; diff --git a/src/main/java/org/gitlab4j/api/models/Membership.java b/src/main/java/org/gitlab4j/api/models/Membership.java index c58a8067f..9a96de8c4 100644 --- a/src/main/java/org/gitlab4j/api/models/Membership.java +++ b/src/main/java/org/gitlab4j/api/models/Membership.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Membership { +import java.io.Serializable; +public class Membership implements Serializable { + + private static final long serialVersionUID = -8141654020767145971L; private Long sourceId; private String sourceName; private MembershipSourceType sourceType; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/src/main/java/org/gitlab4j/api/models/MergeRequest.java index 614b54bff..d3f519c39 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequest.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequest.java @@ -1,15 +1,16 @@ 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 = -8455782486451129179L; private Boolean allowCollaboration; private Boolean allowMaintainerToPush; private Integer approvalsBeforeMerge; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java b/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java index a2193556f..f3f558885 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java @@ -6,6 +6,7 @@ public class MergeRequestDiff extends MergeRequestVersion { + private static final long serialVersionUID = 2764379071350671007L; 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 d463a4160..6ab999232 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 @@ 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,8 +21,9 @@ /** * 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 = -3786830402251866105L; private Long projectId; private Long groupId; private List iids; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java b/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java index 4cad740ca..9a6a287ed 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,8 +10,9 @@ /** * 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 = 3850045219649209460L; private String sourceBranch; private String targetBranch; private String title; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java b/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java index 801e9fca8..44f65cdd4 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java @@ -1,11 +1,13 @@ 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 = 445636473281738033L; private Long id; private String headCommitSha; private String baseCommitSha; diff --git a/src/main/java/org/gitlab4j/api/models/Metadata.java b/src/main/java/org/gitlab4j/api/models/Metadata.java index 2b91dd4c3..f79da601b 100644 --- a/src/main/java/org/gitlab4j/api/models/Metadata.java +++ b/src/main/java/org/gitlab4j/api/models/Metadata.java @@ -3,8 +3,11 @@ 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 = -2413547164112270863L; private String version; private String revision; private Kas kas; diff --git a/src/main/java/org/gitlab4j/api/models/Milestone.java b/src/main/java/org/gitlab4j/api/models/Milestone.java index 92ec8f368..97f82d073 100644 --- a/src/main/java/org/gitlab4j/api/models/Milestone.java +++ b/src/main/java/org/gitlab4j/api/models/Milestone.java @@ -1,13 +1,14 @@ 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 = -3404019540574604663L; private Date createdAt; private String description; @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) diff --git a/src/main/java/org/gitlab4j/api/models/Namespace.java b/src/main/java/org/gitlab4j/api/models/Namespace.java index cbdd9c48d..dcb8d0bc0 100644 --- a/src/main/java/org/gitlab4j/api/models/Namespace.java +++ b/src/main/java/org/gitlab4j/api/models/Namespace.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Namespace { +import java.io.Serializable; +public class Namespace implements Serializable { + + private static final long serialVersionUID = -393233581749936360L; private Long id; private String name; private String path; diff --git a/src/main/java/org/gitlab4j/api/models/Note.java b/src/main/java/org/gitlab4j/api/models/Note.java index aad1244b5..b3e178d79 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 = 4604942317413087367L; /** 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 f51e1026d..83c396a7a 100644 --- a/src/main/java/org/gitlab4j/api/models/NotificationSettings.java +++ b/src/main/java/org/gitlab4j/api/models/NotificationSettings.java @@ -1,12 +1,15 @@ 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 implements Serializable { -public class NotificationSettings { + private static final long serialVersionUID = -3034906823726990473L; /** Notification level */ public static enum Level { @@ -31,8 +34,8 @@ public String toString() { } } - public static class Events { - + public static class Events implements Serializable { + private static final long serialVersionUID = -7779451561897706339L; private Boolean newNote; private Boolean newIssue; private Boolean reopenIssue; @@ -180,4 +183,4 @@ public void setEvents(Events events) { 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 3b30e0c87..e0fe32999 100644 --- a/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java +++ b/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java @@ -1,7 +1,10 @@ package org.gitlab4j.api.models; -public class OauthTokenResponse { +import java.io.Serializable; +public class OauthTokenResponse implements Serializable { + + private static final long serialVersionUID = -6243821985046243075L; private String accessToken; private String tokenType; private String refreshToken; diff --git a/src/main/java/org/gitlab4j/api/models/Owner.java b/src/main/java/org/gitlab4j/api/models/Owner.java index 441666fdb..a849d43f1 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 = -773695148516560415L; } diff --git a/src/main/java/org/gitlab4j/api/models/Package.java b/src/main/java/org/gitlab4j/api/models/Package.java index 62efb7d8a..3fd04a639 100644 --- a/src/main/java/org/gitlab4j/api/models/Package.java +++ b/src/main/java/org/gitlab4j/api/models/Package.java @@ -1,11 +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 = 5889634044963420636L; private Long id; private String name; private String version; @@ -56,4 +57,4 @@ public void setCreatedAt(Date createdAt) { public String toString() { return (JacksonJson.toJsonString(this)); } -} \ No newline at end of file +} diff --git a/src/main/java/org/gitlab4j/api/models/PackageFilter.java b/src/main/java/org/gitlab4j/api/models/PackageFilter.java index 36a5b18eb..4a7e0c8e7 100644 --- a/src/main/java/org/gitlab4j/api/models/PackageFilter.java +++ b/src/main/java/org/gitlab4j/api/models/PackageFilter.java @@ -1,15 +1,18 @@ 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 = 7975549027581667807L; private Boolean excludeSubgroups; private PackageOrderBy orderBy; private SortOrder sort; diff --git a/src/main/java/org/gitlab4j/api/models/Participant.java b/src/main/java/org/gitlab4j/api/models/Participant.java index 83ac5b526..0b7232ee5 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 = 1914253800296547441L; +} diff --git a/src/main/java/org/gitlab4j/api/models/Permissions.java b/src/main/java/org/gitlab4j/api/models/Permissions.java index cbc561307..1c0de4933 100644 --- a/src/main/java/org/gitlab4j/api/models/Permissions.java +++ b/src/main/java/org/gitlab4j/api/models/Permissions.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Permissions { +import java.io.Serializable; +public class Permissions implements Serializable { + + private static final long serialVersionUID = -2395045236486663658L; private ProjectAccess projectAccess; private ProjectAccess groupAccess; diff --git a/src/main/java/org/gitlab4j/api/models/PipelineFilter.java b/src/main/java/org/gitlab4j/api/models/PipelineFilter.java index a149ba881..c8553a6db 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 = 578235335955620140L; /** {@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 56bb96960..606fe3f31 100644 --- a/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java +++ b/src/main/java/org/gitlab4j/api/models/PipelineSchedule.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 PipelineSchedule { +public class PipelineSchedule implements Serializable { + private static final long serialVersionUID = -4141121642006352696L; private Long id; private String description; private String ref; diff --git a/src/main/java/org/gitlab4j/api/models/Position.java b/src/main/java/org/gitlab4j/api/models/Position.java index 78c5b3908..e972162ee 100644 --- a/src/main/java/org/gitlab4j/api/models/Position.java +++ b/src/main/java/org/gitlab4j/api/models/Position.java @@ -1,12 +1,15 @@ 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 implements Serializable { -public class Position { + private static final long serialVersionUID = 1720468299485697338L; 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 55c9f5748..3494d7120 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.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 = 7303989372756343383L; // 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 3d35183b3..78c495d58 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectAccess.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectAccess.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class ProjectAccess { +import java.io.Serializable; +public class ProjectAccess implements Serializable { + + private static final long serialVersionUID = 2586454914563312773L; 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 1acae21e6..a5381beb5 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java @@ -5,10 +5,12 @@ 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 = -6898996649279891825L; 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 5bf887f7d..bf13cb69a 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java @@ -4,8 +4,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -public class ProjectApprovalsConfig { +import java.io.Serializable; +public class ProjectApprovalsConfig implements Serializable { + + private static final long serialVersionUID = -4377250577067837024L; private Integer approvalsBeforeMerge; private Boolean resetApprovalsOnPush; private Boolean selectiveCodeOwnerRemovals; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectFetches.java b/src/main/java/org/gitlab4j/api/models/ProjectFetches.java index 03fe2716a..c2d2c8251 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectFetches.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectFetches.java @@ -1,16 +1,19 @@ 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 { -public class ProjectFetches { + private static final long serialVersionUID = -4872633634599186529L; - public static class DateCount { + public static class DateCount implements Serializable { + private static final long serialVersionUID = 4630780820005787004L; private Integer count; @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) diff --git a/src/main/java/org/gitlab4j/api/models/ProjectFilter.java b/src/main/java/org/gitlab4j/api/models/ProjectFilter.java index 9a167c5e7..406ffb279 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectFilter.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectFilter.java @@ -1,18 +1,20 @@ 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 = 6862041481569987088L; private Boolean archived; private Visibility visibility; private ProjectOrderBy orderBy; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectGroup.java b/src/main/java/org/gitlab4j/api/models/ProjectGroup.java index b918d411c..667991a04 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 = -838653094576942075L; } diff --git a/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java b/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java index fec744748..7f631a1e6 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,8 +8,9 @@ /** * 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 = -7697389200750527944L; private String search; private AccessLevel sharedMinAccessLevel; private Boolean sharedVisibleOnly; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/src/main/java/org/gitlab4j/api/models/ProjectHook.java index 12714b3e8..df8abf699 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -1,12 +1,14 @@ 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 = 6412954444361160378L; private Boolean buildEvents; private Date createdAt; private Boolean enableSslVerification; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java b/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java index ee29511a3..3911f656a 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java @@ -3,13 +3,16 @@ 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 = -6816978423517856645L; long commitCount; long storageSize; long repositorySize; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectUser.java b/src/main/java/org/gitlab4j/api/models/ProjectUser.java index 135b96a76..cf883511e 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 = 1347677526768040078L; } diff --git a/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java b/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java index ee1958965..d4ecec351 100644 --- a/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java +++ b/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java @@ -1,12 +1,14 @@ 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 = -3008917375248933687L; private Long id; private String name; private List pushAccessLevels; diff --git a/src/main/java/org/gitlab4j/api/models/ProtectedTag.java b/src/main/java/org/gitlab4j/api/models/ProtectedTag.java index 90aa07b66..501d9277f 100644 --- a/src/main/java/org/gitlab4j/api/models/ProtectedTag.java +++ b/src/main/java/org/gitlab4j/api/models/ProtectedTag.java @@ -1,13 +1,16 @@ 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 { - public static class CreateAccessLevel { + private static final long serialVersionUID = -5721003232110747390L; + public static class CreateAccessLevel implements Serializable { + private static final long serialVersionUID = -676784576865233897L; 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 e86df7d52..f3034d070 100644 --- a/src/main/java/org/gitlab4j/api/models/PushRules.java +++ b/src/main/java/org/gitlab4j/api/models/PushRules.java @@ -1,11 +1,13 @@ 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 = 2847496850414192432L; private Long id; private Long projectId; private String commitMessageRegex; diff --git a/src/main/java/org/gitlab4j/api/models/References.java b/src/main/java/org/gitlab4j/api/models/References.java index e982f8238..721e80029 100644 --- a/src/main/java/org/gitlab4j/api/models/References.java +++ b/src/main/java/org/gitlab4j/api/models/References.java @@ -3,9 +3,12 @@ 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 = -4751755085772406441L; @JsonProperty("short") private String _short; private String relative; diff --git a/src/main/java/org/gitlab4j/api/models/RegistryRepository.java b/src/main/java/org/gitlab4j/api/models/RegistryRepository.java index bcff1b661..fc0d54697 100644 --- a/src/main/java/org/gitlab4j/api/models/RegistryRepository.java +++ b/src/main/java/org/gitlab4j/api/models/RegistryRepository.java @@ -2,10 +2,12 @@ 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 = 6871803501873513792L; private Long id; private String name; private String path; diff --git a/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java b/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java index 9365f6394..0e2a713d3 100644 --- a/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java +++ b/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java @@ -2,9 +2,11 @@ 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 = 115605545594991565L; 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 4315a1b55..4c7a5f2e6 100644 --- a/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/src/main/java/org/gitlab4j/api/models/RelatedEpic.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 RelatedEpic extends AbstractEpic { + private static final long serialVersionUID = 4735222753619924221L; private Boolean startDateIsFixed; private Boolean dueDateIsFixed; private Date dueDateFromInheritedSource; diff --git a/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java b/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java index d33f60b61..c16722d09 100644 --- a/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java +++ b/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java @@ -1,11 +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 = -5031693941135471316L; private Long id; private EpicInLink sourceEpic; private EpicInLink targetEpic; diff --git a/src/main/java/org/gitlab4j/api/models/Release.java b/src/main/java/org/gitlab4j/api/models/Release.java index 4ebbc83ec..0e2500a5a 100644 --- a/src/main/java/org/gitlab4j/api/models/Release.java +++ b/src/main/java/org/gitlab4j/api/models/Release.java @@ -1,16 +1,17 @@ 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 = 1041533230334303476L; private String name; private String tagName; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/ReleaseParams.java b/src/main/java/org/gitlab4j/api/models/ReleaseParams.java index 5ed81cb16..3227803ed 100644 --- a/src/main/java/org/gitlab4j/api/models/ReleaseParams.java +++ b/src/main/java/org/gitlab4j/api/models/ReleaseParams.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 ReleaseParams { +public class ReleaseParams implements Serializable { + private static final long serialVersionUID = -538304941926811318L; private String name; private String tagName; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/RemoteMirror.java b/src/main/java/org/gitlab4j/api/models/RemoteMirror.java index 7f8d38840..7f283d7cf 100644 --- a/src/main/java/org/gitlab4j/api/models/RemoteMirror.java +++ b/src/main/java/org/gitlab4j/api/models/RemoteMirror.java @@ -1,11 +1,13 @@ 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 = 3263293943076925633L; private Long id; private Boolean enabled; private String lastError; diff --git a/src/main/java/org/gitlab4j/api/models/Repository.java b/src/main/java/org/gitlab4j/api/models/Repository.java index 5265b99e3..c67759dc6 100644 --- a/src/main/java/org/gitlab4j/api/models/Repository.java +++ b/src/main/java/org/gitlab4j/api/models/Repository.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Repository { +import java.io.Serializable; +public class Repository implements Serializable { + + private static final long serialVersionUID = -8079069832537320645L; private String description; private String homepage; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java index d3a05d12d..1867b6b57 100644 --- a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java +++ b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java @@ -1,15 +1,16 @@ 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 = 6844347510810856023L; private String fileName; // file name only, Ex. class.rb private String filePath; // full path to file. Ex. lib/class.rb private Integer size; @@ -103,7 +104,7 @@ public void setLastCommitId(String lastCommitId) { /** * 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 694457aa6..6c253f6b5 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 = 2476373318211531014L; } diff --git a/src/main/java/org/gitlab4j/api/models/Runner.java b/src/main/java/org/gitlab4j/api/models/Runner.java index 8e4380d98..5ac2423bb 100644 --- a/src/main/java/org/gitlab4j/api/models/Runner.java +++ b/src/main/java/org/gitlab4j/api/models/Runner.java @@ -1,13 +1,15 @@ 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 = 8396377098769240666L; private Long id; private String description; private Boolean active; diff --git a/src/main/java/org/gitlab4j/api/models/RunnerDetail.java b/src/main/java/org/gitlab4j/api/models/RunnerDetail.java index 4d3785495..da78e33fc 100644 --- a/src/main/java/org/gitlab4j/api/models/RunnerDetail.java +++ b/src/main/java/org/gitlab4j/api/models/RunnerDetail.java @@ -1,16 +1,16 @@ 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 = 7887700856425080720L; private String architecture; private String platform; private Date contactedAt; diff --git a/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java b/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java index 2d85058d8..2ec27598e 100644 --- a/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java +++ b/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java @@ -3,8 +3,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class SamlGroupLink { +import java.io.Serializable; +public class SamlGroupLink implements Serializable { + + private static final long serialVersionUID = -2373881527548802762L; private String name; private AccessLevel accessLevel; diff --git a/src/main/java/org/gitlab4j/api/models/SearchBlob.java b/src/main/java/org/gitlab4j/api/models/SearchBlob.java index 21377499b..472162fb1 100644 --- a/src/main/java/org/gitlab4j/api/models/SearchBlob.java +++ b/src/main/java/org/gitlab4j/api/models/SearchBlob.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class SearchBlob { +import java.io.Serializable; +public class SearchBlob implements Serializable { + + private static final long serialVersionUID = 5706788073342987764L; private String basename; private String data; private String filename; diff --git a/src/main/java/org/gitlab4j/api/models/SharedGroup.java b/src/main/java/org/gitlab4j/api/models/SharedGroup.java index 6aa648132..b29ba8182 100644 --- a/src/main/java/org/gitlab4j/api/models/SharedGroup.java +++ b/src/main/java/org/gitlab4j/api/models/SharedGroup.java @@ -1,13 +1,14 @@ 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 = 9147215839960756743L; private Long groupId; private String groupName; private String groupFullPath; diff --git a/src/main/java/org/gitlab4j/api/models/Snippet.java b/src/main/java/org/gitlab4j/api/models/Snippet.java index edccab187..1b4d4e822 100644 --- a/src/main/java/org/gitlab4j/api/models/Snippet.java +++ b/src/main/java/org/gitlab4j/api/models/Snippet.java @@ -23,12 +23,14 @@ 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 = -3693726269760539889L; private Author author; private Date createdAt; private Date expiresAt; diff --git a/src/main/java/org/gitlab4j/api/models/SshKey.java b/src/main/java/org/gitlab4j/api/models/SshKey.java index 2e06f641a..c072bfe0c 100644 --- a/src/main/java/org/gitlab4j/api/models/SshKey.java +++ b/src/main/java/org/gitlab4j/api/models/SshKey.java @@ -1,13 +1,14 @@ 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 = -2559632392834817632L; private Long id; private String title; private String key; diff --git a/src/main/java/org/gitlab4j/api/models/SystemHook.java b/src/main/java/org/gitlab4j/api/models/SystemHook.java index e373fd20d..02d626932 100644 --- a/src/main/java/org/gitlab4j/api/models/SystemHook.java +++ b/src/main/java/org/gitlab4j/api/models/SystemHook.java @@ -1,11 +1,13 @@ 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 = 5755753266987012078L; private Long id; private String url; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/Tag.java b/src/main/java/org/gitlab4j/api/models/Tag.java index aa1a48e73..e61cb9d5a 100644 --- a/src/main/java/org/gitlab4j/api/models/Tag.java +++ b/src/main/java/org/gitlab4j/api/models/Tag.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Tag { +import java.io.Serializable; +public class Tag implements Serializable { + + private static final long serialVersionUID = -1006308726664414044L; private Commit commit; private String message; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java b/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java index 69be9fb61..d24180f58 100644 --- a/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java +++ b/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class TaskCompletionStatus { +import java.io.Serializable; +public class TaskCompletionStatus implements Serializable { + + private static final long serialVersionUID = 2425961171229796182L; 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 cc3ed0c08..7827803b3 100644 --- a/src/main/java/org/gitlab4j/api/models/TimeStats.java +++ b/src/main/java/org/gitlab4j/api/models/TimeStats.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class TimeStats { +import java.io.Serializable; +public class TimeStats implements Serializable { + + private static final long serialVersionUID = -2557491371640747430L; private Integer timeEstimate; private Integer totalTimeSpent; private Duration humanTimeEstimate; diff --git a/src/main/java/org/gitlab4j/api/models/Todo.java b/src/main/java/org/gitlab4j/api/models/Todo.java index 69bdc5978..9bed13ea3 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,9 +8,18 @@ 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 = -1612489661279498902L; private Long id; private Project project; private Author author; diff --git a/src/main/java/org/gitlab4j/api/models/Topic.java b/src/main/java/org/gitlab4j/api/models/Topic.java index 667723ba6..f458a2cc3 100644 --- a/src/main/java/org/gitlab4j/api/models/Topic.java +++ b/src/main/java/org/gitlab4j/api/models/Topic.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Topic { +import java.io.Serializable; +public class Topic implements Serializable { + + private static final long serialVersionUID = -5509038784155015404L; private Integer id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/TopicParams.java b/src/main/java/org/gitlab4j/api/models/TopicParams.java index e3513489c..5cc03bd01 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.TopicsApi; import java.io.File; +import java.io.Serializable; /** * This class is utilized by the {@link TopicsApi#createTopic(TopicParams)} @@ -12,8 +13,9 @@ * * 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 = -2248684441661568431L; private String name; private String title; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/TreeItem.java b/src/main/java/org/gitlab4j/api/models/TreeItem.java index fe18083d2..1ef48ef09 100644 --- a/src/main/java/org/gitlab4j/api/models/TreeItem.java +++ b/src/main/java/org/gitlab4j/api/models/TreeItem.java @@ -2,7 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class TreeItem { +import java.io.Serializable; + +public class TreeItem implements Serializable { + + private static final long serialVersionUID = -6095523498844753989L; 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 f284cc091..b601aa3ee 100644 --- a/src/main/java/org/gitlab4j/api/models/Trigger.java +++ b/src/main/java/org/gitlab4j/api/models/Trigger.java @@ -1,9 +1,11 @@ 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 = -5834519760065786408L; private Long id; private String description; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/User.java b/src/main/java/org/gitlab4j/api/models/User.java index 96ca37d03..041a06b45 100644 --- a/src/main/java/org/gitlab4j/api/models/User.java +++ b/src/main/java/org/gitlab4j/api/models/User.java @@ -1,12 +1,13 @@ 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 = 5181333036356031840L; private String bio; private Boolean bot; private Boolean canCreateGroup; diff --git a/src/main/java/org/gitlab4j/api/models/Variable.java b/src/main/java/org/gitlab4j/api/models/Variable.java index af1378d48..7c4622f12 100644 --- a/src/main/java/org/gitlab4j/api/models/Variable.java +++ b/src/main/java/org/gitlab4j/api/models/Variable.java @@ -1,17 +1,19 @@ package org.gitlab4j.api.models; +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; -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; +public class Variable implements Serializable { -public class Variable { + private static final long serialVersionUID = 5873211613037430191L; /** * 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 36d940f13..c9c1a17af 100644 --- a/src/main/java/org/gitlab4j/api/models/Version.java +++ b/src/main/java/org/gitlab4j/api/models/Version.java @@ -2,8 +2,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class Version { +import java.io.Serializable; +public class Version implements Serializable { + + private static final long serialVersionUID = 7123100394598007342L; 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 4bccb691e..9c70cd463 100644 --- a/src/main/java/org/gitlab4j/api/models/WikiAttachment.java +++ b/src/main/java/org/gitlab4j/api/models/WikiAttachment.java @@ -2,25 +2,29 @@ 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 = -7916180068718971133L; + + public static class Link implements Serializable { + private static final long serialVersionUID = -5037434183307088155L; private String url; private String markdown; 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 b274796b1..9233b2905 100644 --- a/src/main/java/org/gitlab4j/api/models/WikiPage.java +++ b/src/main/java/org/gitlab4j/api/models/WikiPage.java @@ -25,8 +25,11 @@ import org.gitlab4j.api.utils.JacksonJson; -public class WikiPage { +import java.io.Serializable; +public class WikiPage implements Serializable { + + private static final long serialVersionUID = 1105471433119053382L; private String title; private String content; private String slug; From 6e673fe490777b3bb6b9d226f2f52a696c1443d4 Mon Sep 17 00:00:00 2001 From: nilchina Date: Wed, 20 Dec 2023 15:22:12 +0800 Subject: [PATCH 2/5] The class under models package implements serializable interface to support native image(GraalVM). --- src/main/java/org/gitlab4j/api/models/ImportStatus.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab4j/api/models/ImportStatus.java b/src/main/java/org/gitlab4j/api/models/ImportStatus.java index dc731e380..16a4ba352 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 com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -public class ImportStatus { +public class ImportStatus implements Serializable { + private static final long serialVersionUID = -5437477855918094477L; /** * Enum representing the status of the import. From 03ebe1e2f7c4cee00d432fd74849aa1b4cde839b Mon Sep 17 00:00:00 2001 From: nilchina Date: Wed, 20 Dec 2023 17:10:07 +0800 Subject: [PATCH 3/5] The class under models package implements serializable interface to support native image(GraalVM). --- src/main/java/org/gitlab4j/api/models/ProjectFetches.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/models/ProjectFetches.java b/src/main/java/org/gitlab4j/api/models/ProjectFetches.java index c2d2c8251..fa0124d67 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectFetches.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectFetches.java @@ -36,8 +36,8 @@ public void setDate(Date date) { } } - public static class Fetches { - + public static class Fetches implements Serializable { + private static final long serialVersionUID = 4630780820005787008L; private Integer total; private List days; From 70cb8d3818fedea56642cf2e45fc49e0b5e3c7c2 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Wed, 20 Dec 2023 15:20:16 +0100 Subject: [PATCH 4/5] Set serialVersionUID to "1L" everywhere --- src/main/java/org/gitlab4j/api/GitLabApiException.java | 2 +- src/main/java/org/gitlab4j/api/models/AbstractEpic.java | 2 +- src/main/java/org/gitlab4j/api/models/AbstractGroup.java | 3 ++- src/main/java/org/gitlab4j/api/models/AbstractIssue.java | 5 +++-- .../org/gitlab4j/api/models/AbstractMinimalEpic.java | 3 ++- src/main/java/org/gitlab4j/api/models/AbstractUser.java | 3 ++- .../gitlab4j/api/models/AcceptMergeRequestParams.java | 3 ++- src/main/java/org/gitlab4j/api/models/AccessRequest.java | 3 ++- src/main/java/org/gitlab4j/api/models/AllowedTo.java | 3 ++- src/main/java/org/gitlab4j/api/models/Application.java | 3 ++- .../org/gitlab4j/api/models/ApplicationSettings.java | 3 ++- src/main/java/org/gitlab4j/api/models/ApprovalRule.java | 3 ++- .../java/org/gitlab4j/api/models/ApprovalRuleParams.java | 3 ++- src/main/java/org/gitlab4j/api/models/ApprovalState.java | 3 ++- src/main/java/org/gitlab4j/api/models/ApprovedBy.java | 3 ++- src/main/java/org/gitlab4j/api/models/Artifact.java | 2 +- src/main/java/org/gitlab4j/api/models/ArtifactsFile.java | 3 ++- src/main/java/org/gitlab4j/api/models/Assets.java | 8 +++++--- src/main/java/org/gitlab4j/api/models/Assignee.java | 2 +- src/main/java/org/gitlab4j/api/models/AuditEvent.java | 3 ++- .../java/org/gitlab4j/api/models/AuditEventDetail.java | 3 ++- src/main/java/org/gitlab4j/api/models/Author.java | 2 +- src/main/java/org/gitlab4j/api/models/AwardEmoji.java | 2 +- src/main/java/org/gitlab4j/api/models/Badge.java | 2 +- src/main/java/org/gitlab4j/api/models/Blame.java | 3 ++- src/main/java/org/gitlab4j/api/models/Board.java | 3 ++- src/main/java/org/gitlab4j/api/models/BoardList.java | 3 ++- src/main/java/org/gitlab4j/api/models/Branch.java | 3 ++- .../java/org/gitlab4j/api/models/BranchAccessLevel.java | 3 ++- src/main/java/org/gitlab4j/api/models/Bridge.java | 3 ++- .../java/org/gitlab4j/api/models/ChangelogPayload.java | 3 ++- src/main/java/org/gitlab4j/api/models/Changes.java | 3 ++- src/main/java/org/gitlab4j/api/models/ChildEpic.java | 2 +- src/main/java/org/gitlab4j/api/models/Comment.java | 3 ++- src/main/java/org/gitlab4j/api/models/Commit.java | 3 ++- src/main/java/org/gitlab4j/api/models/CommitAction.java | 2 +- src/main/java/org/gitlab4j/api/models/CommitPayload.java | 3 ++- src/main/java/org/gitlab4j/api/models/CommitRef.java | 3 ++- src/main/java/org/gitlab4j/api/models/CommitStats.java | 3 ++- src/main/java/org/gitlab4j/api/models/CommitStatus.java | 3 ++- .../java/org/gitlab4j/api/models/CommitStatusFilter.java | 3 ++- .../java/org/gitlab4j/api/models/CompareResults.java | 3 ++- src/main/java/org/gitlab4j/api/models/Contributor.java | 3 ++- .../java/org/gitlab4j/api/models/CreatedChildEpic.java | 3 ++- .../java/org/gitlab4j/api/models/CustomAttribute.java | 3 ++- src/main/java/org/gitlab4j/api/models/DeployKey.java | 3 ++- src/main/java/org/gitlab4j/api/models/DeployToken.java | 3 ++- src/main/java/org/gitlab4j/api/models/Deployable.java | 3 ++- src/main/java/org/gitlab4j/api/models/Deployment.java | 3 ++- .../java/org/gitlab4j/api/models/DeploymentFilter.java | 3 ++- .../java/org/gitlab4j/api/models/DetailedStatus.java | 3 ++- src/main/java/org/gitlab4j/api/models/Diff.java | 3 ++- src/main/java/org/gitlab4j/api/models/DiffRef.java | 3 ++- src/main/java/org/gitlab4j/api/models/Discussion.java | 3 ++- .../java/org/gitlab4j/api/models/DownstreamPipeline.java | 3 ++- src/main/java/org/gitlab4j/api/models/Duration.java | 3 ++- src/main/java/org/gitlab4j/api/models/Email.java | 3 ++- src/main/java/org/gitlab4j/api/models/Environment.java | 2 +- src/main/java/org/gitlab4j/api/models/Epic.java | 3 ++- src/main/java/org/gitlab4j/api/models/EpicFilter.java | 3 ++- src/main/java/org/gitlab4j/api/models/EpicInLink.java | 2 +- src/main/java/org/gitlab4j/api/models/EpicIssueLink.java | 3 ++- src/main/java/org/gitlab4j/api/models/Event.java | 3 ++- src/main/java/org/gitlab4j/api/models/EventData.java | 3 ++- src/main/java/org/gitlab4j/api/models/ExportStatus.java | 2 +- .../org/gitlab4j/api/models/ExternalStatusCheck.java | 3 ++- .../api/models/ExternalStatusCheckProtectedBranch.java | 3 ++- .../gitlab4j/api/models/ExternalStatusCheckResult.java | 3 ++- .../gitlab4j/api/models/ExternalStatusCheckStatus.java | 3 ++- src/main/java/org/gitlab4j/api/models/FileUpload.java | 3 ++- .../java/org/gitlab4j/api/models/GitLabCiTemplate.java | 3 ++- .../org/gitlab4j/api/models/GitLabCiTemplateElement.java | 3 ++- src/main/java/org/gitlab4j/api/models/GpgSignature.java | 2 +- src/main/java/org/gitlab4j/api/models/Group.java | 3 +-- .../java/org/gitlab4j/api/models/GroupAccessToken.java | 3 ++- src/main/java/org/gitlab4j/api/models/GroupFilter.java | 2 +- src/main/java/org/gitlab4j/api/models/GroupParams.java | 3 +-- .../org/gitlab4j/api/models/GroupProjectsFilter.java | 2 +- .../java/org/gitlab4j/api/models/HealthCheckInfo.java | 2 +- .../java/org/gitlab4j/api/models/HealthCheckItem.java | 3 ++- src/main/java/org/gitlab4j/api/models/Identity.java | 2 +- .../java/org/gitlab4j/api/models/ImpersonationToken.java | 2 +- src/main/java/org/gitlab4j/api/models/ImportStatus.java | 2 +- src/main/java/org/gitlab4j/api/models/Issue.java | 2 +- src/main/java/org/gitlab4j/api/models/IssueEvent.java | 2 +- src/main/java/org/gitlab4j/api/models/IssueFilter.java | 2 +- src/main/java/org/gitlab4j/api/models/IssueLink.java | 2 +- .../java/org/gitlab4j/api/models/IssuesStatistics.java | 8 +++++--- .../org/gitlab4j/api/models/IssuesStatisticsFilter.java | 2 +- src/main/java/org/gitlab4j/api/models/Iteration.java | 2 +- .../java/org/gitlab4j/api/models/IterationFilter.java | 3 +-- src/main/java/org/gitlab4j/api/models/Job.java | 2 +- src/main/java/org/gitlab4j/api/models/JobAttribute.java | 2 +- src/main/java/org/gitlab4j/api/models/JobAttributes.java | 2 +- src/main/java/org/gitlab4j/api/models/Key.java | 3 ++- src/main/java/org/gitlab4j/api/models/Label.java | 2 +- src/main/java/org/gitlab4j/api/models/LabelEvent.java | 3 +-- src/main/java/org/gitlab4j/api/models/LdapGroupLink.java | 2 +- src/main/java/org/gitlab4j/api/models/License.java | 2 +- .../java/org/gitlab4j/api/models/LicenseTemplate.java | 2 +- src/main/java/org/gitlab4j/api/models/Link.java | 6 +++--- src/main/java/org/gitlab4j/api/models/Markdown.java | 2 +- .../java/org/gitlab4j/api/models/MarkdownRequest.java | 3 ++- src/main/java/org/gitlab4j/api/models/Member.java | 2 +- src/main/java/org/gitlab4j/api/models/Membership.java | 2 +- src/main/java/org/gitlab4j/api/models/MergeRequest.java | 2 +- .../java/org/gitlab4j/api/models/MergeRequestDiff.java | 2 +- .../java/org/gitlab4j/api/models/MergeRequestFilter.java | 2 +- .../java/org/gitlab4j/api/models/MergeRequestParams.java | 2 +- .../org/gitlab4j/api/models/MergeRequestVersion.java | 2 +- src/main/java/org/gitlab4j/api/models/Metadata.java | 2 +- src/main/java/org/gitlab4j/api/models/Milestone.java | 2 +- src/main/java/org/gitlab4j/api/models/Namespace.java | 2 +- src/main/java/org/gitlab4j/api/models/Note.java | 2 +- .../org/gitlab4j/api/models/NotificationSettings.java | 6 +++--- .../java/org/gitlab4j/api/models/OauthTokenResponse.java | 2 +- src/main/java/org/gitlab4j/api/models/Owner.java | 2 +- src/main/java/org/gitlab4j/api/models/Package.java | 3 ++- src/main/java/org/gitlab4j/api/models/PackageFile.java | 4 +++- src/main/java/org/gitlab4j/api/models/PackageFilter.java | 2 +- src/main/java/org/gitlab4j/api/models/Participant.java | 2 +- src/main/java/org/gitlab4j/api/models/Permissions.java | 2 +- src/main/java/org/gitlab4j/api/models/Pipeline.java | 4 +++- .../java/org/gitlab4j/api/models/PipelineFilter.java | 2 +- .../java/org/gitlab4j/api/models/PipelineSchedule.java | 2 +- src/main/java/org/gitlab4j/api/models/Position.java | 3 +-- src/main/java/org/gitlab4j/api/models/Project.java | 2 +- src/main/java/org/gitlab4j/api/models/ProjectAccess.java | 2 +- .../java/org/gitlab4j/api/models/ProjectAccessToken.java | 3 ++- .../org/gitlab4j/api/models/ProjectApprovalsConfig.java | 2 +- .../java/org/gitlab4j/api/models/ProjectFetches.java | 9 +++++---- src/main/java/org/gitlab4j/api/models/ProjectFilter.java | 2 +- src/main/java/org/gitlab4j/api/models/ProjectGroup.java | 2 +- .../org/gitlab4j/api/models/ProjectGroupsFilter.java | 2 +- src/main/java/org/gitlab4j/api/models/ProjectHook.java | 2 +- .../java/org/gitlab4j/api/models/ProjectStatistics.java | 2 +- src/main/java/org/gitlab4j/api/models/ProjectUser.java | 2 +- .../java/org/gitlab4j/api/models/ProtectedBranch.java | 2 +- src/main/java/org/gitlab4j/api/models/ProtectedTag.java | 6 +++--- src/main/java/org/gitlab4j/api/models/PushRules.java | 2 +- src/main/java/org/gitlab4j/api/models/References.java | 2 +- .../java/org/gitlab4j/api/models/RegistryRepository.java | 2 +- .../org/gitlab4j/api/models/RegistryRepositoryTag.java | 3 ++- src/main/java/org/gitlab4j/api/models/RelatedEpic.java | 2 +- .../java/org/gitlab4j/api/models/RelatedEpicLink.java | 3 ++- src/main/java/org/gitlab4j/api/models/Release.java | 2 +- src/main/java/org/gitlab4j/api/models/ReleaseParams.java | 2 +- src/main/java/org/gitlab4j/api/models/RemoteMirror.java | 2 +- src/main/java/org/gitlab4j/api/models/Repository.java | 2 +- .../java/org/gitlab4j/api/models/RepositoryFile.java | 2 +- src/main/java/org/gitlab4j/api/models/Reviewer.java | 2 +- src/main/java/org/gitlab4j/api/models/Runner.java | 2 +- src/main/java/org/gitlab4j/api/models/RunnerDetail.java | 2 +- src/main/java/org/gitlab4j/api/models/SamlGroupLink.java | 2 +- src/main/java/org/gitlab4j/api/models/SearchBlob.java | 2 +- src/main/java/org/gitlab4j/api/models/SharedGroup.java | 2 +- src/main/java/org/gitlab4j/api/models/Snippet.java | 2 +- src/main/java/org/gitlab4j/api/models/SshKey.java | 2 +- src/main/java/org/gitlab4j/api/models/SystemHook.java | 2 +- src/main/java/org/gitlab4j/api/models/Tag.java | 2 +- .../org/gitlab4j/api/models/TaskCompletionStatus.java | 2 +- src/main/java/org/gitlab4j/api/models/TimeStats.java | 2 +- src/main/java/org/gitlab4j/api/models/Todo.java | 2 +- src/main/java/org/gitlab4j/api/models/Topic.java | 2 +- src/main/java/org/gitlab4j/api/models/TopicParams.java | 2 +- src/main/java/org/gitlab4j/api/models/TreeItem.java | 3 +-- src/main/java/org/gitlab4j/api/models/Trigger.java | 2 +- src/main/java/org/gitlab4j/api/models/User.java | 2 +- src/main/java/org/gitlab4j/api/models/Variable.java | 3 +-- src/main/java/org/gitlab4j/api/models/Version.java | 2 +- .../java/org/gitlab4j/api/models/WikiAttachment.java | 6 +++--- src/main/java/org/gitlab4j/api/models/WikiPage.java | 2 +- .../org/gitlab4j/api/services/NotificationService.java | 4 +++- .../java/org/gitlab4j/api/services/SlackService.java | 3 ++- .../gitlab4j/api/webhook/ExternalStatusCheckEvent.java | 4 +++- 175 files changed, 272 insertions(+), 198 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/GitLabApiException.java b/src/main/java/org/gitlab4j/api/GitLabApiException.java index b8faeff70..084ebb443 100755 --- a/src/main/java/org/gitlab4j/api/GitLabApiException.java +++ b/src/main/java/org/gitlab4j/api/GitLabApiException.java @@ -22,8 +22,8 @@ * 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 f52d49cad..61ff3dec7 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -13,7 +13,7 @@ import java.util.Map; public class AbstractEpic> extends AbstractMinimalEpic implements Serializable { - private static final long serialVersionUID = 8802254258764033205L; + private static final long serialVersionUID = 1L; public enum EpicState { OPENED, CLOSED, ALL; diff --git a/src/main/java/org/gitlab4j/api/models/AbstractGroup.java b/src/main/java/org/gitlab4j/api/models/AbstractGroup.java index 235a57ef5..c4def6fb5 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractGroup.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractGroup.java @@ -8,7 +8,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public abstract class AbstractGroup> implements Serializable { - private static final long serialVersionUID = 2616198272324179140L; + private static final long serialVersionUID = 1L; + private Long id; private String name; private String avatarUrl; diff --git a/src/main/java/org/gitlab4j/api/models/AbstractIssue.java b/src/main/java/org/gitlab4j/api/models/AbstractIssue.java index ca1e90ad9..ab096d03e 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractIssue.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractIssue.java @@ -15,10 +15,11 @@ import java.util.List; public abstract class AbstractIssue implements Serializable { - private static final long serialVersionUID = -9116273927092802149L; + private static final long serialVersionUID = 1L; public static class TaskCompletionStatus implements Serializable { - private static final long serialVersionUID = -7685544544331694460L; + 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 53976ae95..8861058ae 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class AbstractMinimalEpic> implements Serializable { - private static final long serialVersionUID = -1988058935141973607L; + private static final long serialVersionUID = 1L; + private Long id; private Long iid; private Long groupId; diff --git a/src/main/java/org/gitlab4j/api/models/AbstractUser.java b/src/main/java/org/gitlab4j/api/models/AbstractUser.java index 9646cd6c4..f4d72b183 100644 --- a/src/main/java/org/gitlab4j/api/models/AbstractUser.java +++ b/src/main/java/org/gitlab4j/api/models/AbstractUser.java @@ -8,7 +8,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public abstract class AbstractUser> implements Serializable { - private static final long serialVersionUID = -9021980908269047845L; + private static final long serialVersionUID = 1L; + private String avatarUrl; private Date createdAt; private String email; diff --git a/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java b/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java index 086101dcb..d2f5ae164 100644 --- a/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java +++ b/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class AcceptMergeRequestParams implements Serializable { - private static final long serialVersionUID = -2261999999404292928L; + private static final long serialVersionUID = 1L; + private String mergeCommitMessage; private Boolean mergeWhenPipelineSucceeds; private String sha; diff --git a/src/main/java/org/gitlab4j/api/models/AccessRequest.java b/src/main/java/org/gitlab4j/api/models/AccessRequest.java index 62916ade5..6167e2fbe 100644 --- a/src/main/java/org/gitlab4j/api/models/AccessRequest.java +++ b/src/main/java/org/gitlab4j/api/models/AccessRequest.java @@ -3,7 +3,8 @@ import java.util.Date; public class AccessRequest extends AbstractUser { - private static final long serialVersionUID = 4063392072771491788L; + 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 38b9d7bfd..9a63ae11f 100644 --- a/src/main/java/org/gitlab4j/api/models/AllowedTo.java +++ b/src/main/java/org/gitlab4j/api/models/AllowedTo.java @@ -9,7 +9,8 @@ * allowed_to_push, allowed_to_merge, and allowed_to_unprotect values. */ public class AllowedTo implements Serializable { - private static final long serialVersionUID = -2912839174502977874L; + private static final long serialVersionUID = 1L; + private AccessLevel accessLevel; private Long userId; private Long groupId; diff --git a/src/main/java/org/gitlab4j/api/models/Application.java b/src/main/java/org/gitlab4j/api/models/Application.java index 4b7006202..8550c2664 100644 --- a/src/main/java/org/gitlab4j/api/models/Application.java +++ b/src/main/java/org/gitlab4j/api/models/Application.java @@ -3,7 +3,8 @@ import java.io.Serializable; public class Application implements Serializable { - private static final long serialVersionUID = -3074887863851381131L; + private static final long serialVersionUID = 1L; + private Long id; private String applicationId; private String applicationName; diff --git a/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java b/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java index a185b8e4d..9d3c33ac2 100644 --- a/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java +++ b/src/main/java/org/gitlab4j/api/models/ApplicationSettings.java @@ -19,7 +19,8 @@ import com.fasterxml.jackson.databind.node.TextNode; public class ApplicationSettings implements Serializable { - private static final long serialVersionUID = -4830677378866003355L; + private static final long serialVersionUID = 1L; + private Long id; private Date createdAt; private Date updatedAt; diff --git a/src/main/java/org/gitlab4j/api/models/ApprovalRule.java b/src/main/java/org/gitlab4j/api/models/ApprovalRule.java index 6328a2a07..d6593dd31 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovalRule.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovalRule.java @@ -6,7 +6,8 @@ import java.util.List; public class ApprovalRule implements Serializable { - private static final long serialVersionUID = -5607473655312877909L; + private static final long serialVersionUID = 1L; + private Long id; private String name; private String ruleType; diff --git a/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java b/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java index 8c91df038..310f18724 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovalRuleParams.java @@ -6,7 +6,8 @@ import org.gitlab4j.api.GitLabApiForm; public class ApprovalRuleParams implements Serializable { - private static final long serialVersionUID = -1656517377374411043L; + private static final long serialVersionUID = 1L; + private Integer approvalsRequired; private String name; private Boolean appliesToAllProtectedBranches; diff --git a/src/main/java/org/gitlab4j/api/models/ApprovalState.java b/src/main/java/org/gitlab4j/api/models/ApprovalState.java index 706933752..29f81b3eb 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovalState.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovalState.java @@ -6,7 +6,8 @@ import java.util.List; public class ApprovalState implements Serializable { - private static final long serialVersionUID = -3848509790629188218L; + 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 0abeb6cc0..4270569ac 100644 --- a/src/main/java/org/gitlab4j/api/models/ApprovedBy.java +++ b/src/main/java/org/gitlab4j/api/models/ApprovedBy.java @@ -13,7 +13,8 @@ * @since 4.19.0 */ public class ApprovedBy implements Serializable { - private static final long serialVersionUID = 7527083171275917542L; + 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 26be34288..7378019c6 100644 --- a/src/main/java/org/gitlab4j/api/models/Artifact.java +++ b/src/main/java/org/gitlab4j/api/models/Artifact.java @@ -8,7 +8,7 @@ import java.io.Serializable; public class Artifact implements Serializable { - private static final long serialVersionUID = 4700314154831526606L; + 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 9ba18d868..b52851ee6 100644 --- a/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java +++ b/src/main/java/org/gitlab4j/api/models/ArtifactsFile.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class ArtifactsFile implements Serializable { - private static final long serialVersionUID = -6852156410785558385L; + 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 d563e1696..ee9250932 100644 --- a/src/main/java/org/gitlab4j/api/models/Assets.java +++ b/src/main/java/org/gitlab4j/api/models/Assets.java @@ -10,10 +10,11 @@ * This class is part of the Release class model. */ public class Assets implements Serializable { - private static final long serialVersionUID = 2384144246830837990L; + private static final long serialVersionUID = 1L; public static class Source implements Serializable { - private static final long serialVersionUID = 3024534253186638188L; + private static final long serialVersionUID = 1L; + private ArchiveFormat format; private String url; @@ -40,7 +41,8 @@ public String toString() { } public static class Link implements Serializable { - private static final long serialVersionUID = -2722442615226967526L; + private static final long serialVersionUID = 1L; + private Long id; private String name; private String url; diff --git a/src/main/java/org/gitlab4j/api/models/Assignee.java b/src/main/java/org/gitlab4j/api/models/Assignee.java index b6d5b4850..b1017db51 100644 --- a/src/main/java/org/gitlab4j/api/models/Assignee.java +++ b/src/main/java/org/gitlab4j/api/models/Assignee.java @@ -4,7 +4,7 @@ import org.gitlab4j.api.utils.JacksonJson; public class Assignee extends AbstractUser { - private static final long serialVersionUID = -2458251622117638839L; + 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 0cbc25478..1d5999071 100644 --- a/src/main/java/org/gitlab4j/api/models/AuditEvent.java +++ b/src/main/java/org/gitlab4j/api/models/AuditEvent.java @@ -7,7 +7,8 @@ import java.util.Date; public class AuditEvent implements Serializable { - private static final long serialVersionUID = 1361335380835271609L; + private static final long serialVersionUID = 1L; + private Long id; private Long authorId; private Long entityId; diff --git a/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java b/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java index e38772df2..4769c4ac5 100644 --- a/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java +++ b/src/main/java/org/gitlab4j/api/models/AuditEventDetail.java @@ -6,7 +6,8 @@ import java.io.Serializable; public class AuditEventDetail implements Serializable { - private static final long serialVersionUID = -407430313828885637L; + private static final long serialVersionUID = 1L; + private String change; private String from; private String to; diff --git a/src/main/java/org/gitlab4j/api/models/Author.java b/src/main/java/org/gitlab4j/api/models/Author.java index dea9aa314..8cba63c02 100644 --- a/src/main/java/org/gitlab4j/api/models/Author.java +++ b/src/main/java/org/gitlab4j/api/models/Author.java @@ -2,5 +2,5 @@ package org.gitlab4j.api.models; public class Author extends AbstractUser { - private static final long serialVersionUID = -4899398408742861106L; + 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 65290c1cb..3b0ce9de3 100644 --- a/src/main/java/org/gitlab4j/api/models/AwardEmoji.java +++ b/src/main/java/org/gitlab4j/api/models/AwardEmoji.java @@ -10,7 +10,7 @@ import java.util.Date; public class AwardEmoji implements Serializable { - private static final long serialVersionUID = -1425405876922309702L; + 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 0b5854658..dd4404a76 100644 --- a/src/main/java/org/gitlab4j/api/models/Badge.java +++ b/src/main/java/org/gitlab4j/api/models/Badge.java @@ -8,7 +8,7 @@ import java.io.Serializable; public class Badge implements Serializable { - private static final long serialVersionUID = -4358146293064711740L; + 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 ba49421b4..348209078 100644 --- a/src/main/java/org/gitlab4j/api/models/Blame.java +++ b/src/main/java/org/gitlab4j/api/models/Blame.java @@ -6,7 +6,8 @@ import java.util.List; public class Blame implements Serializable { - private static final long serialVersionUID = -7605541188039758092L; + 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 67f4d30b8..673cabb46 100644 --- a/src/main/java/org/gitlab4j/api/models/Board.java +++ b/src/main/java/org/gitlab4j/api/models/Board.java @@ -6,7 +6,8 @@ import java.util.List; public class Board implements Serializable { - private static final long serialVersionUID = 2774787747056305357L; + private static final long serialVersionUID = 1L; + private Long id; private String name; private Project project; diff --git a/src/main/java/org/gitlab4j/api/models/BoardList.java b/src/main/java/org/gitlab4j/api/models/BoardList.java index 73dc13934..27528a5f2 100644 --- a/src/main/java/org/gitlab4j/api/models/BoardList.java +++ b/src/main/java/org/gitlab4j/api/models/BoardList.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class BoardList implements Serializable { - private static final long serialVersionUID = 1576257929374124267L; + private static final long serialVersionUID = 1L; + private Long id; private Label label; private Integer position; diff --git a/src/main/java/org/gitlab4j/api/models/Branch.java b/src/main/java/org/gitlab4j/api/models/Branch.java index 8b3ce0189..83dcef1fd 100644 --- a/src/main/java/org/gitlab4j/api/models/Branch.java +++ b/src/main/java/org/gitlab4j/api/models/Branch.java @@ -6,7 +6,8 @@ import java.io.Serializable; public class Branch implements Serializable { - private static final long serialVersionUID = -8581563271712199201L; + private static final long serialVersionUID = 1L; + private Commit commit; private Boolean developersCanMerge; private Boolean developersCanPush; diff --git a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java index 2f1e1c170..643338a62 100644 --- a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java +++ b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class BranchAccessLevel implements Serializable { - private static final long serialVersionUID = 5766241722141581577L; + private static final long serialVersionUID = 1L; + private Long id; private AccessLevel accessLevel; private String accessLevelDescription; diff --git a/src/main/java/org/gitlab4j/api/models/Bridge.java b/src/main/java/org/gitlab4j/api/models/Bridge.java index a5483bdf9..5ea56e033 100644 --- a/src/main/java/org/gitlab4j/api/models/Bridge.java +++ b/src/main/java/org/gitlab4j/api/models/Bridge.java @@ -6,7 +6,8 @@ import java.util.Date; public class Bridge implements Serializable { - private static final long serialVersionUID = 2971883600795290448L; + 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 04aee43e2..a8fe742b5 100644 --- a/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java +++ b/src/main/java/org/gitlab4j/api/models/ChangelogPayload.java @@ -9,7 +9,8 @@ import java.util.Date; public class ChangelogPayload implements Serializable { - private static final long serialVersionUID = -4430138739965401359L; + private static final long serialVersionUID = 1L; + private String version; private String from; private String to; diff --git a/src/main/java/org/gitlab4j/api/models/Changes.java b/src/main/java/org/gitlab4j/api/models/Changes.java index f3051bb79..740264698 100644 --- a/src/main/java/org/gitlab4j/api/models/Changes.java +++ b/src/main/java/org/gitlab4j/api/models/Changes.java @@ -7,7 +7,8 @@ import java.io.Serializable; public class Changes implements Serializable { - private static final long serialVersionUID = -1777640937801508683L; + private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("a_mode") private String 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 bade38699..4c066444f 100644 --- a/src/main/java/org/gitlab4j/api/models/ChildEpic.java +++ b/src/main/java/org/gitlab4j/api/models/ChildEpic.java @@ -3,7 +3,7 @@ import org.gitlab4j.api.utils.JacksonJson; public class ChildEpic extends AbstractEpic { - private static final long serialVersionUID = 3423897732994265591L; + 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 92b2d10f3..75c682194 100644 --- a/src/main/java/org/gitlab4j/api/models/Comment.java +++ b/src/main/java/org/gitlab4j/api/models/Comment.java @@ -7,7 +7,8 @@ import java.util.Date; public class Comment implements Serializable { - private static final long serialVersionUID = 1917643760458643525L; + private static final long serialVersionUID = 1L; + private Author author; private Date createdAt; private LineType lineType; diff --git a/src/main/java/org/gitlab4j/api/models/Commit.java b/src/main/java/org/gitlab4j/api/models/Commit.java index 0ab273c22..d63288ae9 100644 --- a/src/main/java/org/gitlab4j/api/models/Commit.java +++ b/src/main/java/org/gitlab4j/api/models/Commit.java @@ -8,7 +8,8 @@ import java.util.List; public class Commit implements Serializable { - private static final long serialVersionUID = -5309295947818195004L; + private static final long serialVersionUID = 1L; + private Author author; private Date authoredDate; private String authorEmail; diff --git a/src/main/java/org/gitlab4j/api/models/CommitAction.java b/src/main/java/org/gitlab4j/api/models/CommitAction.java index 734fe6b6d..54e936868 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitAction.java +++ b/src/main/java/org/gitlab4j/api/models/CommitAction.java @@ -13,7 +13,7 @@ import java.io.Serializable; public class CommitAction implements Serializable { - private static final long serialVersionUID = 5720172990936523724L; + private static final long serialVersionUID = 1L; public enum Action { diff --git a/src/main/java/org/gitlab4j/api/models/CommitPayload.java b/src/main/java/org/gitlab4j/api/models/CommitPayload.java index bfd11edc3..af009a8d3 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitPayload.java +++ b/src/main/java/org/gitlab4j/api/models/CommitPayload.java @@ -7,7 +7,8 @@ import java.util.List; public class CommitPayload implements Serializable { - private static final long serialVersionUID = -909264239788934196L; + private static final long serialVersionUID = 1L; + private String branch; private String commitMessage; private String startBranch; diff --git a/src/main/java/org/gitlab4j/api/models/CommitRef.java b/src/main/java/org/gitlab4j/api/models/CommitRef.java index 915c85fb1..4244601df 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitRef.java +++ b/src/main/java/org/gitlab4j/api/models/CommitRef.java @@ -8,7 +8,8 @@ import java.io.Serializable; public class CommitRef implements Serializable { - private static final long serialVersionUID = 2761193061188727620L; + 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 fce31b125..ee22c2537 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStats.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStats.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class CommitStats implements Serializable { - private static final long serialVersionUID = -5607632904521556869L; + private static final long serialVersionUID = 1L; + private Integer additions; private Integer deletions; private Integer total; diff --git a/src/main/java/org/gitlab4j/api/models/CommitStatus.java b/src/main/java/org/gitlab4j/api/models/CommitStatus.java index a6a7be89b..2e09f4d60 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStatus.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStatus.java @@ -7,7 +7,8 @@ import java.util.Date; public class CommitStatus implements Serializable { - private static final long serialVersionUID = -4986890666487972709L; + private static final long serialVersionUID = 1L; + private Boolean allowFailure; private Author author; private Float coverage; diff --git a/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java b/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java index c4c610f60..94bceacb6 100644 --- a/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java +++ b/src/main/java/org/gitlab4j/api/models/CommitStatusFilter.java @@ -10,7 +10,8 @@ * This class is used to filter commit status when getting lists of them. */ public class CommitStatusFilter implements Serializable { - private static final long serialVersionUID = -9065214362591834155L; + private static final long serialVersionUID = 1L; + private String ref; private String stage; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/CompareResults.java b/src/main/java/org/gitlab4j/api/models/CompareResults.java index c80399c05..cc76309a4 100644 --- a/src/main/java/org/gitlab4j/api/models/CompareResults.java +++ b/src/main/java/org/gitlab4j/api/models/CompareResults.java @@ -7,7 +7,8 @@ import java.util.List; public class CompareResults implements Serializable { - private static final long serialVersionUID = -2871624622998850399L; + private static final long serialVersionUID = 1L; + private Commit commit; private List commits;; private List diffs; diff --git a/src/main/java/org/gitlab4j/api/models/Contributor.java b/src/main/java/org/gitlab4j/api/models/Contributor.java index d8125f6de..dd2072e47 100644 --- a/src/main/java/org/gitlab4j/api/models/Contributor.java +++ b/src/main/java/org/gitlab4j/api/models/Contributor.java @@ -5,7 +5,8 @@ * See Contributors at GitLab. */ public class Contributor extends AbstractUser{ - private static final long serialVersionUID = -4198040423122732070L; + private static final long serialVersionUID = 1L; + private Integer commits; private Integer additions; private Integer deletions; diff --git a/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java b/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java index 8c33cdaed..c255800a3 100644 --- a/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java +++ b/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java @@ -3,7 +3,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class CreatedChildEpic extends AbstractMinimalEpic { - private static final long serialVersionUID = -5686922693728608886L; + private static final long serialVersionUID = 1L; + private Boolean hasChildren; private Boolean hasIssues; private String url; diff --git a/src/main/java/org/gitlab4j/api/models/CustomAttribute.java b/src/main/java/org/gitlab4j/api/models/CustomAttribute.java index 968857c40..f5b928fb0 100644 --- a/src/main/java/org/gitlab4j/api/models/CustomAttribute.java +++ b/src/main/java/org/gitlab4j/api/models/CustomAttribute.java @@ -3,7 +3,8 @@ import java.io.Serializable; public class CustomAttribute implements Serializable { - private static final long serialVersionUID = -4021719541521426021L; + 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 991ec8dd7..18758fa26 100644 --- a/src/main/java/org/gitlab4j/api/models/DeployKey.java +++ b/src/main/java/org/gitlab4j/api/models/DeployKey.java @@ -7,7 +7,8 @@ import java.util.Date; public class DeployKey implements Serializable { - private static final long serialVersionUID = -5773240329719065765L; + private static final long serialVersionUID = 1L; + private Long id; private String title; private String key; diff --git a/src/main/java/org/gitlab4j/api/models/DeployToken.java b/src/main/java/org/gitlab4j/api/models/DeployToken.java index 86d88d266..292075568 100644 --- a/src/main/java/org/gitlab4j/api/models/DeployToken.java +++ b/src/main/java/org/gitlab4j/api/models/DeployToken.java @@ -8,7 +8,8 @@ import java.util.List; public class DeployToken implements Serializable { - private static final long serialVersionUID = -2137975534650973309L; + private static final long serialVersionUID = 1L; + private Long id; private String name; private String username; diff --git a/src/main/java/org/gitlab4j/api/models/Deployable.java b/src/main/java/org/gitlab4j/api/models/Deployable.java index 75b28f5d7..cb160308a 100644 --- a/src/main/java/org/gitlab4j/api/models/Deployable.java +++ b/src/main/java/org/gitlab4j/api/models/Deployable.java @@ -8,7 +8,8 @@ import java.util.List; public class Deployable implements Serializable { - private static final long serialVersionUID = -2615572922445533790L; + private static final long serialVersionUID = 1L; + private Long id; private DeploymentStatus status; private String stage; diff --git a/src/main/java/org/gitlab4j/api/models/Deployment.java b/src/main/java/org/gitlab4j/api/models/Deployment.java index 40f5114b8..f090754f6 100644 --- a/src/main/java/org/gitlab4j/api/models/Deployment.java +++ b/src/main/java/org/gitlab4j/api/models/Deployment.java @@ -7,7 +7,8 @@ import java.util.Date; public class Deployment implements Serializable { - private static final long serialVersionUID = -7687358667670668078L; + private static final long serialVersionUID = 1L; + private Long id; private Long iid; private String ref; diff --git a/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java b/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java index a6dd5ed2e..c87b18ac9 100644 --- a/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java +++ b/src/main/java/org/gitlab4j/api/models/DeploymentFilter.java @@ -13,7 +13,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; public class DeploymentFilter implements Serializable { - private static final long serialVersionUID = 7839110225941520941L; + 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. */ diff --git a/src/main/java/org/gitlab4j/api/models/DetailedStatus.java b/src/main/java/org/gitlab4j/api/models/DetailedStatus.java index dac763165..ce67b3a49 100644 --- a/src/main/java/org/gitlab4j/api/models/DetailedStatus.java +++ b/src/main/java/org/gitlab4j/api/models/DetailedStatus.java @@ -8,7 +8,8 @@ * This class is part of the Pipeline message. */ public class DetailedStatus implements Serializable { - private static final long serialVersionUID = -6621240797564980173L; + private static final long serialVersionUID = 1L; + private String icon; private String text; private String label; diff --git a/src/main/java/org/gitlab4j/api/models/Diff.java b/src/main/java/org/gitlab4j/api/models/Diff.java index 856529449..7545273c2 100644 --- a/src/main/java/org/gitlab4j/api/models/Diff.java +++ b/src/main/java/org/gitlab4j/api/models/Diff.java @@ -8,7 +8,8 @@ import java.io.Serializable; public class Diff implements Serializable { - private static final long serialVersionUID = -4483166688383479990L; + private static final long serialVersionUID = 1L; + @JsonInclude(JsonInclude.Include.ALWAYS) @JsonProperty("a_mode") private String a_mode; diff --git a/src/main/java/org/gitlab4j/api/models/DiffRef.java b/src/main/java/org/gitlab4j/api/models/DiffRef.java index 6ff56f411..2f05e11d1 100644 --- a/src/main/java/org/gitlab4j/api/models/DiffRef.java +++ b/src/main/java/org/gitlab4j/api/models/DiffRef.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class DiffRef implements Serializable { - private static final long serialVersionUID = -9034081155654000901L; + 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 dc78b0c00..2f16575ec 100644 --- a/src/main/java/org/gitlab4j/api/models/Discussion.java +++ b/src/main/java/org/gitlab4j/api/models/Discussion.java @@ -6,7 +6,8 @@ import java.util.List; public class Discussion implements Serializable { - private static final long serialVersionUID = 980803383743624987L; + private static final long serialVersionUID = 1L; + private String id; private Boolean individualNote; private List notes; diff --git a/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java b/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java index 7c523a036..6e4584148 100644 --- a/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java +++ b/src/main/java/org/gitlab4j/api/models/DownstreamPipeline.java @@ -6,7 +6,8 @@ import java.util.Date; public class DownstreamPipeline implements Serializable { - private static final long serialVersionUID = 6808739921188206517L; + 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 a48729dd6..3aef718e9 100644 --- a/src/main/java/org/gitlab4j/api/models/Duration.java +++ b/src/main/java/org/gitlab4j/api/models/Duration.java @@ -10,7 +10,8 @@ * This class represents a duration in time. */ public class Duration implements Serializable { - private static final long serialVersionUID = 5088839932537037135L; + 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 51446d4bf..8d9ffa87a 100644 --- a/src/main/java/org/gitlab4j/api/models/Email.java +++ b/src/main/java/org/gitlab4j/api/models/Email.java @@ -3,7 +3,8 @@ import java.io.Serializable; public class Email implements Serializable { - private static final long serialVersionUID = -7852698606973146239L; + 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 f63fcad04..1a2ecb596 100644 --- a/src/main/java/org/gitlab4j/api/models/Environment.java +++ b/src/main/java/org/gitlab4j/api/models/Environment.java @@ -8,7 +8,7 @@ import java.io.Serializable; public class Environment implements Serializable { - private static final long serialVersionUID = 5680655830549448926L; + 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 9892e62fd..89ca25019 100644 --- a/src/main/java/org/gitlab4j/api/models/Epic.java +++ b/src/main/java/org/gitlab4j/api/models/Epic.java @@ -5,7 +5,8 @@ import java.util.Date; public class Epic extends AbstractEpic { - private static final long serialVersionUID = -2039780947154320347L; + private static final long serialVersionUID = 1L; + private Boolean startDateIsFixed; private Boolean dueDateIsFixed; private Date dueDateFromInheritedSource; diff --git a/src/main/java/org/gitlab4j/api/models/EpicFilter.java b/src/main/java/org/gitlab4j/api/models/EpicFilter.java index 463a6c8ce..db31a7db9 100644 --- a/src/main/java/org/gitlab4j/api/models/EpicFilter.java +++ b/src/main/java/org/gitlab4j/api/models/EpicFilter.java @@ -18,7 +18,8 @@ * This class is used to filter Groups when getting lists of epics. */ public class EpicFilter implements Serializable { - private static final long serialVersionUID = 1020596795849193660L; + private static final long serialVersionUID = 1L; + private Long authorId; private String authorUsername; private String labels; diff --git a/src/main/java/org/gitlab4j/api/models/EpicInLink.java b/src/main/java/org/gitlab4j/api/models/EpicInLink.java index 50600a5b7..0ef8addad 100644 --- a/src/main/java/org/gitlab4j/api/models/EpicInLink.java +++ b/src/main/java/org/gitlab4j/api/models/EpicInLink.java @@ -3,7 +3,7 @@ import org.gitlab4j.api.utils.JacksonJson; public class EpicInLink extends AbstractEpic { - private static final long serialVersionUID = 3050569265982322906L; + 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 104ddf633..b6e49d915 100644 --- a/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java +++ b/src/main/java/org/gitlab4j/api/models/EpicIssueLink.java @@ -6,7 +6,8 @@ import java.io.Serializable; public class EpicIssueLink implements Serializable { - private static final long serialVersionUID = 8283764367558203361L; + private static final long serialVersionUID = 1L; + private Long id; private Integer relativePosition; private Epic epic; diff --git a/src/main/java/org/gitlab4j/api/models/Event.java b/src/main/java/org/gitlab4j/api/models/Event.java index 21c234ed4..e27dd8763 100644 --- a/src/main/java/org/gitlab4j/api/models/Event.java +++ b/src/main/java/org/gitlab4j/api/models/Event.java @@ -8,7 +8,8 @@ import java.util.Date; public class Event implements Serializable { - private static final long serialVersionUID = -8324645348073849814L; + private static final long serialVersionUID = 1L; + private Long id; private String actionName; private Author author; diff --git a/src/main/java/org/gitlab4j/api/models/EventData.java b/src/main/java/org/gitlab4j/api/models/EventData.java index dd78a0de8..f62dead68 100644 --- a/src/main/java/org/gitlab4j/api/models/EventData.java +++ b/src/main/java/org/gitlab4j/api/models/EventData.java @@ -7,7 +7,8 @@ import java.util.List; public class EventData implements Serializable { - private static final long serialVersionUID = -1778675702778168859L; + private static final long serialVersionUID = 1L; + private String after; private String before; private List commits; diff --git a/src/main/java/org/gitlab4j/api/models/ExportStatus.java b/src/main/java/org/gitlab4j/api/models/ExportStatus.java index 9ded31ab5..1e4fa2ea7 100644 --- a/src/main/java/org/gitlab4j/api/models/ExportStatus.java +++ b/src/main/java/org/gitlab4j/api/models/ExportStatus.java @@ -12,7 +12,7 @@ import java.util.Map; public class ExportStatus implements Serializable { - private static final long serialVersionUID = -6479418376568344745L; + 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 4a113e0fc..8a2d14309 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheck.java @@ -6,7 +6,8 @@ import java.util.List; public class ExternalStatusCheck implements Serializable { - private static final long serialVersionUID = 2079093664740067505L; + private static final long serialVersionUID = 1L; + private Long id; private String name; private Long projectId; diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java index 157b2f4e4..edd7827e1 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckProtectedBranch.java @@ -8,7 +8,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class ExternalStatusCheckProtectedBranch implements Serializable { - private static final long serialVersionUID = 3702177459228966383L; + private static final long serialVersionUID = 1L; + private Long id; private Long projectId; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java index 29fd0df13..e27a46116 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckResult.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class ExternalStatusCheckResult implements Serializable { - private static final long serialVersionUID = 8696813682987928642L; + private static final long serialVersionUID = 1L; + private Long id; private MergeRequest mergeRequest; private ExternalStatusCheck externalStatusCheck; diff --git a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java index a6369eb86..c55acda3d 100644 --- a/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java +++ b/src/main/java/org/gitlab4j/api/models/ExternalStatusCheckStatus.java @@ -9,7 +9,8 @@ import java.io.Serializable; public class ExternalStatusCheckStatus implements Serializable { - private static final long serialVersionUID = -4975275665782772237L; + private static final long serialVersionUID = 1L; + private Long id; private String name; private String externalUrl; diff --git a/src/main/java/org/gitlab4j/api/models/FileUpload.java b/src/main/java/org/gitlab4j/api/models/FileUpload.java index 3a255feeb..70ad34ffe 100644 --- a/src/main/java/org/gitlab4j/api/models/FileUpload.java +++ b/src/main/java/org/gitlab4j/api/models/FileUpload.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class FileUpload implements Serializable { - private static final long serialVersionUID = 6666551122360550967L; + private static final long serialVersionUID = 1L; + private String alt; private String url; private String markdown; diff --git a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java index 8e8576c3e..601e55886 100644 --- a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java +++ b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplate.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class GitLabCiTemplate implements Serializable { - private static final long serialVersionUID = -8338332681415500765L; + 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 1c9686555..dd1182299 100644 --- a/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java +++ b/src/main/java/org/gitlab4j/api/models/GitLabCiTemplateElement.java @@ -5,7 +5,8 @@ import java.io.Serializable; public class GitLabCiTemplateElement implements Serializable { - private static final long serialVersionUID = 5775478350942742711L; + 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 60c9441ad..494e69750 100644 --- a/src/main/java/org/gitlab4j/api/models/GpgSignature.java +++ b/src/main/java/org/gitlab4j/api/models/GpgSignature.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class GpgSignature implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -2146684278503477421L; private Long gpgKeyId; private String gpgKeyPrimaryKeyid; private String gpgKeyUserName; diff --git a/src/main/java/org/gitlab4j/api/models/Group.java b/src/main/java/org/gitlab4j/api/models/Group.java index 71a5b0454..f658f018a 100644 --- a/src/main/java/org/gitlab4j/api/models/Group.java +++ b/src/main/java/org/gitlab4j/api/models/Group.java @@ -8,8 +8,7 @@ import java.util.List; public class Group extends AbstractGroup { - - private static final long serialVersionUID = -903904978831179687L; + 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 0f39e8999..411eaa668 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java +++ b/src/main/java/org/gitlab4j/api/models/GroupAccessToken.java @@ -3,7 +3,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class GroupAccessToken extends ImpersonationToken { - private static final long serialVersionUID = 338705544580605465L; + 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 79bbf120a..6d8ebb2a8 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupFilter.java +++ b/src/main/java/org/gitlab4j/api/models/GroupFilter.java @@ -12,8 +12,8 @@ * This class is used to filter Groups when getting lists of groups. */ public class GroupFilter implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -6089683763762350454L; private List skipGroups; private Boolean allAvailable; private String search; diff --git a/src/main/java/org/gitlab4j/api/models/GroupParams.java b/src/main/java/org/gitlab4j/api/models/GroupParams.java index ca87138a0..1e1a74778 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupParams.java +++ b/src/main/java/org/gitlab4j/api/models/GroupParams.java @@ -10,8 +10,7 @@ * the parameters for the call to the GitLab API. */ public class GroupParams implements Serializable { - - private static final long serialVersionUID = 4980649800188221721L; + 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 a440a00a4..299ef6679 100644 --- a/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java +++ b/src/main/java/org/gitlab4j/api/models/GroupProjectsFilter.java @@ -11,8 +11,8 @@ * This class is used to filter Projects when getting lists of projects for a specified group. */ public class GroupProjectsFilter implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -2606395891055016971L; private Boolean archived; private Visibility visibility; private ProjectOrderBy orderBy; diff --git a/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java b/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java index 71c54a43b..87f5e42ef 100644 --- a/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java +++ b/src/main/java/org/gitlab4j/api/models/HealthCheckInfo.java @@ -14,8 +14,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; public class HealthCheckInfo implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 6099547960016518839L; @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 4f6302dff..1266fbe8b 100644 --- a/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java +++ b/src/main/java/org/gitlab4j/api/models/HealthCheckItem.java @@ -6,7 +6,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class HealthCheckItem implements Serializable { - private static final long serialVersionUID = -9119476968963832367L; + 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 2a40c2a88..64fa03e11 100644 --- a/src/main/java/org/gitlab4j/api/models/Identity.java +++ b/src/main/java/org/gitlab4j/api/models/Identity.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class Identity implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -352988007246422134L; private String provider; private String externUid; private Integer samlProviderId; diff --git a/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java b/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java index 0b06202e6..1b7a50243 100644 --- a/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java +++ b/src/main/java/org/gitlab4j/api/models/ImpersonationToken.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonValue; public class ImpersonationToken implements Serializable { - private static final long serialVersionUID = -5437477855918094475L; + 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 16a4ba352..a926f61fc 100644 --- a/src/main/java/org/gitlab4j/api/models/ImportStatus.java +++ b/src/main/java/org/gitlab4j/api/models/ImportStatus.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonValue; public class ImportStatus implements Serializable { - private static final long serialVersionUID = -5437477855918094477L; + 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 4fde622ec..dcd38336f 100644 --- a/src/main/java/org/gitlab4j/api/models/Issue.java +++ b/src/main/java/org/gitlab4j/api/models/Issue.java @@ -6,8 +6,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class Issue extends AbstractIssue { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 4408821491529505218L; private Boolean subscribed; private Long issueLinkId; diff --git a/src/main/java/org/gitlab4j/api/models/IssueEvent.java b/src/main/java/org/gitlab4j/api/models/IssueEvent.java index 5101c88e5..10f2e81f4 100644 --- a/src/main/java/org/gitlab4j/api/models/IssueEvent.java +++ b/src/main/java/org/gitlab4j/api/models/IssueEvent.java @@ -8,7 +8,7 @@ import java.io.Serializable; public class IssueEvent implements Serializable { - private static final long serialVersionUID = -9172768252733688801L; + 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 e1b303b8c..5d963352a 100644 --- a/src/main/java/org/gitlab4j/api/models/IssueFilter.java +++ b/src/main/java/org/gitlab4j/api/models/IssueFilter.java @@ -17,8 +17,8 @@ * This class is used to filter issues when getting lists of them. */ public class IssueFilter implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -6612905888724502274L; /** * 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 000d16a2f..bca1f4df0 100644 --- a/src/main/java/org/gitlab4j/api/models/IssueLink.java +++ b/src/main/java/org/gitlab4j/api/models/IssueLink.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class IssueLink implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -489517714860533257L; private Issue sourceIssue; private Issue targetIssue; private LinkType linkType; diff --git a/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java b/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java index db9b0bd3d..f1d2ccb3a 100644 --- a/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java +++ b/src/main/java/org/gitlab4j/api/models/IssuesStatistics.java @@ -7,8 +7,8 @@ import java.io.Serializable; public class IssuesStatistics implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -6581608490410246889L; private Statistics statistics; public Statistics getStatistics() { @@ -25,7 +25,8 @@ public Counts getCounts() { } public static class Statistics implements Serializable { - private static final long serialVersionUID = 1578060206571773512L; + private static final long serialVersionUID = 1L; + private Counts counts; public Counts getCounts() { @@ -39,7 +40,8 @@ public void setCounts(Counts counts) { public static class Counts implements Serializable { - private static final long serialVersionUID = -1397426876566422385L; + private static final long serialVersionUID = 1L; + private Integer all; private Integer closed; private Integer opened; diff --git a/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java b/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java index 6ca048789..a166581c7 100644 --- a/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java +++ b/src/main/java/org/gitlab4j/api/models/IssuesStatisticsFilter.java @@ -15,8 +15,8 @@ * This class is used to filter issues when getting issue statistics. of them. */ public class IssuesStatisticsFilter implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -7501532011736965391L; private List labels; private String milestone; private IssueScope scope; diff --git a/src/main/java/org/gitlab4j/api/models/Iteration.java b/src/main/java/org/gitlab4j/api/models/Iteration.java index 1c7857903..336e2a15f 100644 --- a/src/main/java/org/gitlab4j/api/models/Iteration.java +++ b/src/main/java/org/gitlab4j/api/models/Iteration.java @@ -8,7 +8,7 @@ import java.util.Date; public class Iteration implements Serializable { - private static final long serialVersionUID = -7668584990220659049L; + private static final long serialVersionUID = 1L; 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 79d940bd2..0b055603d 100644 --- a/src/main/java/org/gitlab4j/api/models/IterationFilter.java +++ b/src/main/java/org/gitlab4j/api/models/IterationFilter.java @@ -13,8 +13,7 @@ import com.fasterxml.jackson.annotation.JsonValue; public class IterationFilter implements Serializable { - - private static final long serialVersionUID = -8121837351844663183L; + 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 ffd657379..904e24f85 100644 --- a/src/main/java/org/gitlab4j/api/models/Job.java +++ b/src/main/java/org/gitlab4j/api/models/Job.java @@ -7,8 +7,8 @@ import java.util.List; public class Job implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 3324086159440132520L; private Long id; private Commit commit; private String coverage; diff --git a/src/main/java/org/gitlab4j/api/models/JobAttribute.java b/src/main/java/org/gitlab4j/api/models/JobAttribute.java index e4be98320..cc625e6a4 100644 --- a/src/main/java/org/gitlab4j/api/models/JobAttribute.java +++ b/src/main/java/org/gitlab4j/api/models/JobAttribute.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class JobAttribute implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -1898697909418913296L; private String key; private 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 f1354b4f9..677a2127e 100644 --- a/src/main/java/org/gitlab4j/api/models/JobAttributes.java +++ b/src/main/java/org/gitlab4j/api/models/JobAttributes.java @@ -7,8 +7,8 @@ import java.util.List; public class JobAttributes implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 8339758909744590549L; @JsonProperty("job_variables_attributes") private 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 81d2a700a..9ee90f485 100644 --- a/src/main/java/org/gitlab4j/api/models/Key.java +++ b/src/main/java/org/gitlab4j/api/models/Key.java @@ -7,7 +7,8 @@ import java.util.Date; public class Key implements Serializable { - private static final long serialVersionUID = -2445059434057852073L; + private static final long serialVersionUID = 1L; + private Date createdAt; private Long id; private String key; diff --git a/src/main/java/org/gitlab4j/api/models/Label.java b/src/main/java/org/gitlab4j/api/models/Label.java index 903f49875..35b0057ad 100644 --- a/src/main/java/org/gitlab4j/api/models/Label.java +++ b/src/main/java/org/gitlab4j/api/models/Label.java @@ -7,8 +7,8 @@ import java.io.Serializable; public class Label implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 2920944591804197634L; private Long id; private String name; private String color; diff --git a/src/main/java/org/gitlab4j/api/models/LabelEvent.java b/src/main/java/org/gitlab4j/api/models/LabelEvent.java index fe0a0465c..e0ac581e1 100644 --- a/src/main/java/org/gitlab4j/api/models/LabelEvent.java +++ b/src/main/java/org/gitlab4j/api/models/LabelEvent.java @@ -8,8 +8,7 @@ import java.io.Serializable; public class LabelEvent implements Serializable { - - private static final long serialVersionUID = 2844189986730654608L; + 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 6f7b53e66..0d9c30563 100644 --- a/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java +++ b/src/main/java/org/gitlab4j/api/models/LdapGroupLink.java @@ -6,8 +6,8 @@ import java.io.Serializable; public class LdapGroupLink implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -6725494282901246090L; private String cn; private AccessLevel groupAccess; diff --git a/src/main/java/org/gitlab4j/api/models/License.java b/src/main/java/org/gitlab4j/api/models/License.java index 011015f09..57252be83 100644 --- a/src/main/java/org/gitlab4j/api/models/License.java +++ b/src/main/java/org/gitlab4j/api/models/License.java @@ -7,8 +7,8 @@ import java.util.Map; public class License implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 8305426745567602018L; private Long id; private String plan; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java b/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java index 0684b0b8d..c658f082c 100644 --- a/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java +++ b/src/main/java/org/gitlab4j/api/models/LicenseTemplate.java @@ -6,8 +6,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class LicenseTemplate implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 7204719099700882956L; private String key; private String name; private String nickname; diff --git a/src/main/java/org/gitlab4j/api/models/Link.java b/src/main/java/org/gitlab4j/api/models/Link.java index f222a8cee..82a403781 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 @@ 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 cc4f1a670..8cea4089b 100644 --- a/src/main/java/org/gitlab4j/api/models/Markdown.java +++ b/src/main/java/org/gitlab4j/api/models/Markdown.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class Markdown implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -5109074296844612091L; private String html; public String getHtml() { diff --git a/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java b/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java index 13ac59701..f91509bf0 100644 --- a/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java +++ b/src/main/java/org/gitlab4j/api/models/MarkdownRequest.java @@ -3,7 +3,8 @@ import java.io.Serializable; public class MarkdownRequest implements Serializable { - private static final long serialVersionUID = -2437075498227228875L; + 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 1d88164b4..1c460c31e 100644 --- a/src/main/java/org/gitlab4j/api/models/Member.java +++ b/src/main/java/org/gitlab4j/api/models/Member.java @@ -6,8 +6,8 @@ import java.util.Date; public class Member extends AbstractUser { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 6492073834943264389L; private AccessLevel accessLevel; private Date expiresAt; private Identity groupSamlIdentity; diff --git a/src/main/java/org/gitlab4j/api/models/Membership.java b/src/main/java/org/gitlab4j/api/models/Membership.java index 9a96de8c4..28e3dab2b 100644 --- a/src/main/java/org/gitlab4j/api/models/Membership.java +++ b/src/main/java/org/gitlab4j/api/models/Membership.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class Membership implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -8141654020767145971L; private Long sourceId; private String sourceName; private MembershipSourceType sourceType; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequest.java b/src/main/java/org/gitlab4j/api/models/MergeRequest.java index d3f519c39..c4e171f2a 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequest.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequest.java @@ -9,8 +9,8 @@ import java.util.List; public class MergeRequest implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -8455782486451129179L; private Boolean allowCollaboration; private Boolean allowMaintainerToPush; private Integer approvalsBeforeMerge; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java b/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java index f3f558885..bb62a7457 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestDiff.java @@ -5,8 +5,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class MergeRequestDiff extends MergeRequestVersion { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 2764379071350671007L; 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 6ab999232..cfb91051f 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestFilter.java @@ -22,8 +22,8 @@ * This class is used to filter merge requests when getting lists of them. */ public class MergeRequestFilter implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -3786830402251866105L; private Long projectId; private Long groupId; private List iids; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java b/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java index 9a6a287ed..3215a2bcc 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestParams.java @@ -11,8 +11,8 @@ * This class provides the form parameters for creating and updating merge requests. */ public class MergeRequestParams implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 3850045219649209460L; private String sourceBranch; private String targetBranch; private String title; diff --git a/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java b/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java index 44f65cdd4..016afd372 100644 --- a/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java +++ b/src/main/java/org/gitlab4j/api/models/MergeRequestVersion.java @@ -6,8 +6,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class MergeRequestVersion implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 445636473281738033L; private Long id; private String headCommitSha; private String baseCommitSha; diff --git a/src/main/java/org/gitlab4j/api/models/Metadata.java b/src/main/java/org/gitlab4j/api/models/Metadata.java index f79da601b..e4b0e730f 100644 --- a/src/main/java/org/gitlab4j/api/models/Metadata.java +++ b/src/main/java/org/gitlab4j/api/models/Metadata.java @@ -6,8 +6,8 @@ import java.io.Serializable; public class Metadata implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -2413547164112270863L; private String version; private String revision; private Kas kas; diff --git a/src/main/java/org/gitlab4j/api/models/Milestone.java b/src/main/java/org/gitlab4j/api/models/Milestone.java index 97f82d073..16579d65a 100644 --- a/src/main/java/org/gitlab4j/api/models/Milestone.java +++ b/src/main/java/org/gitlab4j/api/models/Milestone.java @@ -7,8 +7,8 @@ import java.util.Date; public class Milestone implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -3404019540574604663L; private Date createdAt; private String description; @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) diff --git a/src/main/java/org/gitlab4j/api/models/Namespace.java b/src/main/java/org/gitlab4j/api/models/Namespace.java index dcb8d0bc0..95e026ace 100644 --- a/src/main/java/org/gitlab4j/api/models/Namespace.java +++ b/src/main/java/org/gitlab4j/api/models/Namespace.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class Namespace implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -393233581749936360L; private Long id; private String name; private String path; diff --git a/src/main/java/org/gitlab4j/api/models/Note.java b/src/main/java/org/gitlab4j/api/models/Note.java index b3e178d79..430584b69 100644 --- a/src/main/java/org/gitlab4j/api/models/Note.java +++ b/src/main/java/org/gitlab4j/api/models/Note.java @@ -9,7 +9,7 @@ import java.util.Date; public class Note implements Serializable { - private static final long serialVersionUID = 4604942317413087367L; + 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 83c396a7a..127a5eb69 100644 --- a/src/main/java/org/gitlab4j/api/models/NotificationSettings.java +++ b/src/main/java/org/gitlab4j/api/models/NotificationSettings.java @@ -8,8 +8,7 @@ import java.io.Serializable; public class NotificationSettings implements Serializable { - - private static final long serialVersionUID = -3034906823726990473L; + private static final long serialVersionUID = 1L; /** Notification level */ public static enum Level { @@ -35,7 +34,8 @@ public String toString() { } public static class Events implements Serializable { - private static final long serialVersionUID = -7779451561897706339L; + private static final long serialVersionUID = 1L; + private Boolean newNote; private Boolean newIssue; private Boolean reopenIssue; diff --git a/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java b/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java index e0fe32999..a4c1049c3 100644 --- a/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java +++ b/src/main/java/org/gitlab4j/api/models/OauthTokenResponse.java @@ -3,8 +3,8 @@ import java.io.Serializable; public class OauthTokenResponse implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -6243821985046243075L; private String accessToken; private String tokenType; private String refreshToken; diff --git a/src/main/java/org/gitlab4j/api/models/Owner.java b/src/main/java/org/gitlab4j/api/models/Owner.java index a849d43f1..ad0eec265 100644 --- a/src/main/java/org/gitlab4j/api/models/Owner.java +++ b/src/main/java/org/gitlab4j/api/models/Owner.java @@ -1,5 +1,5 @@ package org.gitlab4j.api.models; public class Owner extends AbstractUser { - private static final long serialVersionUID = -773695148516560415L; + 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 3fd04a639..6a92a7aac 100644 --- a/src/main/java/org/gitlab4j/api/models/Package.java +++ b/src/main/java/org/gitlab4j/api/models/Package.java @@ -6,7 +6,8 @@ import java.util.Date; public class Package implements Serializable { - private static final long serialVersionUID = 5889634044963420636L; + private static final long serialVersionUID = 1L; + private Long id; private String name; private String version; diff --git a/src/main/java/org/gitlab4j/api/models/PackageFile.java b/src/main/java/org/gitlab4j/api/models/PackageFile.java index fee85bd29..011043c14 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 4a7e0c8e7..2b18911a3 100644 --- a/src/main/java/org/gitlab4j/api/models/PackageFilter.java +++ b/src/main/java/org/gitlab4j/api/models/PackageFilter.java @@ -11,8 +11,8 @@ * This class is used to filter Projects when getting lists of projects for a specified group. */ public class PackageFilter implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 7975549027581667807L; private Boolean excludeSubgroups; private PackageOrderBy orderBy; private SortOrder sort; diff --git a/src/main/java/org/gitlab4j/api/models/Participant.java b/src/main/java/org/gitlab4j/api/models/Participant.java index 0b7232ee5..01b8e0eb1 100644 --- a/src/main/java/org/gitlab4j/api/models/Participant.java +++ b/src/main/java/org/gitlab4j/api/models/Participant.java @@ -1,5 +1,5 @@ package org.gitlab4j.api.models; public class Participant extends AbstractUser { - private static final long serialVersionUID = 1914253800296547441L; + 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 1c0de4933..8ea86640f 100644 --- a/src/main/java/org/gitlab4j/api/models/Permissions.java +++ b/src/main/java/org/gitlab4j/api/models/Permissions.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class Permissions implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -2395045236486663658L; 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 50f140a5c..92f889e3b 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 c8553a6db..3ec389b65 100644 --- a/src/main/java/org/gitlab4j/api/models/PipelineFilter.java +++ b/src/main/java/org/gitlab4j/api/models/PipelineFilter.java @@ -14,8 +14,8 @@ * This class is used to filter Pipelines when getting lists of them. */ public class PipelineFilter implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 578235335955620140L; /** {@link org.gitlab4j.api.Constants.PipelineScope} The scope of pipelines, one of: running, pending, finished, branches, tags */ private PipelineScope scope; diff --git a/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java b/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java index 606fe3f31..085650e86 100644 --- a/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java +++ b/src/main/java/org/gitlab4j/api/models/PipelineSchedule.java @@ -7,8 +7,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class PipelineSchedule implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -4141121642006352696L; private Long id; private String description; private String ref; diff --git a/src/main/java/org/gitlab4j/api/models/Position.java b/src/main/java/org/gitlab4j/api/models/Position.java index e972162ee..dafc69be8 100644 --- a/src/main/java/org/gitlab4j/api/models/Position.java +++ b/src/main/java/org/gitlab4j/api/models/Position.java @@ -8,8 +8,7 @@ import java.io.Serializable; public class Position implements Serializable { - - private static final long serialVersionUID = 1720468299485697338L; + 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 3494d7120..b76c2a5d6 100644 --- a/src/main/java/org/gitlab4j/api/models/Project.java +++ b/src/main/java/org/gitlab4j/api/models/Project.java @@ -17,7 +17,7 @@ import java.util.List; public class Project implements Serializable { - private static final long serialVersionUID = 7303989372756343383L; + 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 78c495d58..d22e5f213 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectAccess.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectAccess.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class ProjectAccess implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 2586454914563312773L; 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 a5381beb5..2d2e40092 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java @@ -10,7 +10,8 @@ import java.util.List; public class ProjectAccessToken implements Serializable { - private static final long serialVersionUID = -6898996649279891825L; + 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 bf13cb69a..8696f1b40 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectApprovalsConfig.java @@ -7,8 +7,8 @@ import java.io.Serializable; public class ProjectApprovalsConfig implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -4377250577067837024L; private Integer approvalsBeforeMerge; private Boolean resetApprovalsOnPush; private Boolean selectiveCodeOwnerRemovals; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectFetches.java b/src/main/java/org/gitlab4j/api/models/ProjectFetches.java index fa0124d67..93bb7a794 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectFetches.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectFetches.java @@ -8,12 +8,12 @@ import java.util.List; public class ProjectFetches implements Serializable { - - private static final long serialVersionUID = -4872633634599186529L; + private static final long serialVersionUID = 1L; public static class DateCount implements Serializable { - private static final long serialVersionUID = 4630780820005787004L; + private static final long serialVersionUID = 1L; + private Integer count; @JsonSerialize(using = JacksonJson.DateOnlySerializer.class) @@ -37,7 +37,8 @@ public void setDate(Date date) { } public static class Fetches implements Serializable { - private static final long serialVersionUID = 4630780820005787008L; + 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 406ffb279..9fbbbe040 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectFilter.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectFilter.java @@ -13,8 +13,8 @@ * This class is used to filter Projects when getting lists of projects for a specified user. */ public class ProjectFilter implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 6862041481569987088L; private Boolean archived; private Visibility visibility; private ProjectOrderBy orderBy; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectGroup.java b/src/main/java/org/gitlab4j/api/models/ProjectGroup.java index 667991a04..f106e9999 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectGroup.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectGroup.java @@ -1,5 +1,5 @@ package org.gitlab4j.api.models; public class ProjectGroup extends AbstractGroup { - private static final long serialVersionUID = -838653094576942075L; + 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 7f631a1e6..c7cd5330f 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectGroupsFilter.java @@ -9,8 +9,8 @@ * This class is used to filter Groups when getting lists of groups for a specified project. */ public class ProjectGroupsFilter implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -7697389200750527944L; private String search; private AccessLevel sharedMinAccessLevel; private Boolean sharedVisibleOnly; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/src/main/java/org/gitlab4j/api/models/ProjectHook.java index df8abf699..2a11ff02c 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -7,8 +7,8 @@ import java.util.Date; public class ProjectHook implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 6412954444361160378L; private Boolean buildEvents; private Date createdAt; private Boolean enableSslVerification; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java b/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java index 3911f656a..5d547aa62 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectStatistics.java @@ -11,8 +11,8 @@ * which is only allowed for GitLab admins. */ public class ProjectStatistics implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -6816978423517856645L; long commitCount; long storageSize; long repositorySize; diff --git a/src/main/java/org/gitlab4j/api/models/ProjectUser.java b/src/main/java/org/gitlab4j/api/models/ProjectUser.java index cf883511e..46be7cd9b 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectUser.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectUser.java @@ -1,5 +1,5 @@ package org.gitlab4j.api.models; public class ProjectUser extends AbstractUser { - private static final long serialVersionUID = 1347677526768040078L; + 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 d4ecec351..a92ae788b 100644 --- a/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java +++ b/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java @@ -7,8 +7,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class ProtectedBranch implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -3008917375248933687L; private Long id; private String name; private List pushAccessLevels; diff --git a/src/main/java/org/gitlab4j/api/models/ProtectedTag.java b/src/main/java/org/gitlab4j/api/models/ProtectedTag.java index 501d9277f..5b92eb4c4 100644 --- a/src/main/java/org/gitlab4j/api/models/ProtectedTag.java +++ b/src/main/java/org/gitlab4j/api/models/ProtectedTag.java @@ -6,11 +6,11 @@ import java.util.List; public class ProtectedTag implements Serializable { - - private static final long serialVersionUID = -5721003232110747390L; + private static final long serialVersionUID = 1L; public static class CreateAccessLevel implements Serializable { - private static final long serialVersionUID = -676784576865233897L; + 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 f3034d070..0d9c74c82 100644 --- a/src/main/java/org/gitlab4j/api/models/PushRules.java +++ b/src/main/java/org/gitlab4j/api/models/PushRules.java @@ -6,8 +6,8 @@ import java.util.Date; public class PushRules implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 2847496850414192432L; private Long id; private Long projectId; private String commitMessageRegex; diff --git a/src/main/java/org/gitlab4j/api/models/References.java b/src/main/java/org/gitlab4j/api/models/References.java index 721e80029..983e500e6 100644 --- a/src/main/java/org/gitlab4j/api/models/References.java +++ b/src/main/java/org/gitlab4j/api/models/References.java @@ -7,8 +7,8 @@ public class References implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -4751755085772406441L; @JsonProperty("short") private String _short; private String relative; diff --git a/src/main/java/org/gitlab4j/api/models/RegistryRepository.java b/src/main/java/org/gitlab4j/api/models/RegistryRepository.java index fc0d54697..fcae96206 100644 --- a/src/main/java/org/gitlab4j/api/models/RegistryRepository.java +++ b/src/main/java/org/gitlab4j/api/models/RegistryRepository.java @@ -6,8 +6,8 @@ import java.util.Date; public class RegistryRepository implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 6871803501873513792L; private Long id; private String name; private String path; diff --git a/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java b/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java index 0e2a713d3..d83fff2dc 100644 --- a/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java +++ b/src/main/java/org/gitlab4j/api/models/RegistryRepositoryTag.java @@ -6,7 +6,8 @@ import java.util.Date; public class RegistryRepositoryTag implements Serializable { - private static final long serialVersionUID = 115605545594991565L; + 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 4c7a5f2e6..d5f7b6699 100644 --- a/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/src/main/java/org/gitlab4j/api/models/RelatedEpic.java @@ -5,8 +5,8 @@ import java.util.Date; public class RelatedEpic extends AbstractEpic { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 4735222753619924221L; private Boolean startDateIsFixed; private Boolean dueDateIsFixed; private Date dueDateFromInheritedSource; diff --git a/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java b/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java index c16722d09..4e4e43b0c 100644 --- a/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java +++ b/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java @@ -6,7 +6,8 @@ import org.gitlab4j.api.utils.JacksonJson; public class RelatedEpicLink implements Serializable { - private static final long serialVersionUID = -5031693941135471316L; + private static final long serialVersionUID = 1L; + private Long id; private EpicInLink sourceEpic; private EpicInLink targetEpic; diff --git a/src/main/java/org/gitlab4j/api/models/Release.java b/src/main/java/org/gitlab4j/api/models/Release.java index 0e2500a5a..d511baf2c 100644 --- a/src/main/java/org/gitlab4j/api/models/Release.java +++ b/src/main/java/org/gitlab4j/api/models/Release.java @@ -10,8 +10,8 @@ import java.util.Map; public class Release implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1041533230334303476L; private String name; private String tagName; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/ReleaseParams.java b/src/main/java/org/gitlab4j/api/models/ReleaseParams.java index 3227803ed..840152156 100644 --- a/src/main/java/org/gitlab4j/api/models/ReleaseParams.java +++ b/src/main/java/org/gitlab4j/api/models/ReleaseParams.java @@ -7,8 +7,8 @@ import java.util.List; public class ReleaseParams implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -538304941926811318L; private String name; private String tagName; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/RemoteMirror.java b/src/main/java/org/gitlab4j/api/models/RemoteMirror.java index 7f283d7cf..21f857eb9 100644 --- a/src/main/java/org/gitlab4j/api/models/RemoteMirror.java +++ b/src/main/java/org/gitlab4j/api/models/RemoteMirror.java @@ -6,8 +6,8 @@ import java.util.Date; public class RemoteMirror implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 3263293943076925633L; private Long id; private Boolean enabled; private String lastError; diff --git a/src/main/java/org/gitlab4j/api/models/Repository.java b/src/main/java/org/gitlab4j/api/models/Repository.java index c67759dc6..a391a5408 100644 --- a/src/main/java/org/gitlab4j/api/models/Repository.java +++ b/src/main/java/org/gitlab4j/api/models/Repository.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class Repository implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -8079069832537320645L; private String description; private String homepage; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java index 1867b6b57..a7bba3e38 100644 --- a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java +++ b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java @@ -9,8 +9,8 @@ import java.util.Base64; public class RepositoryFile implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 6844347510810856023L; private String fileName; // file name only, Ex. class.rb private String filePath; // full path to file. Ex. lib/class.rb private Integer size; diff --git a/src/main/java/org/gitlab4j/api/models/Reviewer.java b/src/main/java/org/gitlab4j/api/models/Reviewer.java index 6c253f6b5..8b4b55cad 100644 --- a/src/main/java/org/gitlab4j/api/models/Reviewer.java +++ b/src/main/java/org/gitlab4j/api/models/Reviewer.java @@ -1,5 +1,5 @@ package org.gitlab4j.api.models; public class Reviewer extends AbstractUser { - private static final long serialVersionUID = 2476373318211531014L; + 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 5ac2423bb..8325e5061 100644 --- a/src/main/java/org/gitlab4j/api/models/Runner.java +++ b/src/main/java/org/gitlab4j/api/models/Runner.java @@ -8,8 +8,8 @@ import java.io.Serializable; public class Runner implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 8396377098769240666L; private Long id; private String description; private Boolean active; diff --git a/src/main/java/org/gitlab4j/api/models/RunnerDetail.java b/src/main/java/org/gitlab4j/api/models/RunnerDetail.java index da78e33fc..c89cab0b8 100644 --- a/src/main/java/org/gitlab4j/api/models/RunnerDetail.java +++ b/src/main/java/org/gitlab4j/api/models/RunnerDetail.java @@ -9,8 +9,8 @@ import java.util.List; public class RunnerDetail extends Runner { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 7887700856425080720L; private String architecture; private String platform; private Date contactedAt; diff --git a/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java b/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java index 2ec27598e..b7fbdbabc 100644 --- a/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java +++ b/src/main/java/org/gitlab4j/api/models/SamlGroupLink.java @@ -6,8 +6,8 @@ import java.io.Serializable; public class SamlGroupLink implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -2373881527548802762L; private String name; private AccessLevel accessLevel; diff --git a/src/main/java/org/gitlab4j/api/models/SearchBlob.java b/src/main/java/org/gitlab4j/api/models/SearchBlob.java index 472162fb1..f3606940a 100644 --- a/src/main/java/org/gitlab4j/api/models/SearchBlob.java +++ b/src/main/java/org/gitlab4j/api/models/SearchBlob.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class SearchBlob implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 5706788073342987764L; private String basename; private String data; private String filename; diff --git a/src/main/java/org/gitlab4j/api/models/SharedGroup.java b/src/main/java/org/gitlab4j/api/models/SharedGroup.java index b29ba8182..dc6ad7955 100644 --- a/src/main/java/org/gitlab4j/api/models/SharedGroup.java +++ b/src/main/java/org/gitlab4j/api/models/SharedGroup.java @@ -7,8 +7,8 @@ import java.util.Date; public class SharedGroup implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 9147215839960756743L; private Long groupId; private String groupName; private String groupFullPath; diff --git a/src/main/java/org/gitlab4j/api/models/Snippet.java b/src/main/java/org/gitlab4j/api/models/Snippet.java index 1b4d4e822..47c009e4b 100644 --- a/src/main/java/org/gitlab4j/api/models/Snippet.java +++ b/src/main/java/org/gitlab4j/api/models/Snippet.java @@ -29,8 +29,8 @@ import java.util.Date; public class Snippet implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -3693726269760539889L; private Author author; private Date createdAt; private Date expiresAt; diff --git a/src/main/java/org/gitlab4j/api/models/SshKey.java b/src/main/java/org/gitlab4j/api/models/SshKey.java index c072bfe0c..a7f38137c 100644 --- a/src/main/java/org/gitlab4j/api/models/SshKey.java +++ b/src/main/java/org/gitlab4j/api/models/SshKey.java @@ -7,8 +7,8 @@ import java.util.Date; public class SshKey implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -2559632392834817632L; private Long id; private String title; private String key; diff --git a/src/main/java/org/gitlab4j/api/models/SystemHook.java b/src/main/java/org/gitlab4j/api/models/SystemHook.java index 02d626932..be36847cd 100644 --- a/src/main/java/org/gitlab4j/api/models/SystemHook.java +++ b/src/main/java/org/gitlab4j/api/models/SystemHook.java @@ -6,8 +6,8 @@ import java.util.Date; public class SystemHook implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 5755753266987012078L; private Long id; private String url; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/Tag.java b/src/main/java/org/gitlab4j/api/models/Tag.java index e61cb9d5a..2d58a4b11 100644 --- a/src/main/java/org/gitlab4j/api/models/Tag.java +++ b/src/main/java/org/gitlab4j/api/models/Tag.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class Tag implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -1006308726664414044L; private Commit commit; private String message; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java b/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java index d24180f58..f348cac67 100644 --- a/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java +++ b/src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class TaskCompletionStatus implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 2425961171229796182L; 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 7827803b3..c92cc90d9 100644 --- a/src/main/java/org/gitlab4j/api/models/TimeStats.java +++ b/src/main/java/org/gitlab4j/api/models/TimeStats.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class TimeStats implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -2557491371640747430L; private Integer timeEstimate; private Integer totalTimeSpent; private Duration humanTimeEstimate; diff --git a/src/main/java/org/gitlab4j/api/models/Todo.java b/src/main/java/org/gitlab4j/api/models/Todo.java index 9bed13ea3..2237077e6 100644 --- a/src/main/java/org/gitlab4j/api/models/Todo.java +++ b/src/main/java/org/gitlab4j/api/models/Todo.java @@ -18,8 +18,8 @@ import java.util.Date; public class Todo implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -1612489661279498902L; private Long id; private Project project; private Author author; diff --git a/src/main/java/org/gitlab4j/api/models/Topic.java b/src/main/java/org/gitlab4j/api/models/Topic.java index f458a2cc3..7ce72c21f 100644 --- a/src/main/java/org/gitlab4j/api/models/Topic.java +++ b/src/main/java/org/gitlab4j/api/models/Topic.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class Topic implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -5509038784155015404L; private Integer id; private String name; diff --git a/src/main/java/org/gitlab4j/api/models/TopicParams.java b/src/main/java/org/gitlab4j/api/models/TopicParams.java index 5cc03bd01..b5ccb15dc 100644 --- a/src/main/java/org/gitlab4j/api/models/TopicParams.java +++ b/src/main/java/org/gitlab4j/api/models/TopicParams.java @@ -14,8 +14,8 @@ * Avatar Upload has its own Upload in {@link TopicsApi#updateTopicAvatar(Integer,File)} */ public class TopicParams implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -2248684441661568431L; private String name; private String title; private String description; diff --git a/src/main/java/org/gitlab4j/api/models/TreeItem.java b/src/main/java/org/gitlab4j/api/models/TreeItem.java index 1ef48ef09..7bf3e6c5a 100644 --- a/src/main/java/org/gitlab4j/api/models/TreeItem.java +++ b/src/main/java/org/gitlab4j/api/models/TreeItem.java @@ -5,8 +5,7 @@ import java.io.Serializable; public class TreeItem implements Serializable { - - private static final long serialVersionUID = -6095523498844753989L; + 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 b601aa3ee..6ebb0c84d 100644 --- a/src/main/java/org/gitlab4j/api/models/Trigger.java +++ b/src/main/java/org/gitlab4j/api/models/Trigger.java @@ -4,8 +4,8 @@ import java.util.Date; public class Trigger implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = -5834519760065786408L; private Long id; private String description; private Date createdAt; diff --git a/src/main/java/org/gitlab4j/api/models/User.java b/src/main/java/org/gitlab4j/api/models/User.java index 041a06b45..d106e4031 100644 --- a/src/main/java/org/gitlab4j/api/models/User.java +++ b/src/main/java/org/gitlab4j/api/models/User.java @@ -6,8 +6,8 @@ import java.util.List; public class User extends AbstractUser { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 5181333036356031840L; private String bio; private Boolean bot; private Boolean canCreateGroup; diff --git a/src/main/java/org/gitlab4j/api/models/Variable.java b/src/main/java/org/gitlab4j/api/models/Variable.java index 7c4622f12..8eb59cb37 100644 --- a/src/main/java/org/gitlab4j/api/models/Variable.java +++ b/src/main/java/org/gitlab4j/api/models/Variable.java @@ -12,8 +12,7 @@ import java.util.Map; public class Variable implements Serializable { - - private static final long serialVersionUID = 5873211613037430191L; + 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 c9c1a17af..c0745b980 100644 --- a/src/main/java/org/gitlab4j/api/models/Version.java +++ b/src/main/java/org/gitlab4j/api/models/Version.java @@ -5,8 +5,8 @@ import java.io.Serializable; public class Version implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 7123100394598007342L; 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 9c70cd463..fe261f3cd 100644 --- a/src/main/java/org/gitlab4j/api/models/WikiAttachment.java +++ b/src/main/java/org/gitlab4j/api/models/WikiAttachment.java @@ -5,11 +5,11 @@ import java.io.Serializable; public class WikiAttachment implements Serializable { - - private static final long serialVersionUID = -7916180068718971133L; + private static final long serialVersionUID = 1L; public static class Link implements Serializable { - private static final long serialVersionUID = -5037434183307088155L; + private static final long serialVersionUID = 1L; + private String url; private String markdown; diff --git a/src/main/java/org/gitlab4j/api/models/WikiPage.java b/src/main/java/org/gitlab4j/api/models/WikiPage.java index 9233b2905..931d25647 100644 --- a/src/main/java/org/gitlab4j/api/models/WikiPage.java +++ b/src/main/java/org/gitlab4j/api/models/WikiPage.java @@ -28,8 +28,8 @@ import java.io.Serializable; public class WikiPage implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1105471433119053382L; private String title; private String content; private String slug; diff --git a/src/main/java/org/gitlab4j/api/services/NotificationService.java b/src/main/java/org/gitlab4j/api/services/NotificationService.java index c1d746340..d875e6a86 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 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 c41d2f6a4..bfd47d2fe 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 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 785df9430..c2684b56a 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.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; From c5dd96dc5437504b16fa224fae30987b03597db1 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Wed, 20 Dec 2023 15:22:10 +0100 Subject: [PATCH 5/5] Make sure the tests using "unmarshalResource" are checking if the model class is Serializable --- src/test/java/org/gitlab4j/api/JsonUtils.java | 87 ++++++++++++++++++- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/gitlab4j/api/JsonUtils.java b/src/test/java/org/gitlab4j/api/JsonUtils.java index b247677e0..d90e095e7 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 @@ static JsonNode readTreeFromResource(String filename) throws JsonParseException, } 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));