update more json parsers

highmobility · Jan 31, 2024 · cbe183b · cbe183b
1 parent 930b966
commit cbe183b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/hmkit-fleet/src/main/kotlin/com/highmobility/hmkitfleet/network/ClearanceRequests.kt b/hmkit-fleet/src/main/kotlin/com/highmobility/hmkitfleet/network/ClearanceRequests.kt
@@ -77,7 +77,7 @@ internal class ClearanceRequests(
     val response = call.await()
 
     return tryParseResponse(response, HttpURLConnection.HTTP_OK) { responseBody ->
-      val jsonElement = Json.parseToJsonElement(responseBody) as JsonObject
+      val jsonElement = jsonIg.parseToJsonElement(responseBody) as JsonObject
       val statuses = jsonElement["vehicles"] as JsonArray
       for (statusElement in statuses) {
         val status =
@@ -108,7 +108,7 @@ internal class ClearanceRequests(
     val response = call.await()
 
     return tryParseResponse(response, HttpURLConnection.HTTP_OK) { responseBody ->
-      val statuses = Json.parseToJsonElement(responseBody) as JsonArray
+      val statuses = jsonIg.parseToJsonElement(responseBody) as JsonArray
 
       val builder = Array(statuses.size) {
         val statusElement = statuses[it]
@@ -174,14 +174,14 @@ internal class ClearanceRequests(
   ): RequestBody {
     val vehicle = buildJsonObject {
       put("vin", vin)
-      put("brand", Json.encodeToJsonElement(brand))
+      put("brand", jsonIg.encodeToJsonElement(brand))
       if (controlMeasures != null) {
         putJsonObject("control_measures") {
           for (controlMeasure in controlMeasures) {
             // polymorphism adds type key to child controlmeasure classes. remove with filter
-            val json = Json.encodeToJsonElement(controlMeasure)
+            val json = jsonIg.encodeToJsonElement(controlMeasure)
             val valuesWithoutType = json.jsonObject.filterNot { it.key == "type" }
-            val jsonTrimmed = Json.encodeToJsonElement(valuesWithoutType)
+            val jsonTrimmed = jsonIg.encodeToJsonElement(valuesWithoutType)
             put("odometer", jsonTrimmed)
           }
         }

diff --git a/hmkit-fleet/src/main/kotlin/com/highmobility/hmkitfleet/network/Requests.kt b/hmkit-fleet/src/main/kotlin/com/highmobility/hmkitfleet/network/Requests.kt
@@ -116,7 +116,7 @@ internal open class Requests(
     json: JsonObject
   ): com.highmobility.hmkitfleet.network.Response<T> = if (errors != null && errors.size > 0) {
     val error =
-      Json.decodeFromJsonElement<Error>(errors.first())
+      jsonIg.decodeFromJsonElement<Error>(errors.first())
     Response(null, error)
   } else {
     val error = Error(

diff --git a/hmkit-fleet/src/main/kotlin/com/highmobility/hmkitfleet/network/UtilityRequests.kt b/hmkit-fleet/src/main/kotlin/com/highmobility/hmkitfleet/network/UtilityRequests.kt
@@ -82,10 +82,10 @@ internal class UtilityRequests(
   ): RequestBody {
     val vehicle = buildJsonObject {
       put("vin", vin)
-      put("brand", Json.encodeToJsonElement(brand))
+      put("brand", jsonIg.encodeToJsonElement(brand))
     }
 
-    val body = Json.encodeToString(vehicle).toRequestBody(mediaType)
+    val body = jsonIg.encodeToString(vehicle).toRequestBody(mediaType)
     return body
   }
 }