reformat

Author: juan-medina

src/main/kotlin/org/learning/by/example/reactive/kotlin/microservices/KotlinReactiveMS/extensions/UtilExtensions.kt

@@ -1,5 +1,6 @@
 package org.learning.by.example.reactive.kotlin.microservices.KotlinReactiveMS.extensions
 
+import org.slf4j.LoggerFactory
 import org.springframework.http.MediaType.APPLICATION_JSON_UTF8
 import org.springframework.web.reactive.function.server.ServerRequest
 import org.springframework.web.reactive.function.server.ServerResponse.BodyBuilder
@@ -10,4 +11,4 @@ internal fun <T : Any> T.toMono() = Mono.just(this)!!
 internal infix fun <T : Any> BodyBuilder.withBody(value: T) = this.contentType(APPLICATION_JSON_UTF8).toBody(value)
 internal fun <T : Any> BodyBuilder.toBody(value: T) = this.body(value.toMono(), value.javaClass)!!
 inline internal fun <reified T : Any> ServerRequest.extract() = this.bodyToMono(T::class.java)
-
+inline internal fun <reified T : Any> getLogger() = LoggerFactory.getLogger(T::class.java)

src/main/kotlin/org/learning/by/example/reactive/kotlin/microservices/KotlinReactiveMS/handlers/ErrorHandler.kt

@@ -1,11 +1,11 @@
 package org.learning.by.example.reactive.kotlin.microservices.KotlinReactiveMS.handlers
 
 import org.learning.by.example.reactive.kotlin.microservices.KotlinReactiveMS.exceptions.PathNotFoundException
+import org.learning.by.example.reactive.kotlin.microservices.KotlinReactiveMS.extensions.getLogger
 import org.learning.by.example.reactive.kotlin.microservices.KotlinReactiveMS.extensions.toMono
 import org.learning.by.example.reactive.kotlin.microservices.KotlinReactiveMS.extensions.withBody
 import org.learning.by.example.reactive.kotlin.microservices.KotlinReactiveMS.handlers.ThrowableTranslator.Translate
 import org.learning.by.example.reactive.kotlin.microservices.KotlinReactiveMS.model.ErrorResponse
-import org.slf4j.LoggerFactory
 import org.springframework.web.reactive.function.server.ServerRequest
 import org.springframework.web.reactive.function.server.ServerResponse
 import org.springframework.web.reactive.function.server.ServerResponse.status
@@ -14,13 +14,14 @@ import reactor.core.publisher.Mono
 internal class ErrorHandler {
 
  companion object {
- private val logger = LoggerFactory.getLogger(ErrorHandler::class.java)
+ private val logger = getLogger<ErrorHandler>()
  private val NOT_FOUND = "not found"
  private val ERROR_RAISED = "error raised"
  }
 
- fun notFound(request: ServerRequest) = PathNotFoundException(NOT_FOUND).toMono<Throwable>()
- .transform(this::getResponse)!!
+ @Suppress("UNUSED_PARAMETER")
+ fun notFound(request: ServerRequest) =
+ PathNotFoundException(NOT_FOUND).toMono<Throwable>().transform(this::getResponse)!!
 
  fun throwableError(throwable: Throwable): Mono<ServerResponse> {
  logger.error(ERROR_RAISED, throwable)

src/main/kotlin/org/learning/by/example/reactive/kotlin/microservices/KotlinReactiveMS/handlers/ThrowableTranslator.kt

@@ -31,8 +31,6 @@ internal class ThrowableTranslator private constructor(throwable: Throwable) {
  }
 
  companion object Translate {
- fun <T : Throwable> throwable(throwable: Mono<T>): Mono<ThrowableTranslator> {
- return throwable.map(::ThrowableTranslator)
- }
+ fun <T : Throwable> throwable(throwable: Mono<T>) = throwable.map(::ThrowableTranslator)!!
  }
 }

src/main/kotlin/org/learning/by/example/reactive/kotlin/microservices/KotlinReactiveMS/routers/ApiRouter.kt

@@ -18,9 +18,9 @@ internal class ApiRouter(val handler: ApiHandler, val errorHandler: ErrorHandler
 
  fun doRoute() = router {
  (accept(MediaType.APPLICATION_JSON_UTF8) and API_PATH).nest {
- GET(LOCATION_WITH_ADDRESS_PATH).invoke(handler::getLocation)
- POST(LOCATION_PATH).invoke(handler::postLocation)
- path(ANY_PATH).invoke(errorHandler::notFound)
+ GET(LOCATION_WITH_ADDRESS_PATH)(handler::getLocation)
+ POST(LOCATION_PATH)(handler::postLocation)
+ path(ANY_PATH)(errorHandler::notFound)
  }
  }
 }

src/test/kotlin/org/learning/by/example/reactive/kotlin/microservices/KotlinReactiveMS/extensions/UtilsExtensionsTests.kt

@@ -95,4 +95,12 @@ private class UtilsExtensionsTests : BasicIntegrationTest() {
  assert.that(throwable, isA<ClassCastException>())
  }
  }
+
+ @Test
+ fun getLoggerTest(){
+ val logger = getLogger<UtilsExtensionsTests>()
+ assert.that(logger, !isNull())
+ assert.that(logger, isA<org.slf4j.Logger>())
+ assert.that(logger.name, equalTo(UtilsExtensionsTests::class.qualifiedName))
+ }
 }