From 0e0ce5e0c5df5263d18cb8a6645c985f64383df6 Mon Sep 17 00:00:00 2001 From: Tomas Bjerre Date: Sun, 24 Apr 2016 09:29:27 +0200 Subject: [PATCH] Making API model serializable --- CHANGELOG.md | 13 +++++++++++-- .../se/bjurr/gitchangelog/api/model/Author.java | 4 +++- .../se/bjurr/gitchangelog/api/model/Changelog.java | 4 +++- .../se/bjurr/gitchangelog/api/model/Commit.java | 4 +++- .../java/se/bjurr/gitchangelog/api/model/Issue.java | 4 +++- .../se/bjurr/gitchangelog/api/model/IssueType.java | 5 ++++- .../java/se/bjurr/gitchangelog/api/model/Tag.java | 4 +++- .../gitchangelog/internal/settings/Settings.java | 5 ++++- .../internal/settings/SettingsIssue.java | 6 +++++- 9 files changed, 39 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46bcfcb4..6a08e727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ Changelog of Git Changelog. ## Next release +### Other changes + +**Making API model serializable** + + +[63fbadfe4b91659](https://github.com/tomasbjerre/git-changelog-lib/commit/63fbadfe4b91659) Tomas Bjerre *2016-04-24 07:29:27* + + +## 1.45 ### GitHub [#26](https://github.com/tomasbjerre/git-changelog-lib/issues/26) Excluded commits are included JENKINS-34156 **Including correct commits + performance** @@ -10,7 +19,7 @@ Changelog of Git Changelog. * Found major performance problem when sorting tags by commit time, fixed. * Now not following parents, unless *from* is merged into them. -[f705914a7c62ac7](https://github.com/tomasbjerre/git-changelog-lib/commit/f705914a7c62ac7) Tomas Bjerre *2016-04-13 18:27:53* +[e3106df640b693b](https://github.com/tomasbjerre/git-changelog-lib/commit/e3106df640b693b) Tomas Bjerre *2016-04-13 18:30:26* ### Jira JENKINS-34156 @@ -20,7 +29,7 @@ Changelog of Git Changelog. * Found major performance problem when sorting tags by commit time, fixed. * Now not following parents, unless *from* is merged into them. -[f705914a7c62ac7](https://github.com/tomasbjerre/git-changelog-lib/commit/f705914a7c62ac7) Tomas Bjerre *2016-04-13 18:27:53* +[e3106df640b693b](https://github.com/tomasbjerre/git-changelog-lib/commit/e3106df640b693b) Tomas Bjerre *2016-04-13 18:30:26* ## 1.44 diff --git a/src/main/java/se/bjurr/gitchangelog/api/model/Author.java b/src/main/java/se/bjurr/gitchangelog/api/model/Author.java index 14537efc..ccc656f9 100644 --- a/src/main/java/se/bjurr/gitchangelog/api/model/Author.java +++ b/src/main/java/se/bjurr/gitchangelog/api/model/Author.java @@ -1,10 +1,12 @@ package se.bjurr.gitchangelog.api.model; +import java.io.Serializable; import java.util.List; import se.bjurr.gitchangelog.api.model.interfaces.ICommits; -public class Author implements ICommits { +public class Author implements ICommits, Serializable { + private static final long serialVersionUID = -672028657732998142L; private final List commits; private final String authorName; private final String authorEmail; diff --git a/src/main/java/se/bjurr/gitchangelog/api/model/Changelog.java b/src/main/java/se/bjurr/gitchangelog/api/model/Changelog.java index 799eb71d..5affedfe 100644 --- a/src/main/java/se/bjurr/gitchangelog/api/model/Changelog.java +++ b/src/main/java/se/bjurr/gitchangelog/api/model/Changelog.java @@ -2,13 +2,15 @@ import static com.google.common.base.Preconditions.checkNotNull; +import java.io.Serializable; import java.util.List; import se.bjurr.gitchangelog.api.model.interfaces.IAuthors; import se.bjurr.gitchangelog.api.model.interfaces.ICommits; import se.bjurr.gitchangelog.api.model.interfaces.IIssues; -public class Changelog implements ICommits, IAuthors, IIssues { +public class Changelog implements ICommits, IAuthors, IIssues, Serializable { + private static final long serialVersionUID = 2193789018496738737L; private final List commits; private final List tags; private final List authors; diff --git a/src/main/java/se/bjurr/gitchangelog/api/model/Commit.java b/src/main/java/se/bjurr/gitchangelog/api/model/Commit.java index 2c264dd4..c4e873c1 100644 --- a/src/main/java/se/bjurr/gitchangelog/api/model/Commit.java +++ b/src/main/java/se/bjurr/gitchangelog/api/model/Commit.java @@ -4,11 +4,13 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Lists.newArrayList; +import java.io.Serializable; import java.util.List; import com.google.common.annotations.VisibleForTesting; -public class Commit { +public class Commit implements Serializable { + private static final long serialVersionUID = 6622555148468372816L; private final String authorName; private final String authorEmailAddress; private final String commitTime; diff --git a/src/main/java/se/bjurr/gitchangelog/api/model/Issue.java b/src/main/java/se/bjurr/gitchangelog/api/model/Issue.java index 5d7c38d7..9ce88dab 100644 --- a/src/main/java/se/bjurr/gitchangelog/api/model/Issue.java +++ b/src/main/java/se/bjurr/gitchangelog/api/model/Issue.java @@ -5,12 +5,14 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.base.Strings.nullToEmpty; +import java.io.Serializable; import java.util.List; import se.bjurr.gitchangelog.api.model.interfaces.IAuthors; import se.bjurr.gitchangelog.api.model.interfaces.ICommits; -public class Issue implements ICommits, IAuthors { +public class Issue implements ICommits, IAuthors, Serializable { + private static final long serialVersionUID = -7571341639024417199L; private final List commits; private final List authors; /** diff --git a/src/main/java/se/bjurr/gitchangelog/api/model/IssueType.java b/src/main/java/se/bjurr/gitchangelog/api/model/IssueType.java index 6bd9564c..f2b7a360 100644 --- a/src/main/java/se/bjurr/gitchangelog/api/model/IssueType.java +++ b/src/main/java/se/bjurr/gitchangelog/api/model/IssueType.java @@ -2,9 +2,12 @@ import static com.google.common.base.Preconditions.checkNotNull; +import java.io.Serializable; import java.util.List; -public class IssueType { +public class IssueType implements Serializable { + + private static final long serialVersionUID = 8850522973130773606L; private final String name; private final List issues; diff --git a/src/main/java/se/bjurr/gitchangelog/api/model/Tag.java b/src/main/java/se/bjurr/gitchangelog/api/model/Tag.java index 5e7343e5..4bd166c7 100644 --- a/src/main/java/se/bjurr/gitchangelog/api/model/Tag.java +++ b/src/main/java/se/bjurr/gitchangelog/api/model/Tag.java @@ -1,12 +1,14 @@ package se.bjurr.gitchangelog.api.model; +import java.io.Serializable; import java.util.List; import se.bjurr.gitchangelog.api.model.interfaces.IAuthors; import se.bjurr.gitchangelog.api.model.interfaces.ICommits; import se.bjurr.gitchangelog.api.model.interfaces.IIssues; -public class Tag implements ICommits, IAuthors, IIssues { +public class Tag implements ICommits, IAuthors, IIssues, Serializable { + private static final long serialVersionUID = 2140208294219785889L; private final List commits; private final List authors; private final List issues; diff --git a/src/main/java/se/bjurr/gitchangelog/internal/settings/Settings.java b/src/main/java/se/bjurr/gitchangelog/internal/settings/Settings.java index 8beabd21..88091eaf 100644 --- a/src/main/java/se/bjurr/gitchangelog/internal/settings/Settings.java +++ b/src/main/java/se/bjurr/gitchangelog/internal/settings/Settings.java @@ -17,6 +17,7 @@ import static se.bjurr.gitchangelog.api.GitChangelogApiConstants.DEFAULT_TIMEZONE; import static se.bjurr.gitchangelog.api.GitChangelogApiConstants.DEFAULT_UNTAGGED_NAME; +import java.io.Serializable; import java.net.URL; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -30,7 +31,9 @@ import com.google.common.io.Resources; import com.google.gson.Gson; -public class Settings { +public class Settings implements Serializable { + private static final long serialVersionUID = 4565886594381385244L; + private static Gson gson = new Gson(); /** diff --git a/src/main/java/se/bjurr/gitchangelog/internal/settings/SettingsIssue.java b/src/main/java/se/bjurr/gitchangelog/internal/settings/SettingsIssue.java index f167a9d7..c0eadf8e 100644 --- a/src/main/java/se/bjurr/gitchangelog/internal/settings/SettingsIssue.java +++ b/src/main/java/se/bjurr/gitchangelog/internal/settings/SettingsIssue.java @@ -3,11 +3,15 @@ import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; import static se.bjurr.gitchangelog.internal.settings.SettingsIssueType.CUSTOM; + +import java.io.Serializable; + import se.bjurr.gitchangelog.api.model.Issue; import com.google.common.base.Optional; -public class SettingsIssue { +public class SettingsIssue implements Serializable { + private static final long serialVersionUID = -658106272421601880L; /** * Use {@link SettingsIssueType#CUSTOM} when adding custom issues. */