diff --git a/src/main/kotlin/ru/kotlin/homework/network/NetworkLogger.kt b/src/main/kotlin/ru/kotlin/homework/network/NetworkLogger.kt index a5f33c5..c91c192 100644 --- a/src/main/kotlin/ru/kotlin/homework/network/NetworkLogger.kt +++ b/src/main/kotlin/ru/kotlin/homework/network/NetworkLogger.kt @@ -2,28 +2,38 @@ package ru.kotlin.homework.network -import ru.kotlin.homework.Circle -import java.lang.IllegalArgumentException 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 { +class ErrorLogger { - val errors = mutableListOf>() + private val errors = mutableListOf>() - fun log(response: NetworkResponse<*, E>) { + fun log(response: NetworkResponse<*, @UnsafeVariance E>) { if (response is Failure) { errors.add(response.responseDateTime to response.error) } } + fun dump(): List> { + return errors.toList() + } + fun dumpLog() { errors.forEach { (date, error) -> @@ -33,22 +43,12 @@ class ErrorLogger { } fun processThrowables(logger: ErrorLogger) { - logger.log(Success("Success")) - Thread.sleep(100) - logger.log(Success(Circle)) - Thread.sleep(100) logger.log(Failure(IllegalArgumentException("Something unexpected"))) - logger.dumpLog() } fun processApiErrors(apiExceptionLogger: ErrorLogger) { - apiExceptionLogger.log(Success("Success")) - Thread.sleep(100) - apiExceptionLogger.log(Success(Circle)) - Thread.sleep(100) apiExceptionLogger.log(Failure(ApiException.NetworkException)) - apiExceptionLogger.dumpLog() } diff --git a/src/main/kotlin/ru/kotlin/homework/network/NetworkResponse.kt b/src/main/kotlin/ru/kotlin/homework/network/NetworkResponse.kt index 3018c40..509e699 100644 --- a/src/main/kotlin/ru/kotlin/homework/network/NetworkResponse.kt +++ b/src/main/kotlin/ru/kotlin/homework/network/NetworkResponse.kt @@ -2,39 +2,29 @@ package ru.kotlin.homework.network -import java.lang.Exception -import java.lang.IllegalArgumentException 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() val s1 = Success("Message") val r11: NetworkResponse = s1 val r12: NetworkResponse = s1 -val s2 = Success("Message") -val r21: NetworkResponse = s2 -val r22: NetworkResponse = s2 - -val s3 = Success(String()) -val r31: Success = s3 -val r32: Success = s3 - val e = Failure(Error()) val er1: NetworkResponse = e val er2: NetworkResponse = e