Lade till DB-anrop.

Author: Peter Vestlin

build.gradle

@@ -12,6 +12,7 @@ buildscript {
     }
 }
 
+apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'kotlin' // Required for Kotlin integration
@@ -30,7 +31,20 @@ repositories {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" // Required for Kotlin integration
     compile 'org.springframework.boot:spring-boot-starter-web'
+    compile 'org.springframework.boot:spring-boot-starter-jdbc'
+    compile "org.springframework:spring-tx"
+    compile "org.springframework:spring-jdbc"
+    compile "com.h2database:h2:1.4.191"
+    compile "javax.inject:javax.inject:1"
+    compile "org.springframework.boot:spring-boot-starter-actuator"
+    compile "com.google.guava:guava:19.0"
+
+    compile "org.springframework.boot:spring-boot-devtools"
+
+
     testCompile 'junit:junit'
+
+
 }
 
 springBoot {

src/main/kotlin/nu/westlin/kartrepo/Application.kt

@@ -10,8 +10,9 @@ open class Application {
 
     @Bean
     open fun init(repository: KartRepository) = CommandLineRunner {
-        repository.store(User("pwestlin", "Peter", "Westlin"))
-        repository.store(User("awestlin", "Adam", "Westlin"))
+        repository.store(Driver("pwestlin", "Peter", "Westlin"))
+        repository.store(Driver("awestlin", "Adam", "Westlin"))
+        repository.store(Driver("fwestlin", "Felix", "Westlin"))
     }
 
 }

src/main/kotlin/nu/westlin/kartrepo/DatabaseConfiguration.kt

@@ -0,0 +1,31 @@
+package nu.westlin.kartrepo
+
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.jdbc.core.JdbcOperations
+import org.springframework.jdbc.core.JdbcTemplate
+import org.springframework.jdbc.datasource.DataSourceTransactionManager
+import org.springframework.transaction.PlatformTransactionManager
+import javax.inject.Inject
+import javax.sql.DataSource
+
+/**
+ * Database configuration.
+ */
+@Configuration
+open class DatabaseConfiguration {
+
+    @Inject
+    lateinit protected var dataSource: DataSource
+
+    @Bean
+    open fun transactionManager(): PlatformTransactionManager {
+        return DataSourceTransactionManager(this.dataSource)
+    }
+
+    @Bean
+    open fun jdbcOperations(): JdbcOperations {
+        return JdbcTemplate(this.dataSource)
+    }
+
+}

src/main/kotlin/nu/westlin/kartrepo/Driver.kt

@@ -0,0 +1,3 @@
+package nu.westlin.kartrepo
+
+data class Driver(val alias: String, val firstname: String, val lastname: String)

src/main/kotlin/nu/westlin/kartrepo/KartController.kt

@@ -1,28 +1,45 @@
 package nu.westlin.kartrepo
 
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.dao.IncorrectResultSizeDataAccessException
 import org.springframework.http.HttpStatus
+import org.springframework.jdbc.core.JdbcOperations
 import org.springframework.web.bind.annotation.*
-import javax.servlet.http.HttpServletResponse
 
 @RestController
-class KartController @Autowired constructor(val kartRepository: KartRepository) {
+open class KartController @Autowired constructor(val kartRepository: KartRepository, val jdbcOperations: JdbcOperations) {
+
+    init {
+        println("jdbcOperations = ${jdbcOperations}")
+        println("kartRepository = ${kartRepository}")
+        println("kartRepository.jdbcOperations = ${kartRepository.jdbcOperations}")
+        // Jag får inte jdbcOperations att sättas automatiskt :(
+        kartRepository.jdbcOperations = jdbcOperations
+        println("kartRepository.jdbcOperations = ${kartRepository.jdbcOperations}")
+    }
 
 
     @RequestMapping("/user")
-    fun greeting(@RequestParam(value = "username", defaultValue = "pwestlin") username: String, response: HttpServletResponse): User {
-        return kartRepository.load(username) ?: throw NotFoundException("User $username not found")
+    fun greeting(@RequestParam(value = "username", defaultValue = "pwestlin") username: String): Driver {
+        return kartRepository.load(username)
     }
 
     @RequestMapping("/users")
-    fun greeting(): List<User> {
-        return listOf(User("pwestlin", "Peter", "Westlin"))
+    fun greeting(): List<Driver> {
+        return listOf(Driver("pwestlin", "Peter", "Westlin"))
+    }
+
+    @ExceptionHandler(NotFoundException::class)
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+    fun notFoundException(e: NotFoundException): ErrorResource {
+        return ErrorResource(HttpStatus.NOT_FOUND.value(), "Could not find resource")
     }
 
-    @ExceptionHandler(Exception::class)
+    @ExceptionHandler(IncorrectResultSizeDataAccessException::class)
     @ResponseBody
     @ResponseStatus(value = HttpStatus.NOT_FOUND)
-    fun handleException(e: NotFoundException, response: HttpServletResponse): ErrorResource {
+    fun incorrectResultSizeDataAccessException(e: IncorrectResultSizeDataAccessException): ErrorResource {
         return ErrorResource(HttpStatus.NOT_FOUND.value(), "Could not find resource")
     }
 }

src/main/kotlin/nu/westlin/kartrepo/KartRepository.kt

@@ -1,15 +1,40 @@
 package nu.westlin.kartrepo
 
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.jdbc.JdbcUpdateAffectedIncorrectNumberOfRowsException
+import org.springframework.jdbc.core.JdbcOperations
+import org.springframework.jdbc.core.RowMapper
 import org.springframework.stereotype.Repository
+import org.springframework.transaction.PlatformTransactionManager
+import java.sql.ResultSet
+import java.sql.SQLException
 
 @Repository
-class KartRepository {
+// jdbcOperations ska vara val och inte var men jag får inte jdbcOperations att sättas automatiskt :(
+open class KartRepository @Autowired constructor(var jdbcOperations: JdbcOperations, val transactionManager: PlatformTransactionManager) {
 
-    var users: MutableMap<String, User> = mutableMapOf()
+    fun store(user: Driver) {
+        val rows: Int = jdbcOperations.update("insert into driver(alias, firstname, lastname) values(?,?,?)",
+                user.alias, user.firstname, user.lastname)
+        if (rows != 1)
+            throw JdbcUpdateAffectedIncorrectNumberOfRowsException("Expected 1 row, got $rows", 0, rows)
+    }
+
+    fun load(alias: String): Driver {
+        return jdbcOperations.queryForObject("select alias,firstname,lastname from driver where alias=?", UserRowMapper(), alias)
+    }
+
+    class UserRowMapper : RowMapper<Driver> {
+
+        @Throws(SQLException::class)
+        override fun mapRow(rs: ResultSet, rowNum: Int): Driver {
+            return Driver(
+                    rs.getString("alias"),
+                    rs.getString("firstname"),
+                    rs.getString("lastname")
+            )
+        }
 
-    fun store(user: User) {
-        users.put(user.username, user)
     }
 
-    fun load(username: String) = users.get(username)
 }

src/main/kotlin/nu/westlin/kartrepo/User.kt

@@ -0,0 +1,28 @@
+spring:
+  application:
+    name: kartrepo
+
+  jackson:
+    serialization:
+      indent_output: true
+
+  datasource:
+    url: jdbc:h2:mem:test;MODE=PostgreSQL;DB_CLOSE_ON_EXIT=FALSE
+    driver-class-name: org.h2.Driver
+    initialSize: 1
+    max-active: 5
+    maxIdle: 5
+    initialize: false
+
+info.app:
+  name: ${archivesBaseName}
+  description: ${description}
+  version: ${version}
+
+
+endpoints.health.sensitive: false
+
+#logging.path: ./logs
+
+
+#embedded.server.tomcat.accesslog.enabled: true

src/main/resources/application.yml

@@ -0,0 +1,27 @@
+databaseChangeLog:
+
+
+  - changeSet:
+      id: 1
+      author: petves
+      changes:
+        - createTable:
+            tableName: DRIVER
+            columns:
+              - column:
+                  name: ALIAS
+                  type: VARCHAR(20)
+                  constraints:
+                    primaryKey: true
+                    nullable: false
+              - column:
+                  name: FIRSTNAME
+                  type: VARCHAR(36)
+                  constraints:
+                    nullable: false
+              - column:
+                  name: LASTNAME
+                  type: VARCHAR(36)
+                  constraints:
+                    nullable: false
+