Skip to content
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.

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

Simplify cbor-formatter response parsing. #30

Merged
merged 1 commit into from
Nov 20, 2023
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import org.springframework.http.codec.json.KotlinSerializationJsonDecoder
import org.springframework.http.codec.json.KotlinSerializationJsonEncoder
import org.springframework.web.reactive.function.client.WebClient
import org.springframework.web.reactive.function.client.awaitBody
import org.springframework.web.reactive.function.client.awaitExchange
import java.io.StringWriter
import kotlin.io.encoding.Base64
import kotlin.io.encoding.ExperimentalEncodingApi
Expand Down Expand Up @@ -61,20 +60,14 @@ class EncodePidInCborWithMicroService(private val creatorUrl: HttpsUrl) : Encode
): String = coroutineScope {
log.info("Requesting PID in mso_mdoc for ${pid.familyName} ...")
val request = createMsoMdocReq(pid, pidMetaData, holderKey)
val response = webClient
.post()
webClient.post()
.accept(MediaType.APPLICATION_JSON)
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(request)
.awaitExchange { response ->
val statusCode = response.statusCode()
when {
statusCode.is2xxSuccessful -> response.awaitBody<CreateMsoMdocResponse>()
statusCode.is4xxClientError -> response.awaitBody<CreateMsoMdocResponse>()
else -> error("Unexpected error statusCode = $statusCode")
}
}
response.fold().getOrThrow()
.retrieve()
.awaitBody<CreateMsoMdocResponse>()
.fold()
.getOrThrow()
}
}

Expand Down