Kotlin #7

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<E : Throwable> {
+class ErrorLogger<in E : Throwable> {
 
-    val errors = mutableListOf<Pair<LocalDateTime, E>>()
+    private val errors = mutableListOf<Pair<LocalDateTime, Throwable>>()
 
-    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<Pair<LocalDateTime, Throwable>> {
+        return errors.toList()
+    }
+
 
     fun dumpLog() {
         errors.forEach { (date, error) ->
@@ -33,22 +43,12 @@ class ErrorLogger<E : Throwable> {
 }
 
 fun processThrowables(logger: ErrorLogger<Throwable>) {
-    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<ApiException>) {
-    apiExceptionLogger.log(Success("Success"))
-    Thread.sleep(100)
-    apiExceptionLogger.log(Success(Circle))
-    Thread.sleep(100)
     apiExceptionLogger.log(Failure(ApiException.NetworkException))
-
     apiExceptionLogger.dumpLog()
 }
 

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<T, R> {
+sealed class NetworkResponse<out T, out R> {
     val responseDateTime: LocalDateTime = LocalDateTime.now()
 }
 
 /**
  * Network success
  */
-data class Success<T, R>(val resp: T): NetworkResponse<T, R>()
+data class Success<out T>(val resp: T): NetworkResponse<T, Nothing>()
 
 /**
  * Network error
  */
-data class Failure<T, R>(val error: R): NetworkResponse<T, R>()
+data class Failure<out R>(val error: R): NetworkResponse<Nothing, R>()
 
 val s1 = Success("Message")
 val r11: NetworkResponse<String, Error> = s1
 val r12: NetworkResponse<Any, Error> = s1
 
-val s2 = Success("Message")
-val r21: NetworkResponse<String, Exception> = s2
-val r22: NetworkResponse<Any, Exception> = s2
-
-val s3 = Success(String())
-val r31: Success<CharSequence> = s3
-val r32: Success<Any> = s3
-
 val e = Failure(Error())
 val er1: NetworkResponse<String, Error> = e
 val er2: NetworkResponse<Any, Error> = e