Skip to content

Manual mapping HttpJiraIssuePage to avoid gson 2.10.1 dep #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2025
Merged

Manual mapping HttpJiraIssuePage to avoid gson 2.10.1 dep #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kotlin-http-client/kotlin-http-client-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.2.2-atlassian-1</version>
</dependency>
</dependencies>
</project>
25 changes: 17 additions & 8 deletions ...ient-http/src/main/kotlin/com/linkedplanet/kotlinjiraclient/http/HttpJiraIssueOperator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class HttpJiraIssueOperator(private val context: HttpJiraClientContext) : JiraIs
parser: suspend (JsonObject, Map<String, String>) -> Either<JiraClientError, T>
): Either<JiraClientError, List<T>> = either {
recursiveRestCallPaginatedRaw { index, maxSize ->
context.httpClient.executeRest<HttpJiraIssuePage>(
context.httpClient.executeRestCall(
"GET",
"/rest/api/2/search",
mapOf(
Expand All @@ -56,10 +56,9 @@ class HttpJiraIssueOperator(private val context: HttpJiraClientContext) : JiraIs
"expand" to queryParams.expanded.joinToString(","),
),
null,
"application/json",
object : TypeToken<HttpJiraIssuePage>() {}.type
"application/json"
)
.map { it.body!! }
.map { toHttpJiraIssuePage(it.body!!) }
}
.mapLeft { e -> JiraClientError.fromHttpDomainError(e) }
.bind()
Expand All @@ -80,17 +79,16 @@ class HttpJiraIssueOperator(private val context: HttpJiraClientContext) : JiraIs
queryParams: IssueQueryParams,
parser: suspend (JsonObject, Map<String, String>) -> Either<JiraClientError, T>
): Either<JiraClientError, Page<T>> = either {
val page = context.httpClient.executeGet<HttpJiraIssuePage>(
val page = context.httpClient.executeGetCall(
"/rest/api/2/search",
mapOf(
"jql" to jql,
"startAt" to (pageIndex * pageSize).toString(),
"maxResults" to pageSize.toString(),
"expand" to queryParams.expanded.joinToString(","),
),
object : TypeToken<HttpJiraIssuePage>() {}.type
)
)
.map { it.body!! }
.map { toHttpJiraIssuePage(it.body!!) }
.mapLeft { JiraClientError.fromHttpDomainError(it) }
.bind()

Expand Down Expand Up @@ -306,6 +304,17 @@ class HttpJiraIssueOperator(private val context: HttpJiraClientContext) : JiraIs
jsonBody
}

private fun toHttpJiraIssuePage(jsonString: String): HttpJiraIssuePage {
val jsonObject = JsonParser().parse(jsonString).asJsonObject
return HttpJiraIssuePage(
jsonObject.get("maxResults").asInt,
jsonObject.get("startAt").asInt,
jsonObject.get("total").asInt,
jsonObject.get("issues")?.asJsonArray?.map { it }?.toTypedArray<JsonElement>()?: arrayOf(),
jsonObject.get("names"),
)
}

private class HttpJiraIssuePage(
private val maxResults: Number,
private val startAt: Number,
Expand Down