diff --git a/app/connectors/AddressLookupConnector.scala b/app/connectors/AddressLookupConnector.scala index 7956464..85a7231 100644 --- a/app/connectors/AddressLookupConnector.scala +++ b/app/connectors/AddressLookupConnector.scala @@ -20,15 +20,16 @@ import config.FrontendAppConfig import models.{AddressLookup, LookupAddressByPostcode} import play.api.Logging import play.api.http.Status._ -import play.api.libs.json.Reads +import play.api.libs.json.{Json, Reads} import uk.gov.hmrc.http.HttpReads.Implicits.readRaw import uk.gov.hmrc.http._ +import uk.gov.hmrc.http.client.HttpClientV2 import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} import scala.util.Try -class AddressLookupConnector @Inject() (http: HttpClient, config: FrontendAppConfig) extends Logging { +class AddressLookupConnector @Inject() (http: HttpClientV2, config: FrontendAppConfig) extends Logging { def addressLookupByPostcode(postCode: String)(implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Seq[AddressLookup]] = { @@ -38,7 +39,11 @@ class AddressLookupConnector @Inject() (http: HttpClient, config: FrontendAppCon val lookupAddressByPostcode = LookupAddressByPostcode(postCode, None) - http.POST[LookupAddressByPostcode, HttpResponse](addressLookupUrl, lookupAddressByPostcode, headers = Seq("X-Hmrc-Origin" -> "CRSFATCA")) flatMap { + http + .post(url"$addressLookupUrl") + .withBody(Json.toJson(lookupAddressByPostcode)) + .setHeader("X-Hmrc-Origin" -> "CRSFATCA") + .execute[HttpResponse] flatMap { case response if response.status equals OK => Future.successful( sortAddresses( diff --git a/app/connectors/RegistrationWithUtrConnector.scala b/app/connectors/RegistrationWithUtrConnector.scala index f30e9a4..7f16697 100644 --- a/app/connectors/RegistrationWithUtrConnector.scala +++ b/app/connectors/RegistrationWithUtrConnector.scala @@ -19,21 +19,25 @@ package connectors import config.FrontendAppConfig import models.UniqueTaxpayerReference import play.api.Logging +import play.api.libs.json.Json import uk.gov.hmrc.http._ +import uk.gov.hmrc.http.client.HttpClientV2 import java.net.URL import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} -class RegistrationWithUtrConnector @Inject() (val config: FrontendAppConfig, val http: HttpClient) extends Logging { +class RegistrationWithUtrConnector @Inject() (val config: FrontendAppConfig, val http: HttpClientV2) extends Logging { def sendAndRetrieveRegWithUtr( uniqueTaxpayerReference: UniqueTaxpayerReference )(implicit hc: HeaderCarrier, ec: ExecutionContext): Future[HttpResponse] = { - val endpoint = new URL(s"${config.registrationUrl}/crs-fatca-registration/registration/organisation/utr-only") - http.POST[UniqueTaxpayerReference, HttpResponse](endpoint, uniqueTaxpayerReference) + http + .post(url"$endpoint") + .withBody(Json.toJson(uniqueTaxpayerReference)) + .execute[HttpResponse] } } diff --git a/app/connectors/SubscriptionConnector.scala b/app/connectors/SubscriptionConnector.scala index 78c5409..0116b80 100644 --- a/app/connectors/SubscriptionConnector.scala +++ b/app/connectors/SubscriptionConnector.scala @@ -20,21 +20,24 @@ import config.FrontendAppConfig import models.subscription.request.ReadSubscriptionRequest import models.subscription.response.DisplaySubscriptionResponse import play.api.Logging -import uk.gov.hmrc.http.{HeaderCarrier, HttpClient} +import play.api.libs.json.Json +import uk.gov.hmrc.http.client.HttpClientV2 +import uk.gov.hmrc.http.{HeaderCarrier, StringContextOps} import javax.inject.Inject import scala.concurrent.{ExecutionContext, Future} -class SubscriptionConnector @Inject() (val config: FrontendAppConfig, val http: HttpClient) extends Logging { +class SubscriptionConnector @Inject() (val config: FrontendAppConfig, val http: HttpClientV2) extends Logging { def readSubscription( readSubscriptionRequest: ReadSubscriptionRequest )(implicit hc: HeaderCarrier, ec: ExecutionContext): Future[DisplaySubscriptionResponse] = { - val submissionUrl = s"${config.registrationUrl}/crs-fatca-registration/subscription/read-subscription" - http.POST[ReadSubscriptionRequest, DisplaySubscriptionResponse](submissionUrl, readSubscriptionRequest) - + http + .post(url"$submissionUrl") + .withBody(Json.toJson(readSubscriptionRequest)) + .execute[DisplaySubscriptionResponse] } }