Merge pull request #4 from rillig/fix-date-comparison-in-tests

Fix date comparison in JpaCityServiceTest

README.md

@@ -1,3 +1,5 @@
 # spring-kotlin-jpa
 
 This repository contains sample code using Spring Boot and Kotlin to work with JPA.
+
+For further information, please refer to this [article](https://blog.codecentric.de/en/2017/06/kotlin-spring-working-jpa-data-classes/) on the codecentric blog.

domain/src/main/kotlin/de/rpr/mycity/domain/DoubleAttributeConverter.kt

@@ -5,15 +5,9 @@ import javax.persistence.AttributeConverter
 
 class DoubleAttributeConverter : AttributeConverter<Double, BigDecimal?> {
 
-    override fun convertToDatabaseColumn(attribute: Double?): BigDecimal? {
+    override fun convertToDatabaseColumn(attribute: Double?) =
-        return if (attribute != null) {
+            if (attribute != null) { BigDecimal(attribute) } else { null }
-            BigDecimal(attribute)
-        } else {
-            null
-        }
-    }
 
-    override fun convertToEntityAttribute(dbData: BigDecimal?): Double? {
+    override fun convertToEntityAttribute(dbData: BigDecimal?) =
-        return dbData?.toDouble()
+            dbData?.toDouble()
-    }
 }

domain/src/main/kotlin/de/rpr/mycity/domain/city/entity/CityEntity.kt

@@ -21,13 +21,6 @@ internal data class CityEntity(
         val updatedAt: LocalDateTime = LocalDateTime.now(),
         val createdAt: LocalDateTime = LocalDateTime.now()) {
 
-    // Default constructor for JPA
-    @Suppress("unused")
-    private constructor() : this(
-            name = "",
-            location = Coordinate.origin(),
-            updatedAt = LocalDateTime.MIN)
-
     fun toDto(): CityDto = CityDto(
             id = this.id!!,
             name = this.name,

domain/src/test/kotlin/de/rpr/mycity/domain/city/JpaCityServiceTest.kt

@@ -94,6 +94,8 @@ internal class JpaCityServiceTest {
     fun `'updateCity' should update existing values`() {
         val existingCity = repository.save(CityEntity("city", "cityname", "description", Coordinate(1.0, -1.0))).toDto()
 
+        Thread.sleep(1)
+
         val result = service.updateCity(existingCity.id, UpdateCityDto("new name", "new description", CoordinateDto(-1.0, -1.0)))
 
         softly.assertThat(result).isNotNull
@@ -102,7 +104,6 @@ internal class JpaCityServiceTest {
         softly.assertThat(result?.description).isEqualTo("new description")
         softly.assertThat(result?.location).isEqualTo(CoordinateDto(-1.0, -1.0))
         softly.assertThat(result?.updatedAt).isAfter(existingCity.updatedAt)
-        softly.assertThat(result?.updatedAt).isAfter(existingCity.updatedAt)
         softly.assertThat(result?.createdAt).isEqualTo(existingCity.createdAt)
     }
 
@@ -115,6 +116,8 @@ internal class JpaCityServiceTest {
                 location = Coordinate(1.0, -1.0),
                 updatedAt = LocalDateTime.now().minusYears(1))).toDto()
 
+        Thread.sleep(1)
+
         val result = service.updateCity(existingCity.id, UpdateCityDto(null, null, null))
 
         softly.assertThat(result).isNotNull
@@ -125,4 +128,4 @@ internal class JpaCityServiceTest {
         softly.assertThat(result?.updatedAt).isAfter(existingCity.updatedAt)
         softly.assertThat(result?.createdAt).isEqualTo(existingCity.createdAt)
     }
-}
+}

pom.xml

@@ -8,13 +8,13 @@
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name></name>
+  <name>Spring Boot Kotlin and JPA Demo</name>
   <description>Demo project for Spring Boot</description>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.3.RELEASE</version>
+    <version>1.5.9.RELEASE</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
@@ -23,9 +23,11 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.8</java.version>
-    <kotlin.version>1.1.2-2</kotlin.version>
+    <kotlin.version>1.2.10</kotlin.version>
-    <mockito.version>2.8.9</mockito.version>
+    <mockito.version>2.13.0</mockito.version>
     <assertj.version>3.8.0</assertj.version>
+    <mockito-kotlin.version>1.5.0</mockito-kotlin.version>
+    <jackson.version>2.9.3</jackson.version>
   </properties>
 
   <modules>
@@ -89,7 +91,7 @@
     <dependency>
       <groupId>com.nhaarman</groupId>
       <artifactId>mockito-kotlin</artifactId>
-      <version>1.4.0</version>
+      <version>${mockito-kotlin.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -105,6 +107,7 @@
         <configuration>
           <compilerPlugins>
             <plugin>spring</plugin>
+            <plugin>jpa</plugin>
           </compilerPlugins>
           <jvmTarget>1.8</jvmTarget>
         </configuration>
@@ -130,6 +133,11 @@
             <artifactId>kotlin-maven-allopen</artifactId>
             <version>${kotlin.version}</version>
           </dependency>
+          <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-maven-noarg</artifactId>
+            <version>${kotlin.version}</version>
+          </dependency>
         </dependencies>
       </plugin>
     </plugins>

web/src/main/kotlin/de/rpr/mycity/Application.kt

@@ -1,8 +1,5 @@
 package de.rpr.mycity
 
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.InjectionPoint
@@ -18,13 +15,6 @@ class Application {
     @Scope("prototype")
     fun logger(injectionPoint: InjectionPoint): Logger = LoggerFactory.getLogger(injectionPoint.methodParameter.containingClass)
 
-    @Bean
-    fun objectMapper(): ObjectMapper {
-        val mapper = ObjectMapper().registerModule(KotlinModule())
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-        return mapper
-    }
-
 }
 
 fun main(args: Array<String>) {