Skip to content

Commit f912c15

Browse files
author
Philipp Karlsson
committed
Fixing JsonElement GSON parsing
1 parent 7ec780a commit f912c15

File tree

1 file changed

+8
-8
lines changed
  • kotlin-jira-client/kotlin-jira-client-http/src/main/kotlin/com/linkedplanet/kotlinjiraclient/http

1 file changed

+8
-8
lines changed

kotlin-jira-client/kotlin-jira-client-http/src/main/kotlin/com/linkedplanet/kotlinjiraclient/http/HttpJiraIssueOperator.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,13 @@ class HttpJiraIssueOperator(private val context: HttpJiraClientContext) : JiraIs
249249
}
250250

251251
private fun extractEmbeddedMappings(issuePage: HttpJiraIssuePage): Map<String, String> {
252-
val names = issuePage.names.asJsonObject
252+
val names = issuePage.names?.asJsonObject
253253
return names
254-
.entrySet()
255-
.map { it.key }
256-
.associateBy {
254+
?.entrySet()
255+
?.map { it.key }
256+
?.associateBy {
257257
names.get(it).asString
258-
}
258+
}?: emptyMap()
259259
}
260260

261261
private fun extractEmbeddedMappings(jsonObject: JsonObject): Map<String, String> {
@@ -306,12 +306,12 @@ class HttpJiraIssueOperator(private val context: HttpJiraClientContext) : JiraIs
306306
jsonBody
307307
}
308308

309-
private data class HttpJiraIssuePage(
309+
private class HttpJiraIssuePage(
310310
private val maxResults: Number,
311311
private val startAt: Number,
312312
private val total: Number,
313-
private val issues: JsonArray,
314-
val names: JsonObject
313+
private val issues: Array<JsonElement>,
314+
val names: JsonElement? = null
315315
) : HttpPage<JsonElement> {
316316
override fun getMaxResults() = maxResults
317317
override fun getStartAt() = startAt

0 commit comments

Comments
 (0)