From 0298a6130fa7d6469ea214b9f7fb75a7b5064fc3 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Tue, 15 May 2018 11:06:33 +0200 Subject: [PATCH] Polish end of lines --- README.adoc | 7 ++----- src/main/kotlin/blog/BlogApplication.kt | 3 +-- src/main/kotlin/blog/BlogProperties.kt | 3 ++- src/main/kotlin/blog/Extensions.kt | 2 +- src/main/kotlin/blog/HtmlController.kt | 2 -- src/main/kotlin/blog/HttpApi.kt | 2 +- src/main/kotlin/blog/Model.kt | 2 +- src/main/kotlin/blog/Repositories.kt | 2 +- src/main/resources/application.properties | 2 +- src/main/resources/templates/article.mustache | 2 +- src/main/resources/templates/blog.mustache | 2 +- src/test/kotlin/blog/HttpApiTests.kt | 3 +-- src/test/kotlin/blog/IntegrationTests.kt | 1 - src/test/resources/junit-platform.properties | 2 +- 14 files changed, 14 insertions(+), 21 deletions(-) diff --git a/README.adoc b/README.adoc index 88c2e74..eba1b05 100644 --- a/README.adoc +++ b/README.adoc @@ -341,7 +341,6 @@ class IntegrationTests(@Autowired val restTemplate: TestRestTemplate) { @Test fun `Assert article page title, content and status code`() { println(">> TODO") - } @AfterAll @@ -627,13 +626,13 @@ We add data initialization to `BlogApplication`. fun databaseInitializer(userRepository: UserRepository, articleRepository: ArticleRepository) = CommandLineRunner { val smaldini = User("smaldini", "Stéphane", "Maldini") userRepository.save(smaldini) + articleRepository.save(Article( "Reactor Bismuth is out", "Lorem ipsum", "dolor **sit** amet https://projectreactor.io/", smaldini, 1 - )) articleRepository.save(Article( "Reactor Aluminium has landed", @@ -641,7 +640,6 @@ fun databaseInitializer(userRepository: UserRepository, articleRepository: Artic "dolor **sit** amet https://projectreactor.io/", smaldini, 2 - )) } ---- @@ -675,7 +673,6 @@ class IntegrationTests(@Autowired val restTemplate: TestRestTemplate) { assertThat(entity.statusCode).isEqualTo(HttpStatus.OK) assertThat(entity.body).contains("Reactor Aluminium has landed",, "https://projectreactor.io/") - } @AfterAll @@ -683,7 +680,6 @@ class IntegrationTests(@Autowired val restTemplate: TestRestTemplate) { println(">> Tear down") } - } ---- @@ -804,6 +800,7 @@ class BlogProperties { var title: String? = null lateinit var content: String } + } ---- diff --git a/src/main/kotlin/blog/BlogApplication.kt b/src/main/kotlin/blog/BlogApplication.kt index 76a51f3..b90fd18 100644 --- a/src/main/kotlin/blog/BlogApplication.kt +++ b/src/main/kotlin/blog/BlogApplication.kt @@ -19,13 +19,13 @@ class BlogApplication { fun databaseInitializer(userRepository: UserRepository, articleRepository: ArticleRepository) = CommandLineRunner { val smaldini = User("smaldini", "Stéphane", "Maldini") userRepository.save(smaldini) + articleRepository.save(Article( "Reactor Bismuth is out", "Lorem ipsum", "dolor **sit** amet https://projectreactor.io/", smaldini, 1 - )) articleRepository.save(Article( "Reactor Aluminium has landed", @@ -33,7 +33,6 @@ class BlogApplication { "dolor **sit** amet https://projectreactor.io/", smaldini, 2 - )) } diff --git a/src/main/kotlin/blog/BlogProperties.kt b/src/main/kotlin/blog/BlogProperties.kt index 779382d..84a8341 100644 --- a/src/main/kotlin/blog/BlogProperties.kt +++ b/src/main/kotlin/blog/BlogProperties.kt @@ -13,4 +13,5 @@ class BlogProperties { var title: String? = null lateinit var content: String } -} \ No newline at end of file + +} diff --git a/src/main/kotlin/blog/Extensions.kt b/src/main/kotlin/blog/Extensions.kt index 232602b..badae14 100644 --- a/src/main/kotlin/blog/Extensions.kt +++ b/src/main/kotlin/blog/Extensions.kt @@ -23,4 +23,4 @@ private fun getOrdinal(n: Int) = when { n % 10 == 2 -> "${n}nd" n % 10 == 3 -> "${n}rd" else -> "${n}th" -} \ No newline at end of file +} diff --git a/src/main/kotlin/blog/HtmlController.kt b/src/main/kotlin/blog/HtmlController.kt index 2da86f7..6c63ea9 100644 --- a/src/main/kotlin/blog/HtmlController.kt +++ b/src/main/kotlin/blog/HtmlController.kt @@ -48,5 +48,3 @@ class HtmlController(private val repository: ArticleRepository, val addedAt: String) } - - diff --git a/src/main/kotlin/blog/HttpApi.kt b/src/main/kotlin/blog/HttpApi.kt index 4daa0cb..3e23052 100644 --- a/src/main/kotlin/blog/HttpApi.kt +++ b/src/main/kotlin/blog/HttpApi.kt @@ -29,4 +29,4 @@ class UserController(private val repository: UserRepository) { @GetMapping("/{login}") fun findOne(@PathVariable login: String) = repository.findById(login) -} \ No newline at end of file +} diff --git a/src/main/kotlin/blog/Model.kt b/src/main/kotlin/blog/Model.kt index 77d8195..16bab5b 100644 --- a/src/main/kotlin/blog/Model.kt +++ b/src/main/kotlin/blog/Model.kt @@ -17,4 +17,4 @@ data class User( @Id val login: String, val firstname: String, val lastname: String, - val description: String? = null) \ No newline at end of file + val description: String? = null) diff --git a/src/main/kotlin/blog/Repositories.kt b/src/main/kotlin/blog/Repositories.kt index 697f829..4e6015d 100644 --- a/src/main/kotlin/blog/Repositories.kt +++ b/src/main/kotlin/blog/Repositories.kt @@ -6,4 +6,4 @@ interface ArticleRepository : CrudRepository { fun findAllByOrderByAddedAtDesc(): Iterable
} -interface UserRepository : CrudRepository \ No newline at end of file +interface UserRepository : CrudRepository diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9349931..d58ec5b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,3 @@ blog.title=Blog blog.banner.title=Warning -blog.banner.content=The blog will be down tomorrow. \ No newline at end of file +blog.banner.content=The blog will be down tomorrow. diff --git a/src/main/resources/templates/article.mustache b/src/main/resources/templates/article.mustache index 0ecbaa9..67238bb 100644 --- a/src/main/resources/templates/article.mustache +++ b/src/main/resources/templates/article.mustache @@ -13,4 +13,4 @@ -{{> footer}} \ No newline at end of file +{{> footer}} diff --git a/src/main/resources/templates/blog.mustache b/src/main/resources/templates/blog.mustache index 512013a..939ec47 100644 --- a/src/main/resources/templates/blog.mustache +++ b/src/main/resources/templates/blog.mustache @@ -28,4 +28,4 @@ {{/articles}} -{{> footer}} \ No newline at end of file +{{> footer}} diff --git a/src/test/kotlin/blog/HttpApiTests.kt b/src/test/kotlin/blog/HttpApiTests.kt index b15fd3a..108e384 100644 --- a/src/test/kotlin/blog/HttpApiTests.kt +++ b/src/test/kotlin/blog/HttpApiTests.kt @@ -13,7 +13,6 @@ import org.mockito.Mockito.any import org.springframework.http.MediaType import org.springframework.test.web.servlet.result.MockMvcResultMatchers.* - @ExtendWith(SpringExtension::class) @WebMvcTest // TODO Use constructor-based val property for @MockBean when supported, see issue spring-boot#13113 @@ -56,4 +55,4 @@ class HttpApiTests(@Autowired val mockMvc: MockMvc) { .andExpect(jsonPath("\$.[1].login").value(smaldini.login)) } -} \ No newline at end of file +} diff --git a/src/test/kotlin/blog/IntegrationTests.kt b/src/test/kotlin/blog/IntegrationTests.kt index 9ae06df..6d379e9 100644 --- a/src/test/kotlin/blog/IntegrationTests.kt +++ b/src/test/kotlin/blog/IntegrationTests.kt @@ -37,7 +37,6 @@ class IntegrationTests(@Autowired val restTemplate: TestRestTemplate) { assertThat(entity.statusCode).isEqualTo(HttpStatus.OK) assertThat(entity.body).contains("Reactor Aluminium has landed", "https://projectreactor.io/") - } @AfterAll diff --git a/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties index e6d55f8..d265fd8 100644 --- a/src/test/resources/junit-platform.properties +++ b/src/test/resources/junit-platform.properties @@ -1 +1 @@ -junit.jupiter.testinstance.lifecycle.default = per_class \ No newline at end of file +junit.jupiter.testinstance.lifecycle.default = per_class