9904 Update scala

.scalafmt.conf

@@ -1,33 +1,45 @@
-version=2.0.1
-align = none
-continuationIndent.defnSite = 2
-danglingParentheses = true
-docstrings = JavaDoc
+version = 3.7.0
+runner.dialect = scala3
 maxColumn = 120
+lineEndings = unix
+importSelectors = singleLine
 
-# Only format files tracked by git.
 project {
-  excludeFilters = ["target/"]
   git = true
 }
 
+align {
+  preset = most
+  tokens = [ {code = "=>", owner = "Case|Type.Arg.ByName"}, "=", "<-", "->", "%", "%%", "should", "shouldBe", "shouldEqual", "shouldNot", "must" ]
+  arrowEnumeratorGenerator = true
+  openParenCallSite = false
+  openParenDefnSite = false
+}
+
+binPack {
+  parentConstructors = false
+}
+
+continuationIndent {
+  callSite = 2
+  defnSite = 2
+}
+
+newlines {
+  penalizeSingleSelectMultiArgList = false
+  sometimesBeforeColonInMethodReturnType = true
+}
+
 rewrite {
-  rules = [
-    AvoidInfix
-    PreferCurlyFors
-    RedundantBraces
-    RedundantParens
-    SortImports
-    SortModifiers
-  ]
-  sortModifiers.order = [
-    final
-    override
-    private
-    protected
-    sealed
-    abstract
-    implicit
-    lazy
-  ]
+  rules = [RedundantBraces, RedundantParens, AsciiSortImports]
+  redundantBraces {
+    maxLines = 100
+    includeUnitMethods = true
+    stringInterpolation = true
+  }
 }
+
+spaces {
+  inImportCurlyBraces = false
+  beforeContextBoundColon = Never
+}

app/uk/gov/hmrc/breathingspaceifstub/controller/DebtsController.scala

@@ -27,7 +27,7 @@ import uk.gov.hmrc.breathingspaceifstub.utils.ControllerSupport
 import uk.gov.hmrc.play.bootstrap.backend.controller.BackendController
 
 @Singleton()
-class DebtsController @Inject()(
+class DebtsController @Inject() (
   cc: ControllerComponents
 )(implicit val ec: ExecutionContext)
     extends BackendController(cc)
@@ -44,7 +44,7 @@ class DebtsController @Inject()(
       case "AS000003" => sendResponse(OK, jsonDataFromFile("multipleBsDebtsFullPopulation.json"))
       case "AS000004" => sendResponse(OK, jsonDataFromFile("multipleBsDebtsPartialPopulation.json"))
       case "AS000005" => sendResponse(OK, jsonDataFromFile("multipleBsDebtsMixedPopulation.json"))
-      case _ => sendResponse(NOT_FOUND, failures("NO_DATA_FOUND", "No records found for the given Nino"))
+      case _          => sendResponse(NOT_FOUND, failures("NO_DATA_FOUND", "No records found for the given Nino"))
     }
 
   def jsonDataFromFile(filename: String): JsValue = getJsonDataFromFile(s"debts/$filename")

app/uk/gov/hmrc/breathingspaceifstub/controller/IndividualDetailsController.scala

@@ -27,7 +27,7 @@ import uk.gov.hmrc.breathingspaceifstub.utils.ControllerSupport
 import uk.gov.hmrc.play.bootstrap.backend.controller.BackendController
 
 @Singleton()
-class IndividualDetailsController @Inject()(
+class IndividualDetailsController @Inject() (
   configuration: Configuration,
   cc: ControllerComponents
 )(implicit val ec: ExecutionContext)
@@ -62,15 +62,15 @@ class IndividualDetailsController @Inject()(
 object IndividualDetailsController {
 
   val filter = {
-    val Details = "details(nino,dateOfBirth)"
-    val NameList = "nameList(name(firstForename,secondForename,surname,nameType))"
+    val Details     = "details(nino,dateOfBirth)"
+    val NameList    = "nameList(name(firstForename,secondForename,surname,nameType))"
     val AddressList =
       "addressList(address(addressLine1,addressLine2,addressLine3,addressLine4,addressLine5,addressPostcode,countryCode,addressType))"
-    val Indicators = "indicators(welshOutputInd)"
+    val Indicators  = "indicators(welshOutputInd)"
 
     s"$Details,$NameList,$AddressList,$Indicators"
   }
 
-  val fullPopulationDetails = "IndividualDetails.json"
+  val fullPopulationDetails    = "IndividualDetails.json"
   val detailsForBreathingSpace = "IndividualDetailsForBS.json"
 }

app/uk/gov/hmrc/breathingspaceifstub/controller/MemorandumController.scala

@@ -25,7 +25,7 @@ import javax.inject.{Inject, Singleton}
 import scala.concurrent.{ExecutionContext, Future}
 
 @Singleton()
-class MemorandumController @Inject()(
+class MemorandumController @Inject() (
   cc: ControllerComponents
 )(implicit val ec: ExecutionContext)
     extends BackendController(cc)
@@ -42,7 +42,7 @@ class MemorandumController @Inject()(
       case "AA000333" => sendResponse(OK, jsonDataFromFile("hasBreathingSpaceIndicator.json"))
       case "AS000003" => sendResponse(UNPROCESSABLE_ENTITY, failures("UNKNOWN_DATA_ITEM"))
       case "AS000004" => sendResponse(BAD_GATEWAY, failures("BAD_GATEWAY"))
-      case _ => sendResponse(NOT_FOUND, failures("NO_DATA_FOUND", "No records found for the given Nino"))
+      case _          => sendResponse(NOT_FOUND, failures("NO_DATA_FOUND", "No records found for the given Nino"))
     }
 
   def jsonDataFromFile(filename: String): JsValue = getJsonDataFromFile(s"memorandum/$filename")

app/uk/gov/hmrc/breathingspaceifstub/controller/PeriodsController.scala

@@ -28,7 +28,7 @@ import uk.gov.hmrc.breathingspaceifstub.utils.ControllerSupport
 import uk.gov.hmrc.play.bootstrap.backend.controller.BackendController
 
 @Singleton()
-class PeriodsController @Inject()(
+class PeriodsController @Inject() (
   cc: ControllerComponents
 )(implicit val ec: ExecutionContext)
     extends BackendController(cc)
@@ -53,7 +53,7 @@ class PeriodsController @Inject()(
       case "AS000003" => sendResponse(OK, jsonDataFromFile("multipleBsPeriodsFullPopulation.json"))
       case "AS000004" => sendResponse(OK, jsonDataFromFile("multipleBsPeriodsPartialPopulation.json"))
       case "AS000005" => sendResponse(OK, jsonDataFromFile("multipleBsPeriodsMixedPopulation.json"))
-      case _ => sendResponse(OK, Json.parse("""{"periods":[]}"""))
+      case _          => sendResponse(OK, Json.parse("""{"periods":[]}"""))
     }
 
   def withBodyAcceptedNinoHandler(
@@ -79,17 +79,16 @@ class PeriodsController @Inject()(
 
   def transformRequestJsonToResponseJson(jsValue: JsValue, addPeriodIdField: Boolean): JsResult[JsObject] = {
     val attrTransformer = (__ \ "periods").json.update {
-      __.read[JsArray].map {
-        case JsArray(values) =>
-          val updatedValues = values.map { period =>
-            val retainedFields = period.as[JsObject].fields.filter(_._1 != "pegaRequestTimestamp")
-            val additionalFields =
-              if (addPeriodIdField) Seq(("periodID", JsString(UUID.randomUUID().toString))) else Seq.empty
+      __.read[JsArray].map { case JsArray(values) =>
+        val updatedValues = values.map { period =>
+          val retainedFields   = period.as[JsObject].fields.filter(_._1 != "pegaRequestTimestamp")
+          val additionalFields =
+            if (addPeriodIdField) Seq(("periodID", JsString(UUID.randomUUID().toString))) else Seq.empty
 
-            JsObject(additionalFields ++ retainedFields)
-          }
+          JsObject(additionalFields ++ retainedFields)
+        }
 
-          JsArray(updatedValues)
+        JsArray(updatedValues)
       }
     }
 

app/uk/gov/hmrc/breathingspaceifstub/controller/UnderpaymentsController.scala

@@ -26,7 +26,7 @@ import javax.inject.{Inject, Singleton}
 import scala.concurrent.{ExecutionContext, Future}
 
 @Singleton()
-class UnderpaymentsController @Inject()(cc: ControllerComponents)(implicit val ec: ExecutionContext)
+class UnderpaymentsController @Inject() (cc: ControllerComponents)(implicit val ec: ExecutionContext)
     extends BackendController(cc)
     with ControllerSupport {
 
@@ -42,7 +42,7 @@ class UnderpaymentsController @Inject()(cc: ControllerComponents)(implicit val e
     (nino, periodId) match {
       case ("AS000001", "648ea46e-8027-11ec-b614-03845253624e") =>
         sendResponse(OK, jsonDataFromFile("underpayments1.json"))
-      case _ => sendResponse(NOT_FOUND, failures(s"NO_DATA_FOUND", s"$nino or $periodId did not match"))
+      case _                                                    => sendResponse(NOT_FOUND, failures(s"NO_DATA_FOUND", s"$nino or $periodId did not match"))
     }
   }
 }

app/uk/gov/hmrc/breathingspaceifstub/model/Attended.scala

@@ -24,8 +24,8 @@ object Attended {
   case object DA2_BS_UNATTENDED extends Attended
 
   def withNameOption(name: String): Option[Attended] = name match {
-    case "DA2_BS_ATTENDED" => Some(DA2_BS_ATTENDED)
+    case "DA2_BS_ATTENDED"   => Some(DA2_BS_ATTENDED)
     case "DA2_BS_UNATTENDED" => Some(DA2_BS_UNATTENDED)
-    case _ => None
+    case _                   => None
   }
 }

app/uk/gov/hmrc/breathingspaceifstub/package.scala

@@ -20,7 +20,7 @@ package object breathingspaceifstub {
 
   object Header {
     lazy val CorrelationId = "CorrelationId"
-    lazy val OriginatorId = "OriginatorId"
-    lazy val UserId = "UserId"
+    lazy val OriginatorId  = "OriginatorId"
+    lazy val UserId        = "UserId"
   }
 }

app/uk/gov/hmrc/breathingspaceifstub/utils/ControllerSupport.scala

@@ -45,8 +45,8 @@ trait ControllerSupport extends Results with Logging {
         .as(MimeTypes.JSON)
     }
 
-  def composeResponse(nino: String, acceptedHandler: (String) => Future[Result])(
-    implicit request: Request[_]
+  def composeResponse(nino: String, acceptedHandler: (String) => Future[Result])(implicit
+    request: Request[_]
   ): Future[Result] = {
     val normalisedNino = nino.toUpperCase.take(8)
     if (normalisedNino.take(2) == "BS") sendErrorResponseFromNino(normalisedNino) // a bad nino
@@ -59,7 +59,7 @@ trait ControllerSupport extends Results with Logging {
   }
 
   def getJsonDataFromFile(filename: String): JsValue = {
-    val in = getClass.getResourceAsStream(s"/data/$filename")
+    val in  = getClass.getResourceAsStream(s"/data/$filename")
     val raw = Source.fromInputStream(in).getLines().mkString
     Json.parse(raw)
   }

app/uk/gov/hmrc/breathingspaceifstub/utils/Filters.scala

@@ -25,7 +25,7 @@ import play.api.mvc._
 import uk.gov.hmrc.play.bootstrap.filters.{AuditFilter, CacheControlFilter, LoggingFilter, MDCFilter}
 import uk.gov.hmrc.play.bootstrap.metrics.MetricsFilter
 
-class Filters @Inject()(
+class Filters @Inject() (
   metricsFilter: MetricsFilter,
   auditFilter: AuditFilter,
   loggingFilter: LoggingFilter,
@@ -42,7 +42,7 @@ class Filters @Inject()(
       new StubRequestLoggingFilter()
     )
 
-class StubRequestLoggingFilter @Inject()(implicit val mat: Materializer, ec: ExecutionContext) extends Filter {
+class StubRequestLoggingFilter @Inject() (implicit val mat: Materializer, ec: ExecutionContext) extends Filter {
 
   lazy val logger = LoggerFactory.getLogger(this.getClass)
 

build.sbt

@@ -1,32 +1,33 @@
 import uk.gov.hmrc.DefaultBuildSettings
-import uk.gov.hmrc.DefaultBuildSettings.*
 
 val appName = "breathing-space-if-stub"
 
 val silencerVersion = "1.7.1"
 
-ThisBuild / majorVersion := 1
-ThisBuild / scalaVersion := "2.13.12"
+ThisBuild / majorVersion := 2
+ThisBuild / scalaVersion := "3.3.4"
 ThisBuild / scalafmtOnCompile := true
 
 lazy val microservice = Project(appName, file("."))
-  .enablePlugins(play.sbt.PlayScala, SbtAutoBuildPlugin, SbtDistributablesPlugin)
+  .enablePlugins(play.sbt.PlayScala, SbtDistributablesPlugin)
   .disablePlugins(JUnitXmlReportPlugin)
   .settings(
     PlayKeys.playDefaultPort := 9503,
     libraryDependencies      ++= Dependencies.compile ++ Dependencies.test,
     scalacOptions ++= Seq(
-      "-Werror",
-      "-Wdead-code",
-      "-Wunused:_",
-      "-Wextra-implicit",
       "-feature",
-      "-Wconf:cat=unused&src=.*Controller\\.scala:s",
-      "-Wconf:cat=unused&src=.*RoutesPrefix\\.scala:s",
-      "-Wconf:cat=unused&src=.*Routes\\.scala:s",
-      "-Wconf:cat=unused&src=.*ReverseRoutes\\.scala:s",
-      "-Wconf:cat=unused&src=.*JavaScriptReverseRoutes\\.scala:s",
-      "-Wconf:src=routes/.*:s")
+      "-Werror",
+      "-language:noAutoTupling",
+      "-language:strictEquality",
+      "-Wvalue-discard",
+      "-Xfatal-warnings",
+      "-Wconf:msg=unused import&src=.*views\\.html.*:s",
+      "-Wconf:msg=unused import&src=<empty>:s",
+      "-Wconf:msg=unused&src=.*RoutesPrefix\\.scala:s",
+      "-Wconf:msg=unused&src=.*Routes\\.scala:s",
+      "-Wconf:msg=unused&src=.*ReverseRoutes\\.scala:s",
+      "-Wconf:msg=Flag.*repeatedly:s"
+    )
   )
   .settings(
     scoverageSettings,

conf/logback.xml

@@ -14,35 +14,13 @@
         </encoder>
     </appender>
 
-    <appender name="STDOUT_IGNORE_NETTY" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%date{ISO8601} level=[%level] logger=[%logger] thread=[%thread] rid=[not-available] user=[not-available] message=[%message] %replace(exception=[%xException]){'^exception=\[\]$',''}%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="ACCESS_LOG_FILE" class="ch.qos.logback.core.FileAppender">
-        <file>logs/access.log</file>
-        <encoder>
-            <pattern>%message%n</pattern>
-        </encoder>
-    </appender>
-
     <appender name="CONNECTOR_LOG_FILE" class="ch.qos.logback.core.FileAppender">
         <file>logs/connector.log</file>
         <encoder>
             <pattern>%message%n</pattern>
         </encoder>
     </appender>
 
-
-    <logger name="accesslog" level="INFO" additivity="false">
-        <appender-ref ref="ACCESS_LOG_FILE" />
-    </logger>
-
-    <logger name="com.ning.http.client.providers.netty" additivity="false">
-        <appender-ref ref="STDOUT_IGNORE_NETTY" />
-    </logger>
-
     <logger name="com.google.inject" level="INFO"/>
 
     <logger name="uk.gov" level="INFO"/>