Fix some compilation errors

admin/app/controllers/admin/TroubleshooterController.scala

@@ -11,7 +11,7 @@ import play.api.libs.ws.WSClient
 import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import tools.LoadBalancer
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.util.Random

admin/app/dfp/DfpApi.scala

@@ -31,7 +31,9 @@ class DfpApi(dataMapper: DataMapper, dataValidation: DataValidation) extends GuL
     // item, potentially making one API call per lineitem.
     val validatedLineItems = lineItems
       .groupBy(Function.tupled(dataValidation.isGuLineItemValid))
+      .view
       .mapValues(_.map(_._1))
+      .toMap
 
     DfpLineItems(
       validItems = validatedLineItems.getOrElse(true, Nil),

admin/app/jobs/AnalyticsSanityCheckJob.scala

@@ -9,7 +9,7 @@ import model.diagnostics.CloudWatch
 import java.time.{LocalDateTime, ZoneId}
 import services.{CloudWatchStats, OphanApi}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.{ExecutionContext, Future}
 
 class AnalyticsSanityCheckJob(ophanApi: OphanApi) extends GuLogging {

admin/app/model/abtests/AbTestJob.scala

@@ -4,7 +4,7 @@ import common.GuLogging
 import tools.CloudWatch
 import views.support.CamelCase
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.ExecutionContext
 
 object AbTestJob extends GuLogging {

admin/app/services/EmailService.scala

@@ -8,7 +8,7 @@ import com.amazonaws.services.simpleemail.model.{Destination => EmailDestination
 import common.{AkkaAsync, GuLogging}
 import conf.Configuration.aws.mandatoryCredentials
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.duration._
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.util.control.NonFatal

admin/app/tools/AssetMetrics.scala

@@ -6,7 +6,7 @@ import common.{Box, GuLogging}
 import org.joda.time.DateTime
 import tools.CloudWatch._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.{ExecutionContext, Future}
 import scala.math.BigDecimal
 import scala.util.control.NonFatal

admin/app/tools/CloudWatch.scala

@@ -12,7 +12,7 @@ import conf.Configuration
 import conf.Configuration._
 import org.joda.time.DateTime
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.{ExecutionContext, Future}
 
 case class MaximumMetric(metric: GetMetricStatisticsResult) {

admin/app/tools/LoadBalancer.scala

@@ -3,7 +3,7 @@ package tools
 import common.{Box, GuLogging}
 import com.amazonaws.services.elasticloadbalancing.AmazonElasticLoadBalancingClient
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class LoadBalancer(
     id: String,

admin/app/tools/charts/charts.scala

@@ -7,7 +7,7 @@ import common.editions.Uk
 import org.joda.time.{DateTime, DateTimeZone}
 import play.api.libs.json._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.mutable.{Map => MutableMap}
 
 case class ChartRow[K](rowKey: K, values: Seq[Double])

applications/test/GalleryTemplateTest.scala

@@ -5,7 +5,7 @@ import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.DoNotDiscover
 import org.scalatest.matchers.should.Matchers
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @DoNotDiscover class GalleryTemplateTest extends AnyFlatSpec with Matchers with ConfiguredTestSuite {
 

applications/test/IndexFeatureTest.scala

@@ -5,7 +5,7 @@ import org.scalatest._
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalatest.matchers.should.Matchers
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @DoNotDiscover class IndexFeatureTest extends AnyFeatureSpec with GivenWhenThen with Matchers with ConfiguredTestSuite {
 

applications/test/InteractiveTemplateTest.scala

@@ -4,7 +4,7 @@ import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.DoNotDiscover
 import org.scalatest.matchers.should.Matchers
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @DoNotDiscover class InteractiveTemplateTest extends AnyFlatSpec with Matchers with ConfiguredTestSuite {
 

applications/test/SectionTemplateTest.scala

@@ -7,7 +7,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.DoNotDiscover
 import play.api.test.TestBrowser
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 @DoNotDiscover class SectionTemplateTest extends AnyFlatSpec with Matchers with ConfiguredTestSuite {
 

article/app/services/dotcomponents/ArticlePicker.scala

@@ -63,7 +63,7 @@ object ArticlePicker {
     val pageTones = page.article.tags.tones.map(_.id).mkString(", ")
 
     // include features that we wish to log but not allow-list against
-    val features = checks.mapValues(_.toString) +
+    val features = checks.view.mapValues(_.toString).toMap +
       ("isArticle100PercentPage" -> isArticle100PercentPage.toString) +
       ("dcrCouldRender" -> dcrCanRender.toString) +
       ("pageTones" -> pageTones)

article/app/topics/TopicS3Client.scala

@@ -11,7 +11,7 @@ import services.S3
 import topics.S3ObjectImplicits.RichS3Object
 import model.TopicsApiResponse._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.Future
 import scala.util.{Failure, Success, Try}
 

build.sbt

@@ -35,6 +35,7 @@ val common = library("common")
       rome,
       romeModules,
       scalaCheck,
+      scalaCollectionPlus,
       nScalaTime,
       ws,
       faciaFapiScalaClient,

commercial/app/model/hosted/HostedAmp.scala

@@ -3,7 +3,7 @@ package model.hosted
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object HostedAmp {
 

common/app/common/Assets/DiscussionAssets.scala

@@ -106,7 +106,7 @@ object DiscussionAssetsMap {
   private lazy val agent = Box[Map[String, String]](Map.empty)
 
   def alter(map: Map[String, String], baseURI: URI): Future[Map[String, String]] = {
-    agent.alter(map.mapValues(value => baseURI.resolve(value).toString))
+    agent.alter(map.view.mapValues(value => baseURI.resolve(value).toString).toMap)
   }
 
   def getURL(assetName: String): String = {

common/app/common/GuLogging.scala

@@ -5,7 +5,7 @@ import play.api.Logger
 import org.apache.commons.lang.exception.ExceptionUtils
 import net.logstash.logback.marker.LogstashMarker
 import net.logstash.logback.marker.Markers._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.concurrent.{ExecutionContext, Future}
 import scala.language.implicitConversions
 import scala.util.{Failure, Success, Try}

common/app/common/InlineStyles.scala

@@ -9,7 +9,7 @@ import org.w3c.css.sac.InputSource
 import org.w3c.dom.css.{CSSRuleList, CSSRule => W3CSSRule}
 import play.twirl.api.Html
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.immutable.ListMap
 import scala.util.{Failure, Success}
 
@@ -38,7 +38,10 @@ object CSSRule {
       selectors <- rule.headOption
       styles <- rule.lift(1)
     } yield {
-      selectors.split(",").map(selector => CSSRule(selector.trim, styleMapFromString(styles.stripSuffix("}").trim)))
+      selectors
+        .split(",")
+        .map(selector => CSSRule(selector.trim, styleMapFromString(styles.stripSuffix("}").trim)))
+        .toIndexedSeq
     }
   }
 

common/app/common/LinkTo.scala

@@ -1,14 +1,12 @@
 package common
 
-import common.editions.{Au, International, Us}
 import conf.Configuration
 import layout.ContentCard
 import model.Trail
 import org.jsoup.Jsoup
-import play.api.libs.json.Json
 import play.api.mvc.{AnyContent, Request, RequestHeader, Result}
 import play.twirl.api.Html
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /*
  * Builds absolute links to the core site (www.theguardian.com)

common/app/common/Properties.scala

@@ -2,7 +2,7 @@ package common
 
 import java.io.{File, FileInputStream, InputStream}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.net.URL
 import java.nio.charset.Charset
 

common/app/common/QueryParams.scala

@@ -3,7 +3,7 @@ package common
 object QueryParams extends implicits.Strings {
   def get(enc: String): Map[String, Seq[String]] = {
     val params = enc.dropWhile(_ != '?').dropWhile(_ == '?')
-    val pairs: Seq[(String, String)] = params.split('&').flatMap {
+    val pairs: Seq[(String, String)] = params.split('&').toIndexedSeq.flatMap {
       _.split('=') match {
         case Array(key, value)       => List((key.stringDecoded, value.stringDecoded))
         case Array(key) if key != "" => List((key.stringDecoded, ""))

common/app/common/RequestLogger.scala

@@ -34,8 +34,8 @@ case class RequestLoggerFields(request: Option[RequestHeader], response: Option[
       }
       .getOrElse(Map.empty[String, String])
 
-    val allowListedHeaders = allHeadersFields.filterKeys(allowListedHeaderNames.contains)
-    val guardianSpecificHeaders = allHeadersFields.filterKeys(_.toUpperCase.startsWith("X-GU-"))
+    val allowListedHeaders = allHeadersFields.view.filterKeys(allowListedHeaderNames.contains).toMap
+    val guardianSpecificHeaders = allHeadersFields.view.filterKeys(_.toUpperCase.startsWith("X-GU-")).toMap
 
     (allowListedHeaders ++ guardianSpecificHeaders).toList.map {
       case (headerName, headerValue) =>

common/app/common/SQSQueues.scala

@@ -7,7 +7,7 @@ import com.amazonaws.services.sqs.AmazonSQSAsync
 import com.amazonaws.services.sqs.model.{Message => AWSMessage, _}
 import play.api.libs.json.{Json, Reads, Writes}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.mutable
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.util.{Failure, Success}
@@ -88,7 +88,7 @@ case class TextMessageQueue[A](client: AmazonSQSAsync, queueUrl: String)(implici
 
   def receive(request: ReceiveMessageRequest): Future[Seq[Message[String]]] = {
     receiveMessages(request) map { messages =>
-      messages map { message =>
+      messages.toSeq map { message =>
         Message(
           MessageId(message.getMessageId),
           message.getBody,
@@ -121,7 +121,7 @@ case class JsonMessageQueue[A](client: AmazonSQSAsync, queueUrl: String)(implici
 
   def receive(request: ReceiveMessageRequest)(implicit reads: Reads[A]): Future[Seq[Message[A]]] = {
     receiveMessages(request) map { messages =>
-      messages map { message =>
+      messages.toSeq map { message =>
         Message(
           MessageId(message.getMessageId),
           Json.fromJson[A](Json.parse(message.getBody)) getOrElse {

common/app/common/Seqs.scala

@@ -2,7 +2,7 @@ package common
 
 object Seqs {
   implicit class RichSeq[A](as: Seq[A]) {
-    def frequencies: Map[A, Int] = as.groupBy(identity).mapValues(_.length)
+    def frequencies: Map[A, Int] = as.groupBy(identity).view.mapValues(_.length).toMap
 
     def isDescending(implicit ordering: Ordering[A]): Boolean = as == reverseSorted
 

common/app/common/ShowcaseRSSModules.scala

@@ -11,7 +11,7 @@ import org.joda.time.DateTime
 import org.joda.time.format.ISODateTimeFormat
 
 import java.util
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait RssAtomModule extends com.sun.syndication.feed.module.Module with Serializable with Cloneable {
   override def getUri: String = RssAtomModule.URI
@@ -28,7 +28,7 @@ class RssAtomModuleImpl extends RssAtomModule {
 
   override def getInterface: Class[_] = classOf[RssAtomModule]
 
-  override def clone: Object = {
+  override def clone(): Object = {
     val module = new RssAtomModuleImpl
     module.copyFrom(this)
     module

common/app/common/StringEncodings.scala

@@ -16,7 +16,7 @@ object StringEncodings {
     */
   def jsonToJS(json: String): String =
     json
-      .replaceAll("""\u2028""", """\\u2028""")
-      .replaceAll("""\u2029""", """\\u2029""")
+      .replaceAll("\u2028", """\\u2028""")
+      .replaceAll("\u2029", """\\u2029""")
 
 }

common/app/common/TrailsToRss.scala

@@ -17,7 +17,7 @@ import java.io.StringWriter
 import java.text.SimpleDateFormat
 import java.util.regex.Pattern
 import java.util.{Date, TimeZone}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object RssDates {
   def getYear(date: Date): String = {

common/app/common/TrailsToShowcase.scala

@@ -14,7 +14,7 @@ import play.api.mvc.RequestHeader
 
 import java.io.StringWriter
 import java.util.Date
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.immutable.WrappedString
 
 object TrailsToShowcase {
@@ -109,8 +109,10 @@ object TrailsToShowcase {
       .flatMap(_.curated)
       .map(_.card.id)
       .groupBy(identity)
+      .view
       .mapValues(_.size)
       .filter(_._2 > 1)
+      .toMap
 
     val singleStoryPanelsOutcome = if (singleStoryCollections.nonEmpty) {
       // Attempt to map all trails from all single story collections to panels
@@ -316,7 +318,7 @@ object TrailsToShowcase {
         title <- proposedArticleTitle.toOption
         guid <- guidFor(contentItem)
         webUrl <- webUrl(contentItem)
-        imageUrl <- proposedArticleImage.right.toOption
+        imageUrl <- proposedArticleImage.toOption
         maybeOverline <- proposedOverline.toOption
       } yield {
         val lastModified = contentItem.card.lastModifiedOption.getOrElse(webPublicationDate)
@@ -505,7 +507,7 @@ object TrailsToShowcase {
   }
 
   private def extractBulletsFrom(trailText: String): Either[Seq[String], BulletList] = {
-    val lines = new WrappedString(trailText).lines.toSeq
+    val lines = new WrappedString(trailText).inits.map(_.toString()).toSeq
 
     val proposedBulletTexts = lines
       .map(_.stripLeading)

common/app/common/commercial/PrebidIndexSite.scala

@@ -267,8 +267,7 @@ object PrebidIndexSite {
       "world" -> PrebidIndexSite(Desktop, 204985),
       "world" -> PrebidIndexSite(Mobile, 213473),
       "world" -> PrebidIndexSite(Tablet, 215408),
-    ).groupBy { case (section, _) => section }
-      .mapValues { _.map { case (_, site) => site }.toSet }
+    ).groupBy { case (section, _) => section }.view.mapValues { _.map { case (_, site) => site }.toSet }.toMap
 
   private def fromSectionId(sectionId: String): Option[Set[PrebidIndexSite]] = {
     val firstPart = {

common/app/common/commercial/hosted/ContentUtils.scala

@@ -30,7 +30,7 @@ object ContentUtils {
       val assets = elements.zipWithIndex flatMap {
         case (element, i) => ModelElement(element, i).images.allImages
       }
-      ImageMedia(assets)
+      ImageMedia(assets.toSeq)
     } getOrElse ImageMedia(Nil)
 
   def thumbnailUrl(item: Content): String =

common/app/common/commercial/hosted/HostedVideoPage.scala

@@ -55,7 +55,8 @@ object HostedVideoPage extends GuLogging {
           duration = video.duration.map(_.toInt) getOrElse 0,
           posterUrl = video.posterUrl getOrElse "",
           youtubeId = videoVariants.find(_.platform.toString.contains("Youtube")).map(_.id),
-          sources = videoVariants.flatMap(asset => asset.mimeType map (mimeType => Encoding(asset.id, mimeType))).sorted,
+          sources =
+            videoVariants.flatMap(asset => asset.mimeType map (mimeType => Encoding(asset.id, mimeType))).toSeq.sorted,
         ),
         cta = HostedCallToAction.fromAtom(ctaAtom),
         socialShareText = content.fields.flatMap(_.socialShareText),