mindol1004/tut-spring-boot-kotlin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update README.adoc

Browse Source
This commit is contained in:
Ruslan Molchanov
2018-12-11 21:09:12 +03:00
committed by Sébastien Deleuze
parent 2db66fb281
commit 03a7820894
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.adoc
View File

@@ -599,8 +599,8 @@ class HtmlController(private val repository: ArticleRepository,
fun Article.render() = RenderedArticle( fun Article.render() = RenderedArticle(
title, title,
markdownConverter.invoke(headline), markdownConverter(headline),
markdownConverter.invoke(content), markdownConverter(content),
author, author,
id, id,
addedAt.format() addedAt.format()
@@ -704,8 +704,8 @@ class ArticleController(private val repository: ArticleRepository,
@GetMapping("/{id}") @GetMapping("/{id}")
fun findOne(@PathVariable id: Long, @RequestParam converter: String?) = when (converter) { fun findOne(@PathVariable id: Long, @RequestParam converter: String?) = when (converter) {
"markdown" -> repository.findById(id).map { it.copy( "markdown" -> repository.findById(id).map { it.copy(
headline = markdownConverter.invoke(it.headline), headline = markdownConverter(it.headline),
content = markdownConverter.invoke(it.content)) } content = markdownConverter(it.content)) }
null -> repository.findById(id) null -> repository.findById(id)
else -> throw IllegalArgumentException("Only markdown converter is supported") else -> throw IllegalArgumentException("Only markdown converter is supported")
} }
@@ -747,7 +747,7 @@ class HttpApiTests(@Autowired val mockMvc: MockMvc) {
val spring5Article = Article("Spring Framework 5.0 goes GA", "Dear Spring community ...", "Lorem ipsum", juergen, 1) val spring5Article = Article("Spring Framework 5.0 goes GA", "Dear Spring community ...", "Lorem ipsum", juergen, 1)
val spring43Article = Article("Spring Framework 4.3 goes GA", "Dear Spring community ...", "Lorem ipsum", juergen, 2) val spring43Article = Article("Spring Framework 4.3 goes GA", "Dear Spring community ...", "Lorem ipsum", juergen, 2)
whenever(articleRepository.findAllByOrderByAddedAtDesc()).thenReturn(listOf(spring5Article, spring43Article)) whenever(articleRepository.findAllByOrderByAddedAtDesc()).thenReturn(listOf(spring5Article, spring43Article))
whenever(markdownConverter.invoke(any())).thenAnswer { it.arguments[0] } whenever(markdownConverter(any())).thenAnswer { it.arguments[0] }
mockMvc.perform(get("/api/article/").accept(MediaType.APPLICATION_JSON)) mockMvc.perform(get("/api/article/").accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk) .andExpect(status().isOk)
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))