mirror of
https://github.com/jlengrand/geospatial-messenger.git
synced 2026-03-10 08:21:17 +00:00
Update to Exposed 0.5.0 and small updates
This commit is contained in:
@@ -20,15 +20,18 @@ import javax.sql.DataSource
|
||||
@EnableTransactionManagement
|
||||
open class Application {
|
||||
|
||||
@Bean open fun objectMapper(): ObjectMapper {
|
||||
@Bean
|
||||
open fun objectMapper(): ObjectMapper {
|
||||
val mapper:ObjectMapper = Jackson2ObjectMapperBuilder().modulesToInstall(PostGISModule()).build()
|
||||
mapper.setSerializationInclusion(Include.NON_NULL)
|
||||
return mapper
|
||||
}
|
||||
|
||||
@Bean open fun transactionManager(dataSource: DataSource) = SpringTransactionManager(dataSource)
|
||||
@Bean
|
||||
open fun transactionManager(dataSource: DataSource) = SpringTransactionManager(dataSource)
|
||||
|
||||
@Bean open fun init(ur: UserRepository, mr: MessageRepository) = CommandLineRunner {
|
||||
@Bean
|
||||
open fun init(ur: UserRepository, mr: MessageRepository) = CommandLineRunner {
|
||||
ur.createTable()
|
||||
mr.createTable()
|
||||
mr.deleteAll()
|
||||
|
||||
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository
|
||||
import org.springframework.transaction.annotation.Transactional
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
@Transactional // Should be at @Service level in real applications
|
||||
open class MessageRepository() {
|
||||
|
||||
open fun createTable() = SchemaUtils.create(Messages)
|
||||
|
||||
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository
|
||||
import org.springframework.transaction.annotation.Transactional
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
@Transactional // Should be at @Service level in real applications
|
||||
open class UserRepository() {
|
||||
|
||||
open fun createTable() = SchemaUtils.create(Users)
|
||||
|
||||
@@ -2,13 +2,11 @@ package io.spring.messenger
|
||||
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.springframework.test.context.web.WebAppConfiguration;
|
||||
import org.springframework.boot.test.SpringApplicationConfiguration
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner
|
||||
import org.springframework.boot.test.context.SpringBootTest
|
||||
import org.springframework.test.context.junit4.SpringRunner
|
||||
|
||||
@RunWith(SpringJUnit4ClassRunner::class)
|
||||
@SpringApplicationConfiguration(classes = arrayOf(Application::class))
|
||||
@WebAppConfiguration
|
||||
@RunWith(SpringRunner::class)
|
||||
@SpringBootTest
|
||||
class ApplicationTests {
|
||||
|
||||
@Test
|
||||
|
||||
@@ -13,12 +13,10 @@ import org.postgis.Point
|
||||
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired
|
||||
import org.springframework.boot.test.SpringApplicationConfiguration
|
||||
import org.springframework.boot.test.context.SpringBootTest
|
||||
import org.springframework.http.MediaType.APPLICATION_JSON_UTF8
|
||||
import org.springframework.restdocs.RestDocumentation
|
||||
import org.springframework.restdocs.mockmvc.RestDocumentationResultHandler
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner
|
||||
import org.springframework.test.context.web.WebAppConfiguration
|
||||
import org.springframework.test.web.servlet.MockMvc
|
||||
import org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup
|
||||
import org.springframework.web.context.WebApplicationContext
|
||||
@@ -30,9 +28,10 @@ import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder
|
||||
import org.springframework.restdocs.payload.PayloadDocumentation.*
|
||||
import org.springframework.restdocs.request.RequestDocumentation.*
|
||||
import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*
|
||||
import org.springframework.test.context.junit4.SpringRunner
|
||||
|
||||
@RunWith(SpringJUnit4ClassRunner::class) @WebAppConfiguration
|
||||
@SpringApplicationConfiguration(classes = arrayOf(Application::class))
|
||||
@RunWith(SpringRunner::class)
|
||||
@SpringBootTest
|
||||
class MessageControllerTests {
|
||||
|
||||
@Rule @JvmField val restDoc = RestDocumentation("build/generated-snippets")
|
||||
|
||||
@@ -12,11 +12,9 @@ import org.postgis.Point
|
||||
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired
|
||||
import org.springframework.boot.test.SpringApplicationConfiguration
|
||||
import org.springframework.boot.test.context.SpringBootTest
|
||||
import org.springframework.http.MediaType.APPLICATION_JSON_UTF8
|
||||
import org.springframework.restdocs.RestDocumentation
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner
|
||||
import org.springframework.test.context.web.WebAppConfiguration
|
||||
import org.springframework.test.web.servlet.MockMvc
|
||||
import org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup
|
||||
import org.springframework.web.context.WebApplicationContext
|
||||
@@ -29,10 +27,11 @@ import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder
|
||||
import org.springframework.restdocs.payload.PayloadDocumentation.*
|
||||
import org.springframework.restdocs.request.RequestDocumentation.*
|
||||
import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*
|
||||
import org.springframework.test.context.junit4.SpringRunner
|
||||
|
||||
|
||||
@RunWith(SpringJUnit4ClassRunner::class) @WebAppConfiguration
|
||||
@SpringApplicationConfiguration(classes = arrayOf(Application::class))
|
||||
@RunWith(SpringRunner::class)
|
||||
@SpringBootTest
|
||||
class UserControllerTests {
|
||||
|
||||
@Rule @JvmField val restDoc = RestDocumentation("build/generated-snippets")
|
||||
|
||||
Reference in New Issue
Block a user