Skip to content

Commit

Permalink
OY-227 : Fix request content-type
Browse files Browse the repository at this point in the history
Calling withBody with String seems to always
produce text/plain.
  • Loading branch information
timorantalaiho committed Jul 30, 2018
1 parent af042a1 commit cdd135b
Showing 1 changed file with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package fi.vm.sade.hakemuseditori.oppijanumerorekisteri

import java.util.concurrent.TimeUnit

import fi.vm.sade.groupemailer.Json4sHttp4s
import fi.vm.sade.hakemuseditori.json.JsonFormats
import fi.vm.sade.omatsivut.OphUrlProperties
import fi.vm.sade.omatsivut.config.AppConfig.AppConfig
Expand All @@ -11,10 +12,10 @@ import org.http4s.MediaType.`application/json`
import org.http4s.Method.GET
import org.http4s._
import org.http4s.client.blaze
import org.http4s.headers.{Accept, `Content-Type`}
import org.http4s.headers.Accept
import org.json4s
import org.json4s.JsonAST.{JNull, JObject, JString, JValue}
import org.json4s.jackson.JsonMethods
import org.json4s.jackson.Serialization.write
import org.json4s.{DefaultFormats, Reader, Writer, _}
import scalaz.concurrent.Task

Expand Down Expand Up @@ -95,11 +96,12 @@ trait OppijanumerorekisteriComponent {
override def fetchAllDuplicateOids(oppijanumero: String): Set[String] = {
val timeout = Duration(30, TimeUnit.SECONDS)

val body: json4s.JValue = Extraction.decompose(Map("henkiloOids" -> List(oppijanumero)))
val duplicateHenkilosRequest = Request(
method = Method.POST,
uri = uriFromString(OphUrlProperties.url("oppijanumerorekisteri-service.duplicatesByPersonOids")),
headers = Headers(callerIdHeader, `Content-Type`(`application/json`), `Accept`(`application/json`))
).withBody(write(Map("henkiloOids" -> List(oppijanumero))))
headers = Headers(callerIdHeader, `Accept`(`application/json`))
).withBody(body)(Json4sHttp4s.json4sEncoderOf)

val henkiloviitteet: Seq[Henkiloviite] = httpClient.fetch(duplicateHenkilosRequest)((r: Response) =>
if (r.status == Status.Ok) {
Expand Down

0 comments on commit cdd135b

Please sign in to comment.