initial commit

Author: Jony Santos

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0.M1</version>
+        <version>1.5.3.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 

src/main/kotlin/br/com/jonyfs/springbootkotlinapi/LoadData.kt

@@ -108,7 +108,7 @@ class LoadData {
         userAdmin.password = "XPTO"
         userAdmin.roles = (listOf(roleAdmin))
 
-        userRepository.saveAll(listOf(user1, user2, user3, user4, userAdmin))
+        userRepository.save(listOf(user1, user2, user3, user4, userAdmin))
     }
 
 }

src/main/kotlin/br/com/jonyfs/springbootkotlinapi/config/AuditConfig.kt

@@ -10,8 +10,6 @@ import org.springframework.data.domain.AuditorAware
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing
 import org.springframework.security.core.context.SecurityContextHolder
-import java.util.*
-import java.util.Optional.ofNullable
 
 /**
 
@@ -33,14 +31,14 @@ class AuditingConfig {
 
     class SecurityAuditor : AuditorAware<User> {
 
-        override fun getCurrentAuditor(): Optional<User>? {
+        override fun getCurrentAuditor(): User? {
             val auth = SecurityContextHolder.getContext().authentication
             if (auth != null) {
                 if (auth.details is User) {
-                    return ofNullable<User>(auth.details as User)
+                    return auth.details as User
                 }
             }
-            return Optional.empty()
+            return null
         }
     }
 

src/main/kotlin/br/com/jonyfs/springbootkotlinapi/model/AbstractAuditable.kt

@@ -4,11 +4,31 @@ package br.com.jonyfs.springbootkotlinapi.model
  * Created by jony on 28/05/17.
  */
 import br.com.jonyfs.springbootkotlinapi.user.User
+import org.springframework.data.annotation.CreatedBy
+import org.springframework.data.annotation.CreatedDate
+import org.springframework.data.annotation.LastModifiedBy
+import org.springframework.data.annotation.LastModifiedDate
 import java.io.Serializable
-import javax.persistence.EntityListeners
-import javax.persistence.MappedSuperclass
+import java.util.*
+import javax.persistence.*
 
 
 @MappedSuperclass
 @EntityListeners(org.springframework.data.jpa.domain.support.AuditingEntityListener::class)
-abstract class AuditableEntity<PK : Serializable> : AbstractAuditable<User, PK>()
+abstract class AuditableEntity : Serializable {
+
+    @Id @GeneratedValue(strategy = GenerationType.AUTO)
+    val id: Long? = null
+
+    @CreatedDate
+    val createdDate: Date? = null
+
+    @CreatedBy
+    val createdBy: User? = null
+
+    @LastModifiedDate
+    val lastModifiedDate: Date? = null
+
+    @LastModifiedBy
+    val lastModifiedBy: User? = null
+}

src/main/kotlin/br/com/jonyfs/springbootkotlinapi/model/AuditableEntity.kt

@@ -0,0 +1,21 @@
+package br.com.jonyfs.springbootkotlinapi.model
+
+import br.com.jonyfs.springbootkotlinapi.user.User
+import java.util.*
+
+/**
+ * Created by jony on 01/06/17.
+ */
+interface AuditableProjection {
+
+    fun getId(): String
+
+    fun getCreatedDate(): Date
+
+    fun getCreatedBy(): User
+
+    fun getLastModifiedDate(): Date
+
+    fun getLastModifiedBy(): User
+
+}

src/main/kotlin/br/com/jonyfs/springbootkotlinapi/model/AuditableProjection.kt

@@ -8,4 +8,4 @@ import javax.persistence.MappedSuperclass
  */
 
 @MappedSuperclass
-abstract class BaseEntity : AuditableEntity<Long>()
+abstract class BaseEntity : AuditableEntity()

src/main/kotlin/br/com/jonyfs/springbootkotlinapi/model/BaseEntity.kt

@@ -9,7 +9,7 @@ import javax.persistence.MappedSuperclass
  */
 
 @MappedSuperclass
-abstract class NamedEntity : AuditableEntity<Long>() {
+abstract class NamedEntity : AuditableEntity() {
 
     @NotEmpty
     var name: String? = null

src/main/kotlin/br/com/jonyfs/springbootkotlinapi/model/NamedEntity.kt

@@ -1,5 +1,8 @@
 package br.com.jonyfs.springbootkotlinapi.user
 
+import br.com.jonyfs.springbootkotlinapi.group.Group
+import br.com.jonyfs.springbootkotlinapi.model.AuditableProjection
+import br.com.jonyfs.springbootkotlinapi.role.Role
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.rest.core.config.Projection
 
@@ -8,14 +11,18 @@ import org.springframework.data.rest.core.config.Projection
  */
 
 @Projection(name = "virtual", types = arrayOf(User::class))
-interface UserProjection {
+interface UserProjection : AuditableProjection {
 
     fun getFirstName(): String
 
     fun getLastName(): String
 
     fun getEmail(): String
 
+    fun getGroups(): Group
+
+    fun getRoles(): Role
+
     @get:Value("#{target.firstName} #{target.lastName}")
     val fullName: String
 

src/main/kotlin/br/com/jonyfs/springbootkotlinapi/user/UserProjection.kt

@@ -1,4 +1,5 @@
 security.basic.enabled=false
-spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ
-spring.jackson.serialization-inclusion=non_null
 
+spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ
+spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
+spring.jackson.default-property-inclusion=non_null

src/main/resources/application.properties

@@ -9,11 +9,13 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.json.JacksonTester
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.context.ApplicationContext
+import org.springframework.http.HttpEntity
+import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.test.context.junit4.SpringRunner
+import org.springframework.util.LinkedMultiValueMap
 import javax.annotation.Resource
 
 
@@ -36,10 +38,6 @@ class SpringBootKotlinApiApplicationTests {
     @Resource
     lateinit var privilegeRepository: PrivilegeRepository
 
-    @Autowired
-    private val json: JacksonTester<User>? = null
-
-
     @Test
     fun testIfContextLoads() {
         assertThat(applicationContext).isNotNull()
@@ -79,12 +77,14 @@ class SpringBootKotlinApiApplicationTests {
 
         assertThat(response).isNotNull()
 
+        assertThat(response.statusCode).isEqualTo(HttpStatus.OK)
+
         var savedUser = response.body
 
         assertThat(savedUser).isNotNull()
         assertThat(savedUser.firstName).isNotNull()
-
-
+        assertThat(savedUser.createdDate).isNotNull()
+        assertThat(savedUser.lastModifiedDate).isNotNull()
     }
 
     @Test
@@ -96,11 +96,21 @@ class SpringBootKotlinApiApplicationTests {
         user2.email = "john.silva@test.com"
         user2.password = "XPTO"
 
+        val map = LinkedMultiValueMap<String, Any>()
+        map.add("firstName", "John")
+        map.add("lastName", "Silva")
+        map.add("email", "john.silva@test.com")
+        map.add("password", "XPTO")
+
+        val request = HttpEntity(user2)
         var response: ResponseEntity<User> = restTemplate.postForEntity("/users", user2, User::class.java)
 
         assertThat(response.body).isNotNull()
+        assertThat(response.statusCode).isEqualTo(HttpStatus.CREATED)
         assertThat(response.body.firstName).isEqualTo(user2.firstName)
         assertThat(response.headers["location"]).isNotNull
+        assertThat(response.body.createdDate).isNotNull()
+        assertThat(response.body.lastModifiedDate).isNotNull()
 
     }