simplified structure of packages

Author: antonarhipov

Diff for: src/main/kotlin/com/example/kotlin/chat/controller/HtmlController.kt

@@ -1,7 +1,7 @@
 package com.example.kotlin.chat.controller
 
 import com.example.kotlin.chat.service.MessageService
-import com.example.kotlin.chat.service.vm.MessageVM
+import com.example.kotlin.chat.service.MessageVM
 import org.springframework.stereotype.Controller
 import org.springframework.ui.Model
 import org.springframework.ui.set

Diff for: src/main/kotlin/com/example/kotlin/chat/controller/MessageResource.kt

@@ -1,7 +1,7 @@
 package com.example.kotlin.chat.controller
 
 import com.example.kotlin.chat.service.MessageService
-import com.example.kotlin.chat.service.vm.MessageVM
+import com.example.kotlin.chat.service.MessageVM
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 

Diff for: src/main/kotlin/com/example/kotlin/chat/service/impl/FakeMessageService.kt renamed to src/main/kotlin/com/example/kotlin/chat/service/FakeMessageService.kt

@@ -1,8 +1,5 @@
-package com.example.kotlin.chat.service.impl
+package com.example.kotlin.chat.service
 
-import com.example.kotlin.chat.service.MessageService
-import com.example.kotlin.chat.service.vm.MessageVM
-import com.example.kotlin.chat.service.vm.UserVM
 import com.github.javafaker.Faker
 import org.springframework.stereotype.Service
 import java.net.URL

Diff for: src/main/kotlin/com/example/kotlin/chat/service/MessageService.kt

@@ -1,7 +1,5 @@
 package com.example.kotlin.chat.service
 
-import com.example.kotlin.chat.service.vm.MessageVM
-
 interface MessageService {
 
     fun latest(): List<MessageVM>

Diff for: src/main/kotlin/com/example/kotlin/chat/service/ViewModel.kt

@@ -0,0 +1,8 @@
+package com.example.kotlin.chat.service
+
+import java.net.URL
+import java.time.Instant
+
+data class MessageVM(val content: String, val user: UserVM, val sent: Instant, val id: String? = null)
+
+data class UserVM(val name: String, val avatarImageLink: URL)