Skip to content

Commit 7ba4e84

Browse files
committed
use org.jetbrains.kotlinx:kotlinx-serialization-json
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 1e4f7e1 commit 7ba4e84

3 files changed

Lines changed: 28 additions & 19 deletions

File tree

library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/CreateTaskRemoteOperationV2.kt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,31 @@ import com.nextcloud.operations.PostMethod
1313
import com.owncloud.android.lib.common.operations.RemoteOperation
1414
import com.owncloud.android.lib.common.operations.RemoteOperationResult
1515
import com.owncloud.android.lib.resources.assistant.v2.model.TaskTypeData
16+
import kotlinx.serialization.json.Json
1617
import okhttp3.MediaType.Companion.toMediaTypeOrNull
1718
import okhttp3.RequestBody.Companion.toRequestBody
1819
import org.apache.commons.httpclient.HttpStatus
19-
import java.io.Serializable
2020

2121
open class CreateTaskRemoteOperationV2(
2222
private val input: String,
2323
private val taskType: TaskTypeData
2424
) : RemoteOperation<Void>() {
25-
protected open fun buildRequestBody(): HashMap<String, Serializable?> {
25+
protected open fun buildRequestBody(): String {
2626
val inputField = hashMapOf("input" to input)
2727

28-
return hashMapOf(
29-
"input" to inputField,
30-
"type" to taskType.id,
31-
"appId" to "assistant",
32-
"customId" to ""
33-
)
28+
val body =
29+
hashMapOf(
30+
"input" to inputField,
31+
"type" to taskType.id,
32+
"appId" to "assistant",
33+
"customId" to ""
34+
)
35+
36+
return Json.encodeToString(body)
3437
}
3538

3639
override fun run(client: NextcloudClient): RemoteOperationResult<Void> {
37-
val json = gson.toJson(buildRequestBody())
40+
val json = buildRequestBody()
3841
val request = json.toRequestBody("application/json".toMediaTypeOrNull())
3942
val postMethod = PostMethod(client.baseUri.toString() + TAG_URL, true, request)
4043
val status = postMethod.execute(client)

library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/CreateTranslationTaskRemoteOperation.kt

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ package com.owncloud.android.lib.resources.assistant.v2
99

1010
import com.owncloud.android.lib.resources.assistant.v2.model.TaskTypeData
1111
import com.owncloud.android.lib.resources.assistant.v2.model.TranslationRequest
12-
import java.io.Serializable
12+
import kotlinx.serialization.json.Json
13+
import kotlinx.serialization.json.buildJsonObject
14+
import kotlinx.serialization.json.encodeToJsonElement
15+
import kotlinx.serialization.json.put
1316

1417
class CreateTranslationTaskRemoteOperation(
1518
private val input: TranslationRequest,
@@ -18,11 +21,15 @@ class CreateTranslationTaskRemoteOperation(
1821
input = "",
1922
taskType = taskType
2023
) {
21-
override fun buildRequestBody(): HashMap<String, Serializable?> =
22-
hashMapOf(
23-
"input" to input,
24-
"type" to taskType.id,
25-
"appId" to "assistant",
26-
"customId" to ""
27-
)
24+
override fun buildRequestBody(): String {
25+
val jsonObject =
26+
buildJsonObject {
27+
put("input", Json.encodeToJsonElement(input))
28+
put("type", taskType.id)
29+
put("appId", "assistant")
30+
put("customId", "")
31+
}
32+
33+
return Json.encodeToString(jsonObject)
34+
}
2835
}

library/src/main/java/com/owncloud/android/lib/resources/assistant/v2/model/Translation.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package com.owncloud.android.lib.resources.assistant.v2.model
99

1010
import kotlinx.serialization.SerialName
1111
import kotlinx.serialization.Serializable
12-
import kotlinx.serialization.json.Json
1312

1413
data class TranslationLanguage(
1514
val name: String,
@@ -26,7 +25,7 @@ data class TranslationRequest(
2625
@SerialName("target_language")
2726
val targetLanguage: String,
2827
val input: String
29-
) : java.io.Serializable
28+
)
3029

3130
data class TranslationModel(
3231
val model: String,

0 commit comments

Comments
 (0)