Get rid of warnings

support-frontend/app/actions/CachedActionBuilder.scala

@@ -16,7 +16,7 @@ class CachedActionBuilder(
   implicit private val ec: ExecutionContext = executionContext
   private val maximumBrowserAge = 1.minute
 
-  override def invokeBlock[A](request: Request[A], block: (Request[A]) => Future[Result]): Future[Result] =
+  override def invokeBlock[A](request: Request[A], block: Request[A] => Future[Result]): Future[Result] =
     block(request).map(_.withHeaders(mergeHeader("Vary", cacheHeaders() ++ headers): _*))
 
   private def cacheHeaders(now: DateTime = DateTime.now): List[(String, String)] = {

support-frontend/app/actions/NoCacheActionBuilder.scala

@@ -11,7 +11,7 @@ class NoCacheActionBuilder(
 ) extends ActionBuilder[Request, AnyContent] {
   implicit private val ec: ExecutionContext = executionContext
 
-  override def invokeBlock[A](request: Request[A], block: (Request[A]) => Future[Result]): Future[Result] =
+  override def invokeBlock[A](request: Request[A], block: Request[A] => Future[Result]): Future[Result] =
     block(request).map(_.withHeaders(mergeHeader("Vary", List(CacheControl.noCache) ++ headers): _*))
 
 }

support-frontend/app/actions/PrivateActionBuilder.scala

@@ -18,6 +18,6 @@ class PrivateActionBuilder(
   override def composeAction[A](action: Action[A]): Action[A] =
     new CSRFAction(action, csrfConfig, addToken, checkToken)
 
-  override def invokeBlock[A](request: Request[A], block: (Request[A]) => Future[Result]): Future[Result] =
+  override def invokeBlock[A](request: Request[A], block: Request[A] => Future[Result]): Future[Result] =
     block(request).map(_.withHeaders(CacheControl.noCache))
 }

support-models/src/main/scala/com/gu/support/paperround/PaperRound.scala

@@ -15,7 +15,7 @@ trait PaperRoundAPI {
   def chargebands(): Future[ChargeBandsEndpoint.Response]
 }
 
-case class AgentId(val id: BigInt) extends AnyVal
+case class AgentId(id: BigInt) extends AnyVal
 
 object AgentId {
   implicit val encoder: Encoder[AgentId] = Encoder.encodeBigInt.contramap(_.id)

support-modules/acquisition-events/src/main/scala/com/gu/support/acquisitions/calculator/AnnualisedValueTwoCalculator.scala

@@ -152,7 +152,7 @@ object AnnualisedValueTwoCalculator {
       })
       .getOrElse(Left("No print options supplied"))
 
-  def getMargin(a: AcquisitionModel) =
+  private def getMargin(a: AcquisitionModel) =
     a.product match {
       case AcquisitionProduct.Contribution => getContributionMargin(a)
       case AcquisitionProduct.RecurringContribution => getRecurringMargin(a)

support-payment-api/src/main/scala/MyApplicationLoader.scala

@@ -30,10 +30,9 @@ class MyApplicationLoader extends ApplicationLoader with StrictLogging {
     try {
       new MyComponents(context).application
     } catch {
-      case err: Throwable => {
+      case err: Throwable =>
         logger.error("Could not start application", err)
         throw err
-      }
     }
   }
 }

support-payment-api/src/main/scala/model/stripe/StripeRequest.scala

@@ -82,7 +82,7 @@ object StripeJsonDecoder {
 
 // Private because it should only be constructed using the accompanying Decoder
 class NonEmptyString private (val value: String) extends AnyVal {
-  override def toString(): String = value
+  override def toString: String = value
 }
 
 object NonEmptyString {

support-payment-api/src/main/scala/services/ContributionsStoreService.scala

@@ -13,7 +13,7 @@ import model.{InitializationError, InitializationResult, SQSThreadPool}
 import services.ContributionsStoreQueueService.Message
 
 import java.time.LocalDateTime
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.Future
 import scala.util.control.NonFatal
 

support-payment-api/src/test/scala/backend/StripeBackendSpec.scala

@@ -33,10 +33,10 @@ import scala.concurrent.{ExecutionContext, Future}
 class StripeBackendFixture(implicit ec: ExecutionContext) extends MockitoSugar {
 
   // -- entities
-  val email = Json.fromString("[email protected]").as[NonEmptyString].toOption.get
-  val token = Json.fromString("token").as[NonEmptyString].toOption.get
+  val email: NonEmptyString = Json.fromString("[email protected]").as[NonEmptyString].toOption.get
+  val token: NonEmptyString = Json.fromString("token").as[NonEmptyString].toOption.get
   val recaptchaToken = "recaptchaToken"
-  val acquisitionData =
+  val acquisitionData: AcquisitionData =
     AcquisitionData(
       Some("platform"),
       None,
@@ -53,42 +53,43 @@ class StripeBackendFixture(implicit ec: ExecutionContext) extends MockitoSugar {
       None,
       Some("N1 9GU"),
     )
-  val stripePaymentData = StripePaymentData(email, Currency.USD, 12, None)
-  val legacyStripePaymentData = LegacyStripePaymentData(email, Currency.USD, 12, None, token)
-  val stripePublicKey = StripePublicKey("pk_test_FOOBAR")
-  val stripeChargeRequest = LegacyStripeChargeRequest(legacyStripePaymentData, acquisitionData, Some(stripePublicKey))
-  val createPaymentIntent =
+  val stripePaymentData: StripePaymentData = StripePaymentData(email, Currency.USD, 12, None)
+  val legacyStripePaymentData: LegacyStripePaymentData = LegacyStripePaymentData(email, Currency.USD, 12, None, token)
+  val stripePublicKey: StripePublicKey = StripePublicKey("pk_test_FOOBAR")
+  val stripeChargeRequest: LegacyStripeChargeRequest =
+    LegacyStripeChargeRequest(legacyStripePaymentData, acquisitionData, Some(stripePublicKey))
+  val createPaymentIntent: CreatePaymentIntent =
     CreatePaymentIntent(
       "payment-method-id",
       stripePaymentData,
       acquisitionData,
       Some(stripePublicKey),
       recaptchaToken,
     )
-  val confirmPaymentIntent =
+  val confirmPaymentIntent: ConfirmPaymentIntent =
     ConfirmPaymentIntent("id", stripePaymentData, acquisitionData, Some(stripePublicKey))
 
-  val countrySubdivisionCode = Some("NY")
-  val clientBrowserInfo = ClientBrowserInfo("", "", None, None, countrySubdivisionCode)
-  val stripeHookObject = StripeHookObject("id", "GBP")
-  val stripeHookData = StripeHookData(stripeHookObject)
-  val stripeHook = StripeRefundHook("id", PaymentStatus.Paid, stripeHookData)
-  val dbError = ContributionsStoreService.Error(new Exception("DB error response"))
+  val countrySubdivisionCode: Option[String] = Some("NY")
+  val clientBrowserInfo: ClientBrowserInfo = ClientBrowserInfo("", "", None, None, countrySubdivisionCode)
+  val stripeHookObject: StripeHookObject = StripeHookObject("id", "GBP")
+  val stripeHookData: StripeHookData = StripeHookData(stripeHookObject)
+  val stripeHook: StripeRefundHook = StripeRefundHook("id", PaymentStatus.Paid, stripeHookData)
+  val dbError: ContributionsStoreService.Error = ContributionsStoreService.Error(new Exception("DB error response"))
 
-  val identityError = IdentityClient.ContextualError(
+  val identityError: IdentityClient.ContextualError = IdentityClient.ContextualError(
     IdentityClient.Error.fromThrowable(new Exception("Identity error response")),
     IdentityClient.GetUser("[email protected]"),
   )
   val stripeDisabledErrorText = "Stripe payments are currently disabled"
-  val paymentError = PaypalApiError.fromString("Error response")
-  val stripeApiError = StripeApiError.fromThrowable(new Exception("Stripe error"), None)
-  val backendError = BackendError.fromStripeApiError(stripeApiError)
+  val paymentError: PaypalApiError = PaypalApiError.fromString("Error response")
+  val stripeApiError: StripeApiError = StripeApiError.fromThrowable(new Exception("Stripe error"), None)
+  val backendError: BackendError = BackendError.fromStripeApiError(stripeApiError)
   val emailError: EmailService.Error = EmailService.Error(new Exception("Email error response"))
 
   // -- mocks
   val chargeMock: Charge = mock[Charge]
-  val eventMock = mock[Event]
-  val paymentIntentMock = mock[PaymentIntent]
+  val eventMock: Event = mock[Event]
+  val paymentIntentMock: PaymentIntent = mock[PaymentIntent]
 
   // -- service responses
   val paymentServiceResponse: EitherT[Future, StripeApiError, Charge] =
@@ -250,8 +251,9 @@ class StripeBackendSpec
 
     "a request is made to create a Payment Intent" should {
       "return Stripe payments are currently disabled response  if stripe checkout switch is off in support-admin-console" in new StripeBackendFixture {
-        val stripePaymentDataWithStripe = StripePaymentData(email, Currency.USD, 12, Some(StripeCheckout))
-        val createPaymentIntentWithStripeCheckout =
+        val stripePaymentDataWithStripe: StripePaymentData =
+          StripePaymentData(email, Currency.USD, 12, Some(StripeCheckout))
+        val createPaymentIntentWithStripeCheckout: CreatePaymentIntent =
           CreatePaymentIntent(
             "payment-method-id",
             stripePaymentDataWithStripe,
@@ -266,8 +268,9 @@ class StripeBackendSpec
       }
 
       "return Stripe payments are currently disabled response  if stripe Apple Pay switch is off in support-admin-console" in new StripeBackendFixture {
-        val stripePaymentDataWithApplePay = StripePaymentData(email, Currency.USD, 12, Some(StripeApplePay))
-        val createPaymentIntentWithStripeApplePay =
+        val stripePaymentDataWithApplePay: StripePaymentData =
+          StripePaymentData(email, Currency.USD, 12, Some(StripeApplePay))
+        val createPaymentIntentWithStripeApplePay: CreatePaymentIntent =
           CreatePaymentIntent(
             "payment-method-id",
             stripePaymentDataWithApplePay,
@@ -281,9 +284,9 @@ class StripeBackendSpec
           StripeApiError.fromString(stripeDisabledErrorText, None)
       }
       "return Stripe payments are currently disabled response  if stripe payment request button switch is off in support-admin-console" in new StripeBackendFixture {
-        val stripePaymentDataWithStripePaymentRequest =
+        val stripePaymentDataWithStripePaymentRequest: StripePaymentData =
           StripePaymentData(email, Currency.USD, 12, Some(StripePaymentRequestButton))
-        val createPaymentIntentWithStripePaymentRequest =
+        val createPaymentIntentWithStripePaymentRequest: CreatePaymentIntent =
           CreatePaymentIntent(
             "payment-method-id",
             stripePaymentDataWithStripePaymentRequest,
@@ -299,8 +302,9 @@ class StripeBackendSpec
           StripeApiError.fromString(stripeDisabledErrorText, None)
       }
       "return Success if stripe checkout switch is On in support-admin-console" in new StripeBackendFixture {
-        val stripePaymentDataWithStripe = StripePaymentData(email, Currency.USD, 12, Some(StripeCheckout))
-        val createPaymentIntentWithStripeCheckout =
+        val stripePaymentDataWithStripe: StripePaymentData =
+          StripePaymentData(email, Currency.USD, 12, Some(StripeCheckout))
+        val createPaymentIntentWithStripeCheckout: CreatePaymentIntent =
           CreatePaymentIntent(
             "payment-method-id",
             stripePaymentDataWithStripe,
@@ -331,8 +335,9 @@ class StripeBackendSpec
       }
 
       "return Success if stripe apple pay switch is On in support-admin-console" in new StripeBackendFixture {
-        val stripePaymentDataWithStripeApplePay = StripePaymentData(email, Currency.USD, 12, Some(StripeApplePay))
-        val createPaymentIntentWithStripeApplePay =
+        val stripePaymentDataWithStripeApplePay: StripePaymentData =
+          StripePaymentData(email, Currency.USD, 12, Some(StripeApplePay))
+        val createPaymentIntentWithStripeApplePay: CreatePaymentIntent =
           CreatePaymentIntent(
             "payment-method-id",
             stripePaymentDataWithStripeApplePay,
@@ -361,9 +366,9 @@ class StripeBackendSpec
           StripePaymentIntentsApiResponse.Success()
       }
       "return Success if stripe payment request button  switch is On in support-admin-console" in new StripeBackendFixture {
-        val stripePaymentDataWithStripePaymentRequest =
+        val stripePaymentDataWithStripePaymentRequest: StripePaymentData =
           StripePaymentData(email, Currency.USD, 12, Some(StripePaymentRequestButton))
-        val createPaymentIntentWithStripePaymentRequest =
+        val createPaymentIntentWithStripePaymentRequest: CreatePaymentIntent =
           CreatePaymentIntent(
             "payment-method-id",
             stripePaymentDataWithStripePaymentRequest,
@@ -398,9 +403,10 @@ class StripeBackendSpec
     "a request is made to create a charge/payment" should {
 
       "return error if the email address is invalid due to a comma in it" in new StripeBackendFixture {
-        val emailWithComma = Json.fromString("email,[email protected]").as[NonEmptyString].toOption.get
-        val stripePaymentDataWithStripe = StripePaymentData(emailWithComma, Currency.USD, 12, Some(StripeCheckout))
-        val createPaymentIntentWithStripeCheckout =
+        val emailWithComma: NonEmptyString = Json.fromString("email,[email protected]").as[NonEmptyString].toOption.get
+        val stripePaymentDataWithStripe: StripePaymentData =
+          StripePaymentData(emailWithComma, Currency.USD, 12, Some(StripeCheckout))
+        val createPaymentIntentWithStripeCheckout: CreatePaymentIntent =
           CreatePaymentIntent(
             "payment-method-id",
             stripePaymentDataWithStripe,
@@ -491,8 +497,9 @@ class StripeBackendSpec
         when(mockSoftOptInsService.sendMessage(any(), any())(any())).thenReturn(softOptInsResponse)
         when(mockAcquisitionsEventBusService.putAcquisitionEvent(any()))
           .thenReturn(acquisitionsEventBusResponse)
-        val trackContribution = PrivateMethod[Future[List[BackendError]]](Symbol("trackContribution"))
-        val result =
+        val trackContribution: PrivateMethod[Future[List[BackendError]]] =
+          PrivateMethod[Future[List[BackendError]]](Symbol("trackContribution"))
+        val result: Future[List[BackendError]] =
           stripeBackend invokePrivate trackContribution(chargeMock, stripeChargeRequest, None, clientBrowserInfo)
         result.futureValue mustBe List(BackendError.Database(dbError))
 
@@ -508,10 +515,11 @@ class StripeBackendSpec
         when(mockSoftOptInsService.sendMessage(any(), any())(any())).thenReturn(softOptInsResponse)
         when(mockAcquisitionsEventBusService.putAcquisitionEvent(any()))
           .thenReturn(acquisitionsEventBusResponseError)
-        val trackContribution = PrivateMethod[Future[List[BackendError]]](Symbol("trackContribution"))
-        val result =
+        val trackContribution: PrivateMethod[Future[List[BackendError]]] =
+          PrivateMethod[Future[List[BackendError]]](Symbol("trackContribution"))
+        val result: Future[List[BackendError]] =
           stripeBackend invokePrivate trackContribution(chargeMock, stripeChargeRequest, None, clientBrowserInfo)
-        val error = List(
+        val error: List[BackendError] = List(
           BackendError.AcquisitionsEventBusError(acquisitionsEventBusErrorMessage),
           BackendError.Database(dbError),
         )

support-payment-api/src/test/scala/controllers/PaypalControllerSpec.scala

@@ -96,13 +96,13 @@ class PaypalControllerSpec extends AnyWordSpec with Status with Matchers {
   implicit val materializer: Materializer = ActorMaterializer()
   implicit val executionContext: ExecutionContext = ExecutionContext.global
 
-  val context = ApplicationLoader.Context.create(Environment.simple())
+  val context: ApplicationLoader.Context = ApplicationLoader.Context.create(Environment.simple())
 
   "Paypal Controller" when {
 
     "a request is made to create a payment" should {
 
-      val fixtureFor200Response = new PaypalControllerFixture()(executionContext, context) {
+      val fixtureFor200Response: PaypalControllerFixture = new PaypalControllerFixture()(executionContext, context) {
         val link = new Links("http://return-url.com", "approval_url")
         val links: java.util.List[Links] = List(link).asJava
         when(enrichedPaymentMock.payment)
@@ -188,7 +188,7 @@ class PaypalControllerSpec extends AnyWordSpec with Status with Matchers {
       }
 
       "return a 500 response if the response contains an invalid return url" in {
-        val fixture = new PaypalControllerFixture()(executionContext, context) {
+        val fixture: PaypalControllerFixture = new PaypalControllerFixture()(executionContext, context) {
 
           import scala.jdk.CollectionConverters._
 

support-payment-api/src/test/scala/controllers/StripeControllerSpec.scala

@@ -105,7 +105,7 @@ class StripeControllerSpec extends AnyWordSpec with Status with Matchers {
   implicit val materializer: Materializer = ActorMaterializer()
   implicit val executionContext: ExecutionContext = ExecutionContext.global
 
-  val context = ApplicationLoader.Context.create(Environment.simple())
+  val context: ApplicationLoader.Context = ApplicationLoader.Context.create(Environment.simple())
 
   "StripeController" when {
 

support-payment-api/src/test/scala/services/ContributionsStoreServiceSpec.scala

@@ -1,8 +1,9 @@
 package services
 
+import io.circe.Json
+
 import java.time.LocalDateTime
 import java.util.UUID
-
 import model.{Currency, PaymentProvider, PaymentStatus}
 import model.db.ContributionData
 import services.ContributionsStoreQueueService.NewContributionData
@@ -12,9 +13,9 @@ import org.scalatest.matchers.must.Matchers
 
 class ContributionsStoreServiceSpec extends AnyFlatSpec with Matchers {
 
-  val uuid = UUID.randomUUID()
+  val uuid: UUID = UUID.randomUUID()
 
-  val contributionData = ContributionData(
+  val contributionData: ContributionData = ContributionData(
     paymentProvider = PaymentProvider.Paypal,
     paymentStatus = PaymentStatus.Paid,
     paymentId = "paymentId",
@@ -29,7 +30,7 @@ class ContributionsStoreServiceSpec extends AnyFlatSpec with Matchers {
     postalCode = Some("N1 9GU"),
   )
 
-  val expectedJson = parse(
+  val expectedJson: Json = parse(
     s"""|{
       |  "newContributionData" : {
       |    "paymentProvider" : "Paypal",