diff --git a/src/main/kotlin/ru/kotlin/homework/network/NetworkLogger.kt b/src/main/kotlin/ru/kotlin/homework/network/NetworkLogger.kt index a5f33c5..d86eacf 100644 --- a/src/main/kotlin/ru/kotlin/homework/network/NetworkLogger.kt +++ b/src/main/kotlin/ru/kotlin/homework/network/NetworkLogger.kt @@ -2,6 +2,7 @@ package ru.kotlin.homework.network +import ru.kotlin.LoginException import ru.kotlin.homework.Circle import java.lang.IllegalArgumentException import java.time.LocalDateTime @@ -10,29 +11,49 @@ import java.time.LocalDateTime * Известный вам список ошибок */ sealed class ApiException(message: String) : Throwable(message) { - data object NotAuthorized : ApiException("Not authorized") - data object NetworkException : ApiException("Not connected") - data object UnknownException: ApiException("Unknown exception") + data object NotAuthorized : ApiException("Not authorized") { + private fun readResolve(): Any = NotAuthorized + } + + data object NetworkException : ApiException("Not connected") { + private fun readResolve(): Any = NetworkException + } + + data object UnknownException: ApiException("Unknown exception") { + private fun readResolve(): Any = UnknownException + } } -class ErrorLogger { +interface Logger { + fun log(response: NetworkResponse<*, E>) + fun dumpLog() +} +interface Dumper { + fun dump(): List> +} + +class ErrorLogger : Logger, Dumper { - val errors = mutableListOf>() + private val errors = mutableListOf>() - fun log(response: NetworkResponse<*, E>) { + override fun log(response: NetworkResponse<*, E>) { if (response is Failure) { errors.add(response.responseDateTime to response.error) } } - fun dumpLog() { + override fun dumpLog() { errors.forEach { (date, error) -> println("Error at $date: ${error.message}") } } + + override fun dump(): List> = errors + + } -fun processThrowables(logger: ErrorLogger) { +fun processThrowables(logger: Logger) { logger.log(Success("Success")) Thread.sleep(100) logger.log(Success(Circle)) @@ -42,7 +63,7 @@ fun processThrowables(logger: ErrorLogger) { logger.dumpLog() } -fun processApiErrors(apiExceptionLogger: ErrorLogger) { +fun processApiErrors(apiExceptionLogger: Logger) { apiExceptionLogger.log(Success("Success")) Thread.sleep(100) apiExceptionLogger.log(Success(Circle)) diff --git a/src/main/kotlin/ru/kotlin/homework/network/NetworkResponse.kt b/src/main/kotlin/ru/kotlin/homework/network/NetworkResponse.kt index 3018c40..13d6aae 100644 --- a/src/main/kotlin/ru/kotlin/homework/network/NetworkResponse.kt +++ b/src/main/kotlin/ru/kotlin/homework/network/NetworkResponse.kt @@ -9,19 +9,19 @@ import java.time.LocalDateTime /** * Network result */ -sealed class NetworkResponse { +sealed class NetworkResponse { val responseDateTime: LocalDateTime = LocalDateTime.now() } /** * Network success */ -data class Success(val resp: T): NetworkResponse() +data class Success(val resp: T): NetworkResponse() /** * Network error */ -data class Failure(val error: R): NetworkResponse() +data class Failure(val error: R): NetworkResponse< Nothing,R>() val s1 = Success("Message") val r11: NetworkResponse = s1