From 1b00abcf91a158399658b1a3d69a285df03fbaca Mon Sep 17 00:00:00 2001
From: TheBestPessimist <cristian@tbp.land>
Date: Fri, 24 Apr 2020 13:15:11 +0300
Subject: [PATCH] Add Builder to CommentEntry instead of `of`

https://github.com/metasfresh/metasfresh/issues/6504
---
 .../main/java/de/metas/comments/CommentEntry.java  | 14 +++++++-------
 .../de/metas/comments/CommentEntryRepository.java  |  7 ++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/comments/CommentEntry.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/comments/CommentEntry.java
index df88683a180..f3012f32157 100644
--- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/comments/CommentEntry.java
+++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/comments/CommentEntry.java
@@ -23,6 +23,7 @@
 package de.metas.comments;
 
 import de.metas.user.UserId;
+import lombok.Builder;
 import lombok.NonNull;
 import lombok.Value;
 
@@ -39,17 +40,16 @@ public class CommentEntry
 
 	@NonNull CommentEntryId id;
 
-	private CommentEntry(@NonNull final UserId createdBy, @NonNull final ZonedDateTime created, @NonNull final String text, @NonNull final CommentEntryId id)
+	@Builder
+	private CommentEntry(
+			@NonNull final UserId createdBy,
+			@NonNull final ZonedDateTime created,
+			@NonNull final String text,
+			@NonNull final CommentEntryId id)
 	{
 		this.createdBy = createdBy;
 		this.created = created;
 		this.text = text;
 		this.id = id;
 	}
-
-	@NonNull
-	public static CommentEntry of(@NonNull final UserId createdBy, @NonNull final ZonedDateTime created, @NonNull final String text, @NonNull final CommentEntryId id)
-	{
-		return new CommentEntry(createdBy, created, text, id);
-	}
 }
diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/comments/CommentEntryRepository.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/comments/CommentEntryRepository.java
index 69b63775983..fc50efbd1f2 100644
--- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/comments/CommentEntryRepository.java
+++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/comments/CommentEntryRepository.java
@@ -95,7 +95,12 @@ private static CommentEntry toRecordComment(@NonNull final I_CM_ChatEntry chatEn
 		final String text = chatEntry.getCharacterData();
 		final CommentEntryId id = CommentEntryId.ofRepoId(chatEntry.getCM_ChatEntry_ID());
 
-		return CommentEntry.of(createdBy, created, text, id);
+		return CommentEntry.builder()
+				.created(created)
+				.createdBy(createdBy)
+				.text(text)
+				.id(id)
+				.build();
 	}
 
 	@NonNull