From fdf6991b16fe5e4c0d6f91a8e232a795f4e7cabc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 8 Jun 2020 13:04:20 +0200 Subject: [PATCH] Simplify API --- .../src/main/java/sonia/scm/repository/Changeset.java | 9 ++++++++- .../java/sonia/scm/repository/GitChangesetConverter.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/Changeset.java b/scm-core/src/main/java/sonia/scm/repository/Changeset.java index 5b5b1f2e5b..e00480bc6a 100644 --- a/scm-core/src/main/java/sonia/scm/repository/Changeset.java +++ b/scm-core/src/main/java/sonia/scm/repository/Changeset.java @@ -311,7 +311,14 @@ public class Changeset extends BasicPropertiesAware implements ModelObject { } public void setTrailers(Collection trailers) { - this.trailers = trailers; + this.trailers = new ArrayList<>(trailers); + } + + public void addTrailer(Trailer trailer) { + if (trailers == null) { + trailers = new ArrayList<>(); + } + trailers.add(trailer); } public void addTrailers(Collection trailers) { diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java index 51c18449f2..0dca45aa35 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java @@ -182,7 +182,7 @@ public class GitChangesetConverter implements Closeable Changeset changeset = new Changeset(id, date, author, message); if (!committerIdent.equals(authorIndent)) { - changeset.addTrailers(Collections.singleton(new Trailer("Committed-by", createPersonFor(committerIdent)))); + changeset.addTrailer(new Trailer("Committed-by", createPersonFor(committerIdent))); } if (parentList != null)