Merge pull request #198 from hmrc/Tom/DLS-10610/address-compilation-w…

…arnings

DLS-10610 - address compilation warnings

app/controllers/utils/package.scala

@@ -39,7 +39,7 @@ package object utils {
         case e: NoSuchElementException =>
           logger.warn(s"${request.uri} resulted in None.get, user redirected to start")
           throw ApplicationException(
-            Redirect(controllers.utils.routes.TimeoutController.timeout),
+            Redirect(controllers.utils.routes.TimeoutController.timeout()),
             e.getMessage
           )
       }

app/models/SummaryDataItemModel.scala

@@ -16,10 +16,10 @@
 
 package models
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class SummaryDataItemModel (question: String, answer: String, link: Option[String] = None)
 
 object SummaryDataItemModel {
-  implicit val format = Json.format[SummaryDataItemModel]
+  implicit val format: OFormat[SummaryDataItemModel] = Json.format[SummaryDataItemModel]
 }

app/models/resident/AcquisitionCostsModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class AcquisitionCostsModel (amount: BigDecimal)
 
 object AcquisitionCostsModel {
-  implicit val format = Json.format[AcquisitionCostsModel]
+  implicit val format: OFormat[AcquisitionCostsModel] = Json.format[AcquisitionCostsModel]
 }

app/models/resident/AcquisitionValueModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class AcquisitionValueModel (amount: BigDecimal)
 
 object AcquisitionValueModel {
-  implicit val format = Json.format[AcquisitionValueModel]
+  implicit val format: OFormat[AcquisitionValueModel] = Json.format[AcquisitionValueModel]
 }

app/models/resident/ChargeableGainResultModel.scala

@@ -16,7 +16,7 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class ChargeableGainResultModel (
                                        gain: BigDecimal,
@@ -33,5 +33,5 @@ case class ChargeableGainResultModel (
                                      )
 
 object ChargeableGainResultModel {
-  implicit val format = Json.format[ChargeableGainResultModel]
+  implicit val format: OFormat[ChargeableGainResultModel] = Json.format[ChargeableGainResultModel]
 }

app/models/resident/DisposalCostsModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class DisposalCostsModel(amount: BigDecimal)
 
 object DisposalCostsModel {
-  implicit val format = Json.format[DisposalCostsModel]
+  implicit val format: OFormat[DisposalCostsModel] = Json.format[DisposalCostsModel]
 }

app/models/resident/DisposalDateModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class DisposalDateModel (day: Int, month: Int, year: Int)
 
 object DisposalDateModel {
-  implicit val formats = Json.format[DisposalDateModel]
+  implicit val formats: OFormat[DisposalDateModel] = Json.format[DisposalDateModel]
 }

app/models/resident/DisposalValueModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class DisposalValueModel(amount: BigDecimal)
 
 object DisposalValueModel {
-  implicit val format = Json.format[DisposalValueModel]
+  implicit val format: OFormat[DisposalValueModel] = Json.format[DisposalValueModel]
 }

app/models/resident/LossesBroughtForwardModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class LossesBroughtForwardModel(option : Boolean)
 
 object LossesBroughtForwardModel {
-  implicit val format = Json.format[LossesBroughtForwardModel]
+  implicit val format: OFormat[LossesBroughtForwardModel] = Json.format[LossesBroughtForwardModel]
 }

app/models/resident/LossesBroughtForwardValueModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class LossesBroughtForwardValueModel (amount: BigDecimal)
 
 object LossesBroughtForwardValueModel {
-  implicit val format = Json.format[LossesBroughtForwardValueModel]
+  implicit val format: OFormat[LossesBroughtForwardValueModel] = Json.format[LossesBroughtForwardValueModel]
 }

app/models/resident/SellForLessModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class SellForLessModel (sellForLess: Boolean)
 
 object SellForLessModel {
-  implicit val format = Json.format[SellForLessModel]
+  implicit val format: OFormat[SellForLessModel] = Json.format[SellForLessModel]
 }

app/models/resident/TotalGainAndTaxOwedModel.scala

@@ -16,7 +16,7 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class TotalGainAndTaxOwedModel(gain: BigDecimal,
                                     chargeableGain: BigDecimal,
@@ -36,5 +36,5 @@ case class TotalGainAndTaxOwedModel(gain: BigDecimal,
                                    )
 
 object TotalGainAndTaxOwedModel {
-  implicit val formats = Json.format[TotalGainAndTaxOwedModel]
+  implicit val formats: OFormat[TotalGainAndTaxOwedModel] = Json.format[TotalGainAndTaxOwedModel]
 }

app/models/resident/WorthWhenInheritedModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class WorthWhenInheritedModel (amount: BigDecimal)
 
 object WorthWhenInheritedModel {
-  implicit val format = Json.format[WorthWhenInheritedModel]
+  implicit val format: OFormat[WorthWhenInheritedModel] = Json.format[WorthWhenInheritedModel]
 }

app/models/resident/WorthWhenSoldForLessModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class WorthWhenSoldForLessModel(amount: BigDecimal)
 
 object WorthWhenSoldForLessModel {
-  implicit val format = Json.format[WorthWhenSoldForLessModel]
+  implicit val format: OFormat[WorthWhenSoldForLessModel] = Json.format[WorthWhenSoldForLessModel]
 }

app/models/resident/income/CurrentIncomeModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident.income
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class CurrentIncomeModel(amount: BigDecimal)
 
 object CurrentIncomeModel {
-  implicit val format = Json.format[CurrentIncomeModel]
+  implicit val format: OFormat[CurrentIncomeModel] = Json.format[CurrentIncomeModel]
 }

app/models/resident/income/PersonalAllowanceModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident.income
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class PersonalAllowanceModel(amount: BigDecimal)
 
 object PersonalAllowanceModel {
-  implicit val format = Json.format[PersonalAllowanceModel]
+  implicit val format: OFormat[PersonalAllowanceModel] = Json.format[PersonalAllowanceModel]
 }

app/models/resident/income/PreviousTaxableGainsModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident.income
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class PreviousTaxableGainsModel(amount: BigDecimal)
 
 object PreviousTaxableGainsModel {
-  implicit val format = Json.format[PreviousTaxableGainsModel]
+  implicit val format: OFormat[PreviousTaxableGainsModel] = Json.format[PreviousTaxableGainsModel]
 }

app/models/resident/shares/OwnerBeforeLegislationStartModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident.shares
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class OwnerBeforeLegislationStartModel(ownerBeforeLegislationStart: Boolean)
 
 object OwnerBeforeLegislationStartModel {
-  implicit val format = Json.format[OwnerBeforeLegislationStartModel]
+  implicit val format: OFormat[OwnerBeforeLegislationStartModel] = Json.format[OwnerBeforeLegislationStartModel]
 }

app/models/resident/shares/gain/DidYouInheritThemModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident.shares.gain
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class DidYouInheritThemModel(wereInherited: Boolean)
 
 object DidYouInheritThemModel {
-  implicit val format = Json.format[DidYouInheritThemModel]
+  implicit val format: OFormat[DidYouInheritThemModel] = Json.format[DidYouInheritThemModel]
 }

app/models/resident/shares/gain/ValueBeforeLegislationStartModel.scala

@@ -16,10 +16,10 @@
 
 package models.resident.shares.gain
 
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
 
 case class ValueBeforeLegislationStartModel(amount: BigDecimal)
 
 object ValueBeforeLegislationStartModel {
-  implicit val format = Json.format[ValueBeforeLegislationStartModel]
+  implicit val format: OFormat[ValueBeforeLegislationStartModel] = Json.format[ValueBeforeLegislationStartModel]
 }

build.sbt

@@ -25,6 +25,8 @@ lazy val microservice = Project(appName, file("."))
   .settings(integrationTestSettings())
   .settings(isPublicArtefact := true)
   .settings(
+    scalacOptions.+=("-Wconf:src=html/.*:s"), //suppresses warnings in twirl files and routes.
+    scalacOptions.+=("-Wconf:src=routes/.*:s"), //these warnings are loud and inconsequential.
     TwirlKeys.templateImports ++= Seq(
       "uk.gov.hmrc.govukfrontend.views.html.components._",
       "uk.gov.hmrc.hmrcfrontend.views.html.components._",

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="uk.gov" level="WARN"/>
 
     <logger name="application" level="DEBUG"/>

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.9

project/plugins.sbt

@@ -1,7 +1,7 @@
 resolvers += MavenRepository("HMRC-open-artefacts-maven2", "https://open.artefacts.tax.service.gov.uk/maven2")
 resolvers += Resolver.url("HMRC-open-artefacts-ivy", url("https://open.artefacts.tax.service.gov.uk/ivy2"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("uk.gov.hmrc"          %  "sbt-auto-build"         % "3.21.0")
+addSbtPlugin("uk.gov.hmrc"          %  "sbt-auto-build"         % "3.22.0")
 addSbtPlugin("uk.gov.hmrc"          %  "sbt-distributables"     % "2.5.0")
 addSbtPlugin("org.playframework"    %  "sbt-plugin"             % "3.0.2")
 addSbtPlugin("org.scoverage"        %  "sbt-scoverage"          % "2.0.11")