From 13e00bd52aa56a300aa2a5049f4e96cdf2375031 Mon Sep 17 00:00:00 2001
From: Kirill Nayduik <kirill.nayduikkn1@gmail.com>
Date: Mon, 18 Apr 2022 19:01:44 +0300
Subject: [PATCH] Fix styling of BlockingCall and Request

---
 .../touchin/network/blocking/BlockingCall.kt  | 19 +------------------
 .../java/ru/touchin/network/utils/Request.kt  |  3 ++-
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/network/src/main/java/ru/touchin/network/blocking/BlockingCall.kt b/network/src/main/java/ru/touchin/network/blocking/BlockingCall.kt
index 7d2812a..02dbf61 100644
--- a/network/src/main/java/ru/touchin/network/blocking/BlockingCall.kt
+++ b/network/src/main/java/ru/touchin/network/blocking/BlockingCall.kt
@@ -1,7 +1,5 @@
 package ru.touchin.network.blocking
 
-import okhttp3.Request
-import okio.Timeout
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -9,12 +7,7 @@ import ru.touchin.network.utils.getAnnotation
 
 class BlockingCall(
         private val callDelegate: Call<Any>
-) : Call<Any> {
-    override fun clone(): Call<Any> = callDelegate.clone()
-
-    override fun execute(): Response<Any> {
-        return callDelegate.execute()
-    }
+) : Call<Any> by callDelegate {
 
     override fun enqueue(callback: Callback<Any>) {
         if (PendingRequestsManager.isPending.get()) {
@@ -40,15 +33,5 @@ class BlockingCall(
         })
     }
 
-    override fun isExecuted(): Boolean = callDelegate.isExecuted
-
-    override fun cancel() = callDelegate.cancel()
-
-    override fun isCanceled(): Boolean = callDelegate.isCanceled
-
-    override fun request(): Request = callDelegate.request()
-
-    override fun timeout(): Timeout = callDelegate.timeout()
-
     private fun Call<Any>.isBlocking() = request().getAnnotation(BlockingRequest::class.java) != null
 }
diff --git a/network/src/main/java/ru/touchin/network/utils/Request.kt b/network/src/main/java/ru/touchin/network/utils/Request.kt
index 842081c..192a22c 100644
--- a/network/src/main/java/ru/touchin/network/utils/Request.kt
+++ b/network/src/main/java/ru/touchin/network/utils/Request.kt
@@ -3,4 +3,5 @@ package ru.touchin.network.utils
 import okhttp3.Request
 import retrofit2.Invocation
 
-fun <T: Annotation> Request.getAnnotation(annotation: Class<T>) = tag(Invocation::class.java)?.method()?.getAnnotation(annotation)
+fun <T: Annotation> Request.getAnnotation(annotation: Class<T>) =
+        tag(Invocation::class.java)?.method()?.getAnnotation(annotation)