APIS-7213: Upgrade to Java 21 with HttpClientV2 (#83)

Author: johnsgp

.scalafmt.conf

@@ -1,4 +1,4 @@
-version="3.5.3"
+version="3.7.17"
 runner.dialect = "scala213"
 
 maxColumn = 180
@@ -31,9 +31,9 @@ newlines.implicitParamListModifierPrefer = before
 newlines.avoidForSimpleOverflow = [tooLong, punct, slc]
 
 rewrite.rules = [SortModifiers]
-rewrite.rules = [SortImports]
+rewrite.rules = [AsciiSortImports]
 
 verticalMultiline.atDefnSite = true
 verticalMultiline.newlineAfterOpenParen = true
 
-includeNoParensInSelectChains = true
+includeNoParensInSelectChains = true

app/uk/gov/hmrc/apirevocationfrontend/config/CustomErrorHandler.scala

@@ -17,10 +17,11 @@
 package uk.gov.hmrc.apirevocationfrontend.config
 
 import javax.inject.Inject
+import scala.concurrent.{ExecutionContext, Future}
 
 import play.api.Configuration
 import play.api.i18n.MessagesApi
-import play.api.mvc.Request
+import play.api.mvc.RequestHeader
 import play.twirl.api.Html
 import uk.gov.hmrc.play.bootstrap.frontend.http.FrontendErrorHandler
 
@@ -30,11 +31,12 @@ class CustomErrorHandler @Inject() (
     val messagesApi: MessagesApi,
     val configuration: Configuration,
     error: ErrorView
-  )(implicit frontendAppConfig: FrontendAppConfig,
+  )(implicit val ec: ExecutionContext,
+    frontendAppConfig: FrontendAppConfig,
     footerConfig: FooterConfig
   ) extends FrontendErrorHandler {
 
-  override def standardErrorTemplate(pageTitle: String, heading: String, message: String)(implicit request: Request[_]): Html = {
-    error(pageTitle, heading, message)
+  override def standardErrorTemplate(pageTitle: String, heading: String, message: String)(implicit request: RequestHeader): Future[Html] = {
+    Future.successful(error(pageTitle, heading, message))
   }
 }

app/uk/gov/hmrc/apirevocationfrontend/connectors/DelegatedAuthorityConnector.scala

@@ -22,26 +22,27 @@ import scala.concurrent.Future._
 import scala.concurrent.{ExecutionContext, Future}
 
 import uk.gov.hmrc.http.HttpReads.Implicits._
-import uk.gov.hmrc.http.{HttpClient, _}
+import uk.gov.hmrc.http.client.HttpClientV2
+import uk.gov.hmrc.http.{HeaderCarrier, StringContextOps}
 import uk.gov.hmrc.play.bootstrap.config.ServicesConfig
 
 import uk.gov.hmrc.apirevocationfrontend.models.AppAuthorisation
 
 @Singleton
-class DelegatedAuthorityConnector @Inject() (servicesConfig: ServicesConfig, http: HttpClient)(implicit val ec: ExecutionContext) {
+class DelegatedAuthorityConnector @Inject() (servicesConfig: ServicesConfig, http: HttpClientV2)(implicit val ec: ExecutionContext) {
 
   val delegatedAuthorityUrl: String = servicesConfig.baseUrl("third-party-delegated-authority")
 
   def fetchApplicationAuthorities()(implicit hc: HeaderCarrier): Future[Seq[AppAuthorisation]] = {
-    http.GET[Seq[AppAuthorisation]](s"$delegatedAuthorityUrl/authority/granted-applications")
+    http.get(url"$delegatedAuthorityUrl/authority/granted-applications").execute[Seq[AppAuthorisation]]
   }
 
   def fetchApplicationAuthority(applicationId: UUID)(implicit hc: HeaderCarrier): Future[AppAuthorisation] = {
-    http.GET[Option[AppAuthorisation]](s"$delegatedAuthorityUrl/authority/granted-application/$applicationId") flatMap (handleNotFound)
+    http.get(url"$delegatedAuthorityUrl/authority/granted-application/$applicationId").execute[Option[AppAuthorisation]].flatMap(handleNotFound)
   }
 
   def revokeApplicationAuthority(applicationId: UUID)(implicit hc: HeaderCarrier): Future[Unit] = {
-    http.DELETE[Option[Unit]](s"$delegatedAuthorityUrl/authority/granted-application/$applicationId") flatMap (handleNotFound _)
+    http.delete(url"$delegatedAuthorityUrl/authority/granted-application/$applicationId").execute[Option[Unit]].flatMap(handleNotFound)
   }
 
   def handleNotFound[T](o: Option[T]): Future[T] = {

app/uk/gov/hmrc/apirevocationfrontend/controllers/Revocation.scala

@@ -51,7 +51,7 @@ class Revocation @Inject() (
   private lazy val loginURL: String   = frontendAppConfig.signInUrl
   private lazy val loginUrlParameters = Map[String, Seq[String]]()
 
-  private def notFoundTemplate(implicit request: Request[_]): Html = {
+  private def notFoundTemplate(implicit request: RequestHeader): Html = {
     error(
       Messages("global.error.pageNotFound404.title"),
       Messages("global.error.pageNotFound404.heading"),

app/uk/gov/hmrc/apirevocationfrontend/views/ErrorView.scala.html

@@ -18,7 +18,7 @@
 
 @this(appConfig: FrontendAppConfig, main: MainView)
 
-@(pageTitle: String, heading: String, message: String)(implicit request: Request[_], messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
+@(pageTitle: String, heading: String, message: String)(implicit requestHeader: RequestHeader, messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
 
 @contentHeader = {
   <h1 class="govuk-heading-l">@heading</h1>

app/uk/gov/hmrc/apirevocationfrontend/views/MainView.scala.html

@@ -30,7 +30,7 @@
         hmrcHead: HmrcHead
 )
 
-@(title: Option[String] = None)(contentBlock: Html)(implicit request : Request[_], messages: Messages, applicationConfig: FrontendAppConfig, footerConfig: FooterConfig)
+@(title: Option[String] = None)(contentBlock: Html)(implicit requestHeader : RequestHeader, messages: Messages, applicationConfig: FrontendAppConfig, footerConfig: FooterConfig)
 
 @serviceInfoContent = {}
 
@@ -64,7 +64,7 @@
   @contentBlock
   <br />
   <br />
-  <a href="@{applicationConfig.reportProblemHost}/contact/problem_reports_nonjs?newTab=false&service=api-revocation?referrerUrl=@{helper.urlEncode(request.uri)}" class="govuk-link govuk-link--no-visited-state">
+  <a href="@{applicationConfig.reportProblemHost}/contact/problem_reports_nonjs?newTab=false&service=api-revocation?referrerUrl=@{helper.urlEncode(requestHeader.uri)}" class="govuk-link govuk-link--no-visited-state">
     Is this page not working properly?
   </a>
 }
@@ -75,7 +75,7 @@
       items = Some(
         Seq(
           FooterItem(text = Some("Cookies"), href = Some(s"${footerConfig.apiDocumentationFrontendUrl}/api-documentation/docs/help/cookies")),
-          FooterItem(text = Some("Accessibility statement"), href = Some(s"${footerConfig.platformFrontendHost}/accessibility-statement/manage-permissions-for-tax-software?referrerUrl=${helper.urlEncode(request.uri)}")),
+          FooterItem(text = Some("Accessibility statement"), href = Some(s"${footerConfig.platformFrontendHost}/accessibility-statement/manage-permissions-for-tax-software?referrerUrl=${helper.urlEncode(requestHeader.uri)}")),
           FooterItem(text = Some("Privacy Policy"), href = Some(s"${footerConfig.thirdPartyDeveloperFrontendUrl}/api-documentation/docs/help/privacy")),
           FooterItem(text = Some("Terms and conditions"), href = Some(s"${footerConfig.thirdPartyDeveloperFrontendUrl}/api-documentation/docs/help/terms-and-conditions")),
           FooterItem(text = Some("Help using GOV.UK "), href = Some("https://www.gov.uk/help"))

app/uk/gov/hmrc/apirevocationfrontend/views/revocation/AuthorizedApplicationsView.scala.html

@@ -20,7 +20,7 @@
 
 @this(main: MainView)
 
-@(applications: Seq[AppAuthorisation])(implicit request: Request[_], messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
+@(applications: Seq[AppAuthorisation])(implicit requestHeader: RequestHeader, messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
 
 @import java.time.ZoneOffset
 @body = {

app/uk/gov/hmrc/apirevocationfrontend/views/revocation/LoggedOutView.scala.html

@@ -18,7 +18,7 @@
 
 @this(main: MainView)
 
-@()(implicit request: Request[_], messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
+@()(implicit requestHeader: RequestHeader, messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
 
 @body = {
   <h1 class="govuk-heading-l">You’re signed out</h1>

app/uk/gov/hmrc/apirevocationfrontend/views/revocation/PermissionWithdrawnView.scala.html

@@ -18,7 +18,7 @@
 
 @this(main: MainView)
 
-@()(implicit request: Request[_], messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
+@()(implicit requestHeader: RequestHeader, messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
 
 @body = {
   <h1 class="govuk-heading-l">Authority removed</h1>

app/uk/gov/hmrc/apirevocationfrontend/views/revocation/StartView.scala.html

@@ -18,7 +18,7 @@
 
 @this(main: MainView)
 
-@()(implicit request: Request[_], messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
+@()(implicit requestHeader: RequestHeader, messages: Messages, appConfig : FrontendAppConfig, footerConfig: FooterConfig)
 
 @body = {
   <h1 id="page-heading" class="govuk-heading-l">Manage the authority you have granted to software applications</h1>