NOJIRA enforce scala3 syntax

.scalafix.conf

@@ -3,6 +3,7 @@ rules = [ExplicitResultTypes, OrganizeImports, RemoveUnused,DisableSyntax]
 OrganizeImports {
   groupedImports = Keep
   coalesceToWildcardImportThreshold = 3
+  targetDialect = Scala3
 }
 
 DisableSyntax {

.scalafmt.conf

@@ -4,6 +4,7 @@ style = defaultWithAlign
 maxColumn = 150
 lineEndings = unix
 importSelectors = singleLine
+rewrite.scala3.convertToNewSyntax = true
 
 project {
   git = true

app/uk/gov/hmrc/pillar2submissionapi/config/Module.scala

@@ -18,7 +18,7 @@ package uk.gov.hmrc.pillar2submissionapi.config
 
 import com.google.inject.AbstractModule
 import uk.gov.hmrc.auth.core.AuthConnector
-import uk.gov.hmrc.pillar2submissionapi.controllers.actions._
+import uk.gov.hmrc.pillar2submissionapi.controllers.actions.*
 import uk.gov.hmrc.play.bootstrap.auth.DefaultAuthConnector
 
 class Module extends AbstractModule {

app/uk/gov/hmrc/pillar2submissionapi/connectors/GIRConnector.scala

@@ -19,7 +19,7 @@ package uk.gov.hmrc.pillar2submissionapi.connectors
 import play.api.Logging
 import play.api.libs.json.Json
 import play.api.libs.ws.JsonBodyWritables.writeableOf_JsValue
-import uk.gov.hmrc.http.HttpReads.Implicits._
+import uk.gov.hmrc.http.HttpReads.Implicits.*
 import uk.gov.hmrc.http.client.HttpClientV2
 import uk.gov.hmrc.http.{HeaderCarrier, HttpResponse}
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig

app/uk/gov/hmrc/pillar2submissionapi/connectors/ObligationAndSubmissionsConnector.scala

@@ -17,7 +17,7 @@
 package uk.gov.hmrc.pillar2submissionapi.connectors
 
 import play.api.Logging
-import uk.gov.hmrc.http.HttpReads.Implicits._
+import uk.gov.hmrc.http.HttpReads.Implicits.*
 import uk.gov.hmrc.http.client.HttpClientV2
 import uk.gov.hmrc.http.{HeaderCarrier, HttpResponse, StringContextOps}
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig

app/uk/gov/hmrc/pillar2submissionapi/connectors/OverseasReturnNotificationConnector.scala

@@ -20,7 +20,7 @@ import play.api.Logging
 import play.api.libs.json.Format.GenericFormat
 import play.api.libs.json.Json
 import play.api.libs.ws.JsonBodyWritables.writeableOf_JsValue
-import uk.gov.hmrc.http.HttpReads.Implicits._
+import uk.gov.hmrc.http.HttpReads.Implicits.*
 import uk.gov.hmrc.http.client.HttpClientV2
 import uk.gov.hmrc.http.{HeaderCarrier, HttpResponse}
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig

app/uk/gov/hmrc/pillar2submissionapi/connectors/SubmitBTNConnector.scala

@@ -20,7 +20,7 @@ import play.api.Logging
 import play.api.libs.json.Format.GenericFormat
 import play.api.libs.json.Json
 import play.api.libs.ws.JsonBodyWritables.writeableOf_JsValue
-import uk.gov.hmrc.http.HttpReads.Implicits._
+import uk.gov.hmrc.http.HttpReads.Implicits.*
 import uk.gov.hmrc.http.client.HttpClientV2
 import uk.gov.hmrc.http.{HeaderCarrier, HttpResponse}
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig

app/uk/gov/hmrc/pillar2submissionapi/connectors/SubscriptionConnector.scala

@@ -20,8 +20,8 @@ import play.api.Logging
 import play.api.libs.json.Json
 import play.api.mvc.Result
 import play.api.mvc.Results.BadRequest
-import uk.gov.hmrc.http.HttpReads.Implicits._
-import uk.gov.hmrc.http._
+import uk.gov.hmrc.http.*
+import uk.gov.hmrc.http.HttpReads.Implicits.*
 import uk.gov.hmrc.http.client.HttpClientV2
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig
 import uk.gov.hmrc.pillar2submissionapi.models.subscription.{SubscriptionData, SubscriptionSuccess}

app/uk/gov/hmrc/pillar2submissionapi/connectors/TestOrganisationConnector.scala

@@ -19,11 +19,11 @@ package uk.gov.hmrc.pillar2submissionapi.connectors
 import play.api.Logging
 import play.api.libs.json.Json
 import play.api.libs.ws.JsonBodyWritables.writeableOf_JsValue
-import uk.gov.hmrc.http.HttpReads.Implicits._
+import uk.gov.hmrc.http.HttpReads.Implicits.*
 import uk.gov.hmrc.http.client.HttpClientV2
 import uk.gov.hmrc.http.{HeaderCarrier, HttpResponse}
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig
-import uk.gov.hmrc.pillar2submissionapi.controllers.error._
+import uk.gov.hmrc.pillar2submissionapi.controllers.error.*
 import uk.gov.hmrc.pillar2submissionapi.models.organisation.{TestOrganisation, TestOrganisationWithId}
 
 import java.net.URI

app/uk/gov/hmrc/pillar2submissionapi/connectors/UKTaxReturnConnector.scala

@@ -20,7 +20,7 @@ import play.api.Logging
 import play.api.libs.json.Format.GenericFormat
 import play.api.libs.json.Json
 import play.api.libs.ws.JsonBodyWritables.writeableOf_JsValue
-import uk.gov.hmrc.http.HttpReads.Implicits._
+import uk.gov.hmrc.http.HttpReads.Implicits.*
 import uk.gov.hmrc.http.client.HttpClientV2
 import uk.gov.hmrc.http.{HeaderCarrier, HttpResponse}
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig

app/uk/gov/hmrc/pillar2submissionapi/controllers/Pillar2ErrorHandler.scala

@@ -21,7 +21,7 @@ import play.api.http.HttpErrorHandler
 import play.api.libs.json.Json
 import play.api.mvc.Results.Status
 import play.api.mvc.{RequestHeader, Result, Results}
-import uk.gov.hmrc.pillar2submissionapi.controllers.error._
+import uk.gov.hmrc.pillar2submissionapi.controllers.error.*
 import uk.gov.hmrc.pillar2submissionapi.models.response.Pillar2ErrorResponse
 
 import scala.concurrent.Future

app/uk/gov/hmrc/pillar2submissionapi/controllers/actions/AuthenticatedIdentifierAction.scala

@@ -18,14 +18,14 @@ package uk.gov.hmrc.pillar2submissionapi.controllers.actions
 
 import com.google.inject.{Inject, Singleton}
 import play.api.Logging
+import uk.gov.hmrc.auth.core.*
 import uk.gov.hmrc.auth.core.AffinityGroup.{Agent, Organisation}
 import uk.gov.hmrc.auth.core.AuthProvider.GovernmentGateway
-import uk.gov.hmrc.auth.core._
 import uk.gov.hmrc.auth.core.retrieve.v2.Retrievals
 import uk.gov.hmrc.auth.core.retrieve.~
 import uk.gov.hmrc.http.{HeaderCarrier, HeaderNames}
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig
-import uk.gov.hmrc.pillar2submissionapi.controllers.error._
+import uk.gov.hmrc.pillar2submissionapi.controllers.error.*
 import uk.gov.hmrc.pillar2submissionapi.models.requests.IdentifierRequest
 import uk.gov.hmrc.play.http.HeaderCarrierConverter
 
@@ -40,7 +40,7 @@ class AuthenticatedIdentifierAction @Inject() (
     with AuthorisedFunctions
     with Logging {
 
-  import AuthenticatedIdentifierAction._
+  import AuthenticatedIdentifierAction.*
   private def getPillar2Id(enrolments: Enrolments): Option[String] =
     for {
       pillar2Enrolment <- enrolments.getEnrolment(HMRC_PILLAR2_ORG_KEY)
@@ -57,7 +57,7 @@ class AuthenticatedIdentifierAction @Inject() (
     enrolments
   ) match {
     case Some(pillar2Id) =>
-      if (request.pillar2Id != pillar2Id) throw IncorrectHeaderValue
+      if request.pillar2Id != pillar2Id then throw IncorrectHeaderValue
       else
         Future.successful(
           IdentifierRequest(
@@ -75,7 +75,7 @@ class AuthenticatedIdentifierAction @Inject() (
 
   override protected def transform[A](request: RequestWithPillar2Id[A]): Future[IdentifierRequest[A]] = {
     given hc: HeaderCarrier = HeaderCarrierConverter.fromRequest(request)
-    if (!request.headers.get(HeaderNames.authorisation).exists(_.trim.nonEmpty)) throw MissingCredentials
+    if !request.headers.get(HeaderNames.authorisation).exists(_.trim.nonEmpty) then throw MissingCredentials
     else {
       val retrievals = Retrievals.internalId and Retrievals.groupIdentifier and
         Retrievals.allEnrolments and Retrievals.affinityGroup and

app/uk/gov/hmrc/pillar2submissionapi/controllers/actions/IdentifierAction.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.controllers.actions
 
-import play.api.mvc._
+import play.api.mvc.*
 import uk.gov.hmrc.pillar2submissionapi.models.requests.IdentifierRequest
 
 trait IdentifierAction extends ActionTransformer[RequestWithPillar2Id, IdentifierRequest]

app/uk/gov/hmrc/pillar2submissionapi/controllers/actions/Pillar2IdHeaderAction.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.controllers.actions
 
-import play.api.mvc._
+import play.api.mvc.*
 
 trait Pillar2IdHeaderAction
     extends ActionTransformer[Request, RequestWithPillar2Id]

app/uk/gov/hmrc/pillar2submissionapi/controllers/obligationsandsubmissions/ObligationsAndSubmissionsController.scala

@@ -44,7 +44,7 @@ class ObligationsAndSubmissionsController @Inject() (
     Try {
       val accountingPeriod = ObligationsAndSubmissions(fromDate = LocalDate.parse(fromDate), toDate = LocalDate.parse(toDate))
 
-      if (accountingPeriod.validDateRange) {
+      if accountingPeriod.validDateRange then {
         obligationAndSubmissionsService
           .handleData(accountingPeriod.fromDate, accountingPeriod.toDate)
           .map(response => Ok(Json.toJson(response)))

app/uk/gov/hmrc/pillar2submissionapi/controllers/platform/DocumentationController.scala

@@ -17,7 +17,7 @@
 package uk.gov.hmrc.pillar2submissionapi.controllers.platform
 
 import controllers.Assets
-import play.api.libs.json._
+import play.api.libs.json.*
 import play.api.mvc.{Action, AnyContent, ControllerComponents}
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig
 import uk.gov.hmrc.play.bootstrap.backend.controller.BackendController
@@ -44,7 +44,7 @@ class DocumentationController @Inject() (assets: Assets, cc: ControllerComponent
   }
 
   def specification(version: String, file: String): Action[AnyContent] =
-    if (appConfig.testOnlyOasEnabled) {
+    if appConfig.testOnlyOasEnabled then {
       assets.at(s"/public/api/conf/$version/testOnly", file)
     } else assets.at(s"/public/api/conf/$version", file)
 }

app/uk/gov/hmrc/pillar2submissionapi/controllers/submission/OverseasReturnNotificationController.scala

@@ -20,7 +20,7 @@ import play.api.libs.json.{JsError, JsSuccess, Json}
 import play.api.mvc.{Action, AnyContent, ControllerComponents}
 import uk.gov.hmrc.http.HeaderCarrier
 import uk.gov.hmrc.pillar2submissionapi.controllers.actions.{IdentifierAction, Pillar2IdHeaderAction, SubscriptionDataRetrievalAction}
-import uk.gov.hmrc.pillar2submissionapi.controllers.error._
+import uk.gov.hmrc.pillar2submissionapi.controllers.error.*
 import uk.gov.hmrc.pillar2submissionapi.models.obligationsandsubmissions.ObligationsAndSubmissions
 import uk.gov.hmrc.pillar2submissionapi.models.overseasreturnnotification.ORNSubmission
 import uk.gov.hmrc.pillar2submissionapi.services.OverseasReturnNotificationService
@@ -79,7 +79,7 @@ class OverseasReturnNotificationController @Inject() (
       Try {
         val accountingPeriod =
           ObligationsAndSubmissions(fromDate = LocalDate.parse(accountingPeriodFrom), toDate = LocalDate.parse(accountingPeriodTo))
-        if (accountingPeriod.validDateRange) {
+        if accountingPeriod.validDateRange then {
           ornService
             .retrieveORN(accountingPeriodFrom, accountingPeriodTo)(using hc)
             .map(response => Ok(Json.toJson(response)))

app/uk/gov/hmrc/pillar2submissionapi/controllers/submission/UKTaxReturnController.scala

@@ -22,8 +22,8 @@ import play.api.libs.json.{JsError, JsSuccess, Json}
 import play.api.mvc.{Action, AnyContent, ControllerComponents}
 import uk.gov.hmrc.http.HeaderCarrier
 import uk.gov.hmrc.pillar2submissionapi.controllers.actions.{IdentifierAction, Pillar2IdHeaderExistsAction, SubscriptionDataRetrievalAction}
-import uk.gov.hmrc.pillar2submissionapi.controllers.error._
-import uk.gov.hmrc.pillar2submissionapi.models.uktrsubmissions._
+import uk.gov.hmrc.pillar2submissionapi.controllers.error.*
+import uk.gov.hmrc.pillar2submissionapi.models.uktrsubmissions.*
 import uk.gov.hmrc.pillar2submissionapi.services.UKTaxReturnService
 import uk.gov.hmrc.play.bootstrap.backend.controller.BackendController
 import uk.gov.hmrc.play.http.HeaderCarrierConverter

app/uk/gov/hmrc/pillar2submissionapi/controllers/test/GIRController.scala

@@ -41,7 +41,7 @@ class GIRController @Inject() (
     extends BackendController(cc) {
 
   private def checkTestEndpointsEnabled[A](block: => Future[A]): Future[A] =
-    if (config.testOrganisationEnabled) block else Future.failed(TestEndpointDisabled)
+    if config.testOrganisationEnabled then block else Future.failed(TestEndpointDisabled)
 
   def createGIR: Action[AnyContent] = (pillar2IdAction andThen identify).async { request =>
     given hc: HeaderCarrier = HeaderCarrierConverter.fromRequest(request).withExtraHeaders("X-Pillar2-Id" -> request.clientPillar2Id)

app/uk/gov/hmrc/pillar2submissionapi/controllers/test/TestOrganisationController.scala

@@ -21,7 +21,7 @@ import play.api.mvc.{Action, AnyContent, ControllerComponents}
 import uk.gov.hmrc.http.HeaderCarrier
 import uk.gov.hmrc.pillar2submissionapi.config.AppConfig
 import uk.gov.hmrc.pillar2submissionapi.controllers.actions.{IdentifierAction, Pillar2IdHeaderExistsAction}
-import uk.gov.hmrc.pillar2submissionapi.controllers.error._
+import uk.gov.hmrc.pillar2submissionapi.controllers.error.*
 import uk.gov.hmrc.pillar2submissionapi.models.organisation.TestOrganisationRequest
 import uk.gov.hmrc.pillar2submissionapi.services.TestOrganisationService
 import uk.gov.hmrc.play.bootstrap.backend.controller.BackendController
@@ -41,7 +41,7 @@ class TestOrganisationController @Inject() (
     extends BackendController(cc) {
 
   private def checkTestEndpointsEnabled[A](block: => Future[A]): Future[A] =
-    if (config.testOrganisationEnabled) block else Future.failed(TestEndpointDisabled)
+    if config.testOrganisationEnabled then block else Future.failed(TestEndpointDisabled)
 
   def createTestOrganisation: Action[AnyContent] = (pillar2IdAction andThen identify).async { request =>
     given HeaderCarrier = HeaderCarrierConverter.fromRequest(request)
@@ -50,7 +50,7 @@ class TestOrganisationController @Inject() (
         case Some(json) =>
           json.validate[TestOrganisationRequest] match {
             case JsSuccess(value, _) =>
-              if (!value.accountingPeriod.endDate.isAfter(value.accountingPeriod.startDate)) Future.failed(InvalidDateRange)
+              if !value.accountingPeriod.endDate.isAfter(value.accountingPeriod.startDate) then Future.failed(InvalidDateRange)
               else
                 testOrganisationService
                   .createTestOrganisation(request.clientPillar2Id, value)
@@ -79,7 +79,7 @@ class TestOrganisationController @Inject() (
         case Some(json) =>
           json.validate[TestOrganisationRequest] match {
             case JsSuccess(value, _) =>
-              if (!value.accountingPeriod.endDate.isAfter(value.accountingPeriod.startDate)) Future.failed(InvalidDateRange)
+              if !value.accountingPeriod.endDate.isAfter(value.accountingPeriod.startDate) then Future.failed(InvalidDateRange)
               else
                 testOrganisationService
                   .updateTestOrganisation(request.clientPillar2Id, value)

app/uk/gov/hmrc/pillar2submissionapi/models/WrappedValue.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models
 
-import play.api.libs.json._
+import play.api.libs.json.*
 
 trait WrappedValue[T] {
   def value: T

app/uk/gov/hmrc/pillar2submissionapi/models/overseasreturnnotification/ORNSubmission.scala

@@ -16,8 +16,8 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models.overseasreturnnotification
 
-import play.api.libs.functional.syntax._
-import play.api.libs.json._
+import play.api.libs.functional.syntax.*
+import play.api.libs.json.*
 
 import java.time.LocalDate
 

app/uk/gov/hmrc/pillar2submissionapi/models/overseasreturnnotification/ORNSuccessResponse.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models.overseasreturnnotification
 
-import play.api.libs.json._
+import play.api.libs.json.*
 
 case class ORNRetrieveSuccessResponse(
   processingDate:       String,
@@ -36,7 +36,7 @@ object ORNRetrieveSuccessResponse {
   given reads: Reads[ORNRetrieveSuccessResponse] = (json: JsValue) => {
     val standardReads = Json.reads[ORNRetrieveSuccessResponse]
     standardReads.reads(json) match {
-      case success: JsSuccess[_] => success.asInstanceOf[JsSuccess[ORNRetrieveSuccessResponse]]
+      case success: JsSuccess[?] => success.asInstanceOf[JsSuccess[ORNRetrieveSuccessResponse]]
       case _ =>
         (json \ "success").validate[ORNRetrieveSuccessResponse](using standardReads)
     }
@@ -51,7 +51,7 @@ object ORNSuccessResponse {
   given reads: Reads[ORNSuccessResponse] = (json: JsValue) => {
     val standardReads = Json.reads[ORNSuccessResponse]
     standardReads.reads(json) match {
-      case success: JsSuccess[_] => success.asInstanceOf[JsSuccess[ORNSuccessResponse]]
+      case success: JsSuccess[?] => success.asInstanceOf[JsSuccess[ORNSuccessResponse]]
       case _ =>
         (json \ "success").validate[ORNSuccessResponse](using standardReads)
     }

app/uk/gov/hmrc/pillar2submissionapi/models/subscription/UpeDetails.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models.subscription
 
-import play.api.libs.json._
+import play.api.libs.json.*
 
 import java.time.LocalDate
 

app/uk/gov/hmrc/pillar2submissionapi/models/uktrsubmissions/EntityName.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models.uktrsubmissions
 
-import play.api.libs.json._
+import play.api.libs.json.*
 import uk.gov.hmrc.pillar2submissionapi.models.WrappedValue
 
 case class EntityName(value: String) extends WrappedValue[String]

app/uk/gov/hmrc/pillar2submissionapi/models/uktrsubmissions/IdType.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models.uktrsubmissions
 
-import play.api.libs.json._
+import play.api.libs.json.*
 import uk.gov.hmrc.pillar2submissionapi.models.WrappedValue
 
 case class IdType(value: String) extends WrappedValue[String]

app/uk/gov/hmrc/pillar2submissionapi/models/uktrsubmissions/IdValue.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models.uktrsubmissions
 
-import play.api.libs.json._
+import play.api.libs.json.*
 import uk.gov.hmrc.pillar2submissionapi.models.WrappedValue
 
 case class IdValue(value: String) extends WrappedValue[String]

app/uk/gov/hmrc/pillar2submissionapi/models/uktrsubmissions/Monetary.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models.uktrsubmissions
 
-import play.api.libs.json._
+import play.api.libs.json.*
 import uk.gov.hmrc.pillar2submissionapi.models.WrappedValue
 
 case class Monetary(value: BigDecimal) extends WrappedValue[BigDecimal]

app/uk/gov/hmrc/pillar2submissionapi/models/uktrsubmissions/ReturnType.scala

@@ -16,8 +16,8 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models.uktrsubmissions
 
+import enumeratum.*
 import enumeratum.EnumEntry.UpperSnakecase
-import enumeratum._
 
 sealed trait ReturnType extends EnumEntry with UpperSnakecase
 

app/uk/gov/hmrc/pillar2submissionapi/models/uktrsubmissions/UKTRSubmission.scala

@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.pillar2submissionapi.models.uktrsubmissions
 
-import play.api.libs.json._
+import play.api.libs.json.*
 
 import java.time.LocalDate
 
@@ -54,7 +54,7 @@ object UKTRSubmissionNilReturn {
 
 object UKTRSubmission {
   given uktrSubmissionReads: Reads[UKTRSubmission] = (json: JsValue) =>
-    if ((json \ "liabilities" \ "returnType").isEmpty) {
+    if (json \ "liabilities" \ "returnType").isEmpty then {
       json.validate[UKTRSubmissionData]
     } else {
       json.validate[UKTRSubmissionNilReturn]