From a9b9c77333a1bd9184da1ac0acfc2cfe5e011ee5 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Wed, 6 May 2020 13:17:21 +0200 Subject: [PATCH] extend equalsAndHashcode annotation on changeset with callSuper attribute --- .../java/sonia/scm/repository/Changeset.java | 2 +- .../scm/repository/ChangesetPagingResult.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 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 f6566806fd..19ae7c31da 100644 --- a/scm-core/src/main/java/sonia/scm/repository/Changeset.java +++ b/scm-core/src/main/java/sonia/scm/repository/Changeset.java @@ -39,7 +39,7 @@ import java.util.List; * * @author Sebastian Sdorra */ -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = true) public class Changeset extends BasicPropertiesAware implements ModelObject { private static final long serialVersionUID = -8373308448928993039L; diff --git a/scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java b/scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java index f5bd3a06d4..d3c9a9ed3f 100644 --- a/scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java +++ b/scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java @@ -25,7 +25,6 @@ package sonia.scm.repository; import com.google.common.base.Objects; -import lombok.Setter; import lombok.ToString; import java.io.Serializable; @@ -39,7 +38,6 @@ import java.util.List; * @author Sebastian Sdorra */ @ToString -@Setter public class ChangesetPagingResult implements Iterable, Serializable { private static final long serialVersionUID = -8678755403658841733L; @@ -137,4 +135,18 @@ public class ChangesetPagingResult implements Iterable, Serializable return branchName; } + void setChangesets(List changesets) + { + this.changesets = changesets; + } + + void setTotal(int total) + { + this.total = total; + } + + void setBranchName(String branchName) { + this.branchName = branchName; + } + }