Use scala.jdk.CollectionConverters

guardian · Jan 31, 2024 · e71c657 · e71c657
1 parent 08d803e
commit e71c657
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/app/controllers/Api.scala b/app/controllers/Api.scala
@@ -18,7 +18,7 @@ import play.api.libs.json._
 import play.api.mvc._
 
 import scala.concurrent.Future
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class Api(
   override val stores: DataStores,

diff --git a/app/model/YouTubeMessage.scala b/app/model/YouTubeMessage.scala
@@ -3,7 +3,7 @@ package model
 import com.gu.media.logging.Logging
 import net.logstash.logback.marker.Markers
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class YouTubeMessage(atomId: String, videoId: String, reason: String, message: String, isError: Boolean = false) extends Logging {
 

diff --git a/app/model/commands/CommandException.scala b/app/model/commands/CommandException.scala
@@ -4,7 +4,7 @@ import com.google.api.client.googleapis.json.{GoogleJsonError, GoogleJsonRespons
 import com.google.api.client.http.{HttpHeaders, HttpResponseException}
 import com.gu.media.logging.Logging
 import play.api.mvc.{Result, Results}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class CommandException(msg: String, responseCode: Int) extends RuntimeException(msg)
 

diff --git a/app/model/commands/DeleteAssetCommand.scala b/app/model/commands/DeleteAssetCommand.scala
@@ -8,7 +8,7 @@ import data.DataStores
 import model.commands.CommandExceptions._
 import net.logstash.logback.marker.{LogstashMarker, Markers}
 import util.AWSConfig
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class DeleteAssetCommand(
   atomId: String,

diff --git a/app/util/AWS.scala b/app/util/AWS.scala
@@ -8,7 +8,7 @@ import com.gu.media.aws._
 import com.gu.media.logging.{Logging}
 import com.typesafe.config.Config
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class AWSConfig(override val config: Config, override val credentials: AwsCredentials)
   extends Settings

diff --git a/app/util/PlutoMessageConsumer.scala b/app/util/PlutoMessageConsumer.scala
@@ -8,7 +8,7 @@ import com.amazonaws.services.sqs.model.{DeleteMessageRequest, ReceiveMessageReq
 import scala.concurrent.ExecutionContext
 import com.gu.media.logging.Logging
 import data.DataStores
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import play.api.libs.json._
 
 case class PlutoMessageConsumer(val stores: DataStores, awsConfig: AWSConfig)

diff --git a/app/util/StepFunctions.scala b/app/util/StepFunctions.scala
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.core.JsonParseException
 import com.gu.media.upload.model._
 import play.api.libs.json.{JsResultException, Json}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class StepFunctions(awsConfig: AWSConfig) {
   def getById(id: String): Option[Upload] = {

diff --git a/app/util/Transcoder.scala b/app/util/Transcoder.scala
@@ -3,7 +3,7 @@ package util
 import com.amazonaws.services.elastictranscoder.model.ListJobsByPipelineRequest
 import model.transcoder.JobStatus
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.time.Duration
 
 class Transcoder(awsConfig: AWSConfig) {

diff --git a/common/src/main/scala/com/gu/media/Settings.scala b/common/src/main/scala/com/gu/media/Settings.scala
@@ -1,7 +1,7 @@
 package com.gu.media
 
 import com.typesafe.config.Config
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait Settings {
   def config: Config

diff --git a/common/src/main/scala/com/gu/media/aws/UploadAccess.scala b/common/src/main/scala/com/gu/media/aws/UploadAccess.scala
@@ -5,7 +5,7 @@ import com.amazonaws.services.stepfunctions.AWSStepFunctionsClientBuilder
 import com.amazonaws.services.stepfunctions.model.ListStateMachinesRequest
 import com.gu.media.Settings
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait UploadAccess { this: Settings with AwsAccess =>
   val userUploadBucket: String = getMandatoryString("aws.upload.bucket")

diff --git a/common/src/main/scala/com/gu/media/logging/YoutubeRequestLogger.scala b/common/src/main/scala/com/gu/media/logging/YoutubeRequestLogger.scala
@@ -4,7 +4,7 @@ import enumeratum.EnumEntry.Hyphencase
 import enumeratum.{Enum, EnumEntry}
 import net.logstash.logback.marker.{LogstashMarker, Markers}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 sealed trait YoutubeApiType extends EnumEntry with Hyphencase
 

diff --git a/common/src/main/scala/com/gu/media/model/AuditMessage.scala b/common/src/main/scala/com/gu/media/model/AuditMessage.scala
@@ -3,7 +3,7 @@ package com.gu.media.model;
 import com.gu.media.logging.Logging
 import net.logstash.logback.marker.Markers
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class AuditMessage(atomId: String, auditType: String, user: String, description: Option[String] = None) extends Logging{
 

diff --git a/common/src/main/scala/com/gu/media/util/MAMLogger.scala b/common/src/main/scala/com/gu/media/util/MAMLogger.scala
@@ -3,7 +3,7 @@ package com.gu.media.util
 import com.gu.media.logging.Logging
 import net.logstash.logback.marker.Markers
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object MAMLogger extends Logging {
   private def atomIdMarker(atomId: String) = Map("atomId" -> atomId)

diff --git a/common/src/main/scala/com/gu/media/youtube/YouTubeAccess.scala b/common/src/main/scala/com/gu/media/youtube/YouTubeAccess.scala
@@ -10,7 +10,7 @@ import com.gu.media.logging.{Logging, YoutubeApiType, YoutubeRequestLogger, Yout
 import net.logstash.logback.marker.{LogstashMarker, Markers}
 
 import java.io.FileInputStream
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait YouTubeAccess extends Settings with Logging {
   def appName: String = getMandatoryString("name")

diff --git a/common/src/main/scala/com/gu/media/youtube/YouTubePartnerApi.scala b/common/src/main/scala/com/gu/media/youtube/YouTubePartnerApi.scala
@@ -8,7 +8,7 @@ import com.gu.media.logging.{Logging, YoutubeApiType, YoutubeRequestLogger, Yout
 import com.gu.media.model.{AdSettings, VideoUpdateError}
 import com.gu.media.util.MAMLogger
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 //This class contains functionality to add usage policies to published videos.
 //Videos are either tracked or monetized: https://support.google.com/youtube/answer/107383?hl=en-GB

diff --git a/common/src/main/scala/com/gu/media/youtube/YouTubeVideos.scala b/common/src/main/scala/com/gu/media/youtube/YouTubeVideos.scala
@@ -9,7 +9,7 @@ import com.gu.media.model.VideoUpdateError
 import com.gu.media.util.ISO8601Duration
 import com.gu.media.logging.{YoutubeApiType, YoutubeRequestLogger, YoutubeRequestType}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait YouTubeVideos { this: YouTubeAccess with Logging =>
   def getVideo(youtubeId: String, part: String): Option[Video] = {

diff --git a/common/src/main/scala/com/gu/media/youtube/package.scala b/common/src/main/scala/com/gu/media/youtube/package.scala
@@ -7,7 +7,7 @@ import com.gu.media.util.ISO8601Duration
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import org.joda.time.DateTime
 import com.gu.media.util.JsonDate._
 

diff --git a/uploader/src/main/scala/com/gu/media/upload/CompleteMultipartCopy.scala b/uploader/src/main/scala/com/gu/media/upload/CompleteMultipartCopy.scala
@@ -7,7 +7,7 @@ import com.gu.media.logging.Logging
 import com.gu.media.upload.model.{CopyETag, CopyProgress, Upload}
 
 import scala.util.control.NonFatal
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class CompleteMultipartCopy extends LambdaWithParams[Upload, Upload] with S3Access with Logging {
   override def handle(upload: Upload) = {

diff --git a/uploader/src/main/scala/com/gu/media/upload/GetTranscodingProgress.scala b/uploader/src/main/scala/com/gu/media/upload/GetTranscodingProgress.scala
@@ -6,7 +6,7 @@ import com.gu.media.lambda.LambdaWithParams
 import com.gu.media.logging.Logging
 import com.gu.media.upload.model.{SelfHostedUploadMetadata, Upload}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class GetTranscodingProgress extends LambdaWithParams[Upload, Upload] with ElasticTranscodeAccess with Logging {
   override def handle(upload: Upload): Upload = {