Convert ChatMessage domain entity to kotlin.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>

ultrasonic/src/main/java/org/moire/ultrasonic/domain/ChatMessage.java

@@ -1,64 +0,0 @@
-package org.moire.ultrasonic.domain;
-
-import java.io.Serializable;
-
-public class ChatMessage implements Serializable
-{
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 496544310289324167L;
-	private String username;
-	private Long time;
-	private String message;
-
-	public String getUsername()
-	{
-		return username;
-	}
-
-	public void setUsername(String username)
-	{
-		this.username = username;
-	}
-
-	public Long getTime()
-	{
-		return time;
-	}
-
-	public void setTime(Long time)
-	{
-		this.time = time;
-	}
-
-	public String getMessage()
-	{
-		return message;
-	}
-
-	public void setMessage(String message)
-	{
-		this.message = message;
-	}
-
-	@Override
-	public boolean equals(Object o)
-	{
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-
-		ChatMessage that = (ChatMessage) o;
-
-		return message.equals(that.message) && time.equals(that.time) && username.equals(that.username);
-	}
-
-	@Override
-	public int hashCode()
-	{
-		int result = username.hashCode();
-		result = 31 * result + time.hashCode();
-		result = 31 * result + message.hashCode();
-		return result;
-	}
-}

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverter.kt

@@ -4,11 +4,11 @@ package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.ChatMessage as ApiChatMessage
 
-fun ApiChatMessage.toDomainEntity(): ChatMessage = ChatMessage().apply {
-    username = this@toDomainEntity.username
-    time = this@toDomainEntity.time
+fun ApiChatMessage.toDomainEntity(): ChatMessage = ChatMessage(
+    username = this@toDomainEntity.username,
+    time = this@toDomainEntity.time,
     message = this@toDomainEntity.message
-}
+)
 
 fun List<ApiChatMessage>.toDomainEntitiesList(): List<ChatMessage> = this
         .map { it.toDomainEntity() }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/ChatMessage.kt

@@ -0,0 +1,13 @@
+package org.moire.ultrasonic.domain
+
+import java.io.Serializable
+
+class ChatMessage(
+        val username: String,
+        val time: Long,
+        val message: String
+) : Serializable {
+    companion object {
+        private const val serialVersionUID = 496544310289324167L
+    }
+}

ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverterTest.kt

@@ -18,9 +18,9 @@ class APIChatMessageConverterTest {
         val domainEntity = entity.toDomainEntity()
 
         with(domainEntity) {
-            username `should equal to` entity.username
-            time `should equal to` entity.time
-            message `should equal to` entity.message
+            username `should equal` entity.username
+            time `should equal` entity.time
+            message `should equal` entity.message
         }
     }