From 1a973fe725f34c40aaf2a6d358d7cd5be5a6bd93 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Sun, 22 Dec 2019 00:13:54 +0100
Subject: [PATCH] Improve entity constructors

---
 .../java/org/mercury_im/messenger/entity/IAccount.java     | 6 +++++-
 .../org/mercury_im/messenger/entity/chat/IDirectChat.java  | 6 +++++-
 .../org/mercury_im/messenger/entity/chat/IGroupChat.java   | 6 +++++-
 .../org/mercury_im/messenger/entity/contact/IPeer.java     | 6 +++++-
 .../org/mercury_im/messenger/entity/message/IMessage.java  | 7 +++++++
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/entity/src/main/java/org/mercury_im/messenger/entity/IAccount.java b/entity/src/main/java/org/mercury_im/messenger/entity/IAccount.java
index 3248b5c..aed9b81 100644
--- a/entity/src/main/java/org/mercury_im/messenger/entity/IAccount.java
+++ b/entity/src/main/java/org/mercury_im/messenger/entity/IAccount.java
@@ -12,7 +12,11 @@ public class IAccount implements Account {
     protected boolean enabled;
 
     public IAccount() {
-        this.id = UUID.randomUUID();
+        this(UUID.randomUUID());
+    }
+
+    public IAccount(UUID id) {
+        this.id = id;
     }
 
     @Override
diff --git a/entity/src/main/java/org/mercury_im/messenger/entity/chat/IDirectChat.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IDirectChat.java
index 892d592..dd4b78c 100644
--- a/entity/src/main/java/org/mercury_im/messenger/entity/chat/IDirectChat.java
+++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IDirectChat.java
@@ -13,7 +13,11 @@ public class IDirectChat implements DirectChat {
     protected ChatPreferences preferences;
 
     public IDirectChat() {
-        this.id = UUID.randomUUID();
+        this(UUID.randomUUID());
+    }
+
+    public IDirectChat(UUID id) {
+        this.id = id;
     }
 
     @Override
diff --git a/entity/src/main/java/org/mercury_im/messenger/entity/chat/IGroupChat.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IGroupChat.java
index 1233321..3f2c248 100644
--- a/entity/src/main/java/org/mercury_im/messenger/entity/chat/IGroupChat.java
+++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IGroupChat.java
@@ -16,7 +16,11 @@ public class IGroupChat implements GroupChat {
     protected Set<Peer> participants;
 
     public IGroupChat() {
-        this.id = UUID.randomUUID();
+        this(UUID.randomUUID());
+    }
+
+    public IGroupChat(UUID id) {
+        this.id = id;
     }
 
     @Override
diff --git a/entity/src/main/java/org/mercury_im/messenger/entity/contact/IPeer.java b/entity/src/main/java/org/mercury_im/messenger/entity/contact/IPeer.java
index 0cadba8..a1e282a 100644
--- a/entity/src/main/java/org/mercury_im/messenger/entity/contact/IPeer.java
+++ b/entity/src/main/java/org/mercury_im/messenger/entity/contact/IPeer.java
@@ -15,7 +15,11 @@ public class IPeer implements Peer {
     protected boolean approved;
 
     public IPeer() {
-        this.id = UUID.randomUUID();
+        this(UUID.randomUUID());
+    }
+
+    public IPeer(UUID id) {
+        this.id = id;
     }
 
     @Override
diff --git a/entity/src/main/java/org/mercury_im/messenger/entity/message/IMessage.java b/entity/src/main/java/org/mercury_im/messenger/entity/message/IMessage.java
index 1035831..313c11f 100644
--- a/entity/src/main/java/org/mercury_im/messenger/entity/message/IMessage.java
+++ b/entity/src/main/java/org/mercury_im/messenger/entity/message/IMessage.java
@@ -15,6 +15,13 @@ public class IMessage implements Message {
     protected MessageMetadata metadata;
     protected MessageDirection direction;
 
+    public IMessage() {
+        this(UUID.randomUUID());
+    }
+
+    public IMessage(UUID id) {
+        this.id = id;
+    }
 
     @Override
     public UUID getId() {