@@ -3,12 +3,11 @@ package {{ sdk.namespace | caseDot }}
3
3
import android.content.Context
4
4
import android.content.Intent
5
5
import android.content.pm.PackageManager
6
- import com.google.gson.GsonBuilder
7
- import com.google.gson.reflect.TypeToken
8
6
import {{ sdk .namespace | caseDot }}.cookies.ListenableCookieJar
9
7
import {{ sdk .namespace | caseDot }}.cookies.stores.SharedPreferencesCookieStore
10
8
import {{ sdk .namespace | caseDot }}.exceptions.{{ spec .title | caseUcfirst }}Exception
11
- import {{ sdk .namespace | caseDot }}.json.PreciseNumberAdapter
9
+ import {{ sdk .namespace | caseDot }}.extensions.fromJson
10
+ import {{ sdk .namespace | caseDot }}.extensions.toJson
12
11
import {{ sdk .namespace | caseDot }}.models.InputFile
13
12
import {{ sdk .namespace | caseDot }}.models.UploadProgress
14
13
import kotlinx.coroutines.CoroutineScope
@@ -55,11 +54,6 @@ class Client @JvmOverloads constructor(
55
54
56
55
private val job = Job()
57
56
58
- private val gson = GsonBuilder().registerTypeAdapter(
59
- object : TypeToken<Map <String , Any >>(){}.type,
60
- PreciseNumberAdapter()
61
- ).create()
62
-
63
57
internal lateinit var http: OkHttpClient
64
58
65
59
internal val headers: MutableMap<String , String >
@@ -99,12 +93,6 @@ class Client @JvmOverloads constructor(
99
93
config = mutableMapOf()
100
94
101
95
setSelfSigned(selfSigned)
102
-
103
- NotificationHandler.client = this
104
-
105
- context.startService(Intent(context, NotificationHandler::class.java).apply {
106
- action = NotificationHandler.ACTION_CLIENT_INIT
107
- })
108
96
}
109
97
110
98
{% for header in spec .global .headers %}
@@ -312,7 +300,8 @@ class Client @JvmOverloads constructor(
312
300
}
313
301
builder.build()
314
302
} else {
315
- gson.toJson(filteredParams)
303
+ filteredParams
304
+ .toJson()
316
305
.toRequestBody("application/json".toMediaType())
317
306
}
318
307
@@ -482,10 +471,8 @@ class Client @JvmOverloads constructor(
482
471
.use(BufferedReader::readText)
483
472
484
473
val error = if (response.headers["content-type"]?.contains("application/json") == true) {
485
- val map = gson.fromJson<Map <String , Any >>(
486
- body,
487
- object : TypeToken<Map <String , Any >>(){}.type
488
- )
474
+ val map = body.fromJson<Map <String , Any >>()
475
+
489
476
{{ spec .title | caseUcfirst }}Exception(
490
477
map["message"] as? String ?: "",
491
478
(map["code"] as Number).toInt(),
@@ -524,10 +511,9 @@ class Client @JvmOverloads constructor(
524
511
it.resume(true as T)
525
512
return
526
513
}
527
- val map = gson.fromJson<Any >(
528
- body,
529
- object : TypeToken<Any >(){}.type
530
- )
514
+
515
+ val map = body.fromJson<Any >()
516
+
531
517
it.resume(
532
518
converter?.invoke(map) ?: map as T
533
519
)
0 commit comments