[FIX] #26 SpringBootJpa

- refactoring

Author: heowc

Diff for: SpringBootJpa/src/main/kotlin/com/example/kotlin/simple/domain/Customer.kt

@@ -4,7 +4,7 @@ import javax.persistence.*
 
 @Entity
 @NamedQuery(name = "Custom.findByName", query = "SELECT c FROM Customer c WHERE c.name = :name ")
-class Customer(
+data class Customer(
         @Id @GeneratedValue val idx: Long? = null,
         @Column(length = 50) val name: String,
         @Column(length = 14) val tel: String,

Diff for: SpringBootJpa/src/main/kotlin/com/example/kotlin/simple/domain/TimeData.kt

@@ -7,7 +7,7 @@ import javax.persistence.Id
 import java.time.LocalDateTime
 
 @Entity
-class TimeData(
+data class TimeData(
         @Id @GeneratedValue val idx: Long? = null,
         val date: LocalDateTime) {
 

Diff for: SpringBootJpa/src/main/kotlin/com/example/kotlin/simple/repository/SimpleCustomJpqlRepository.kt

@@ -1,17 +1,12 @@
 package com.example.kotlin.simple.repository
 
 import com.example.kotlin.simple.domain.Customer
-
 import javax.persistence.EntityManager
-import javax.persistence.PersistenceContext
-
-class SimpleCustomJpqlRepository : CustomJpqlRepository {
 
-    @PersistenceContext
-    private val em: EntityManager? = null
+class SimpleCustomJpqlRepository(val em: EntityManager) : CustomJpqlRepository {
 
     override fun findByName(name: String): List<Customer> {
-        return em!!.createNamedQuery("Custom.findByName", Customer::class.java)
+        return em.createNamedQuery("Custom.findByName", Customer::class.java)
                 .setParameter("name", name)
                 .resultList
     }

Diff for: SpringBootJpa/src/main/kotlin/com/example/kotlin/simple/service/SimpleCustomerService.kt

@@ -9,25 +9,22 @@ import java.util.function.Supplier
 
 @Service
 @Transactional
-class SimpleCustomerService : CustomService {
-
-    @Autowired
-    private val repository: CustomerRepository? = null
+class SimpleCustomerService(val repository: CustomerRepository) : CustomService {
 
     override fun upsert(customer: Customer): Customer {
-        return repository!!.save(customer)
+        return repository.save(customer)
     }
 
     override fun find(idx: Long?): Customer {
-        return repository!!.findById(idx!!).orElseThrow<RuntimeException> { RuntimeException() }
+        return repository.findById(idx!!).orElseThrow<RuntimeException> { RuntimeException() }
     }
 
     override fun findByName(name: String): List<Customer> {
-        return repository!!.findByName(name)
+        return repository.findByName(name)
     }
 
     override fun delete(customer: Customer): Customer {
-        repository!!.delete(customer)
+        repository.delete(customer)
         return customer
     }
 }

Diff for: SpringBootJpa/src/main/kotlin/com/example/kotlin/simple/web/CustomController.kt

@@ -8,23 +8,20 @@ import org.springframework.web.bind.annotation.*
 
 @RestController
 @RequestMapping("/customer")
-class CustomController {
-
-    @Autowired
-    private val service: CustomService? = null
+class CustomController(val service: CustomService) {
 
     @PostMapping
     fun upsert(@RequestBody customer: Customer): ResponseEntity<*> {
-        return ResponseEntity.ok(service!!.upsert(customer))
+        return ResponseEntity.ok(service.upsert(customer))
     }
 
     @GetMapping(value = ["/findByName"])
     fun findByName(@RequestParam("name") name: String): ResponseEntity<*> {
-        return ResponseEntity.ok(service!!.findByName(name))
+        return ResponseEntity.ok(service.findByName(name))
     }
 
     @GetMapping(value = ["/{id}"])
     fun find(@PathVariable("id") id: Long?): ResponseEntity<*> {
-        return ResponseEntity.ok(service!!.find(id))
+        return ResponseEntity.ok(service.find(id))
     }
 }

Diff for: SpringBootJpa/src/test/kotlin/com/example/kotlin/CustomerRepositoryTests.kt

@@ -15,11 +15,11 @@ import org.springframework.test.context.junit4.SpringRunner
 open class CustomerRepositoryTests {
 
     @Autowired
-    private val repository: CustomerRepository? = null
+    lateinit var repository: CustomerRepository
 
     @Test
     fun test_update() {
-        val customer = repository!!.save(Customer(name = "heo won chul", tel =  "010-xxxx-xxxx", bigo = "developer"))  // 비영속성 데이터
+        val customer = repository.save(Customer(name = "heo won chul", tel = "010-xxxx-xxxx", bigo = "developer"))  // 비영속성 데이터
         customer.changeBigo("Developer")
 
         assertNotEquals(repository.save(customer).bigo, "developer")

Diff for: SpringBootJpa/src/test/kotlin/com/example/kotlin/EntityManagerTests.kt

@@ -14,11 +14,11 @@ import org.springframework.test.context.junit4.SpringRunner
 open class EntityManagerTests {
 
     @Autowired
-    private val testEntityManager: TestEntityManager? = null
+    lateinit var testEntityManager: TestEntityManager
 
     @Test
     fun test_insertClearAndFindAndUpdateClear() {
-        val customer = testEntityManager!!.persistFlushFind(com.example.kotlin.simple.domain.Customer(name = "heo won chul", tel = "010-xxxx-xxxx", bigo = "developer")) // 비영속성 데이터
+        val customer = testEntityManager.persistFlushFind(com.example.kotlin.simple.domain.Customer(name = "heo won chul", tel = "010-xxxx-xxxx", bigo = "developer")) // 비영속성 데이터
         customer.changeBigo("Developer")
         testEntityManager.flush() // Database 동기화
         //		  testEntityManager.clear(); // Persistence Context 초기화

Diff for: SpringBootJpa/src/test/kotlin/com/example/kotlin/TimeTests.kt

@@ -15,11 +15,11 @@ import java.time.LocalDateTime
 class TimeTests {
 
     @Autowired
-    internal var timeDataRepository: TimeDataRepository? = null
+    lateinit var timeDataRepository: TimeDataRepository
 
     @Test
     fun test_save() {
-        timeDataRepository!!.save(TimeData(date = LocalDateTime.now()))
+        timeDataRepository.save(TimeData(date = LocalDateTime.now()))
     }
 
 }