Upgrade to Kotlin 1.3.21, Boot 2.1.2 and polish

Author: sdeleuze

build.gradle.kts

@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	val kotlinVersion = "1.2.60"
+	val kotlinVersion = "1.3.21"
 	id("org.jetbrains.kotlin.jvm") version kotlinVersion
 	id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
-	id("io.spring.dependency-management") version "1.0.4.RELEASE"
-	id("org.springframework.boot") version "2.0.2.RELEASE"
+	id("io.spring.dependency-management") version "1.0.6.RELEASE"
+	id("org.springframework.boot") version "2.1.2.RELEASE"
 }
 
 repositories {

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -8,7 +8,7 @@ import java.util.*
 import java.util.stream.Collectors
 import java.util.stream.IntStream
 
-fun ServerRequest.locale() =
+fun ServerRequest.locale(): Locale =
 		this.headers().asHttpHeaders().acceptLanguageAsLocales.firstOrNull() ?: Locale.ENGLISH
 
 fun LocalDate.formatDate(): String = this.format(englishDateFormatter)

src/main/kotlin/functional/Extensions.kt

@@ -7,11 +7,10 @@ import org.springframework.core.io.ClassPathResource
 import org.springframework.http.MediaType.*
 import org.springframework.web.reactive.function.server.RenderingResponse
 import org.springframework.web.reactive.function.server.router
-import org.springframework.web.reactive.function.server.ServerResponse.*
 import reactor.core.publisher.toMono
 import java.util.*
 
-class Routes(val userHandler: UserHandler, val messageSource: MessageSource) {
+class Routes(private val userHandler: UserHandler, private val messageSource: MessageSource) {
 
 	fun router() = router {
 		accept(TEXT_HTML).nest {

src/main/kotlin/functional/web/Routes.kt

@@ -11,7 +11,7 @@ import org.springframework.http.MediaType.*
 import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.test.web.reactive.server.expectBodyList
-import org.springframework.test.web.reactive.server.expectBody // No auto-suggest yet see KT-23834
+import org.springframework.test.web.reactive.server.expectBody
 import org.springframework.test.web.reactive.server.returnResult
 import reactor.test.test
 import java.time.LocalDate