Cleanup

guardian · Feb 6, 2024 · 2c3a5ba · 2c3a5ba
1 parent ea88194
commit 2c3a5ba
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/app/util/UploadDecorator.scala b/app/util/UploadDecorator.scala
@@ -8,7 +8,7 @@ import org.scanamo.syntax._
 import org.scanamo.generic.auto._
 
 class UploadDecorator(aws: DynamoAccess with UploadAccess, stepFunctions: StepFunctions) {
-  private val table = Table[Upload](cacheTableName)
+  private val table = Table[Upload](aws.cacheTableName)
 
   def addMetadata(atomId: String, video: ClientAsset): ClientAsset = {
     val id = s"$atomId-${video.id}"

diff --git a/common/src/main/scala/com/gu/media/Permissions.scala b/common/src/main/scala/com/gu/media/Permissions.scala
@@ -4,7 +4,6 @@ import com.amazonaws.auth.AWSCredentialsProvider
 import com.gu.permissions._
 import ai.x.play.json.Jsonx
 import ai.x.play.json.Encoders._
-import com.gu.media.Permissions.setVideosOnAllChannelsPublic
 import play.api.libs.json.Format
 import com.gu.pandomainauth.model.{User => PandaUser}
 import com.gu.permissions.PermissionDefinition

diff --git a/common/src/main/scala/com/gu/media/model/Asset.scala b/common/src/main/scala/com/gu/media/model/Asset.scala
@@ -1,9 +1,9 @@
 package com.gu.media.model
 
 import ai.x.play.json.Encoders.encoder
-import com.gu.contentatom.thrift.atom.media.{Asset => ThriftAsset}
 import ai.x.play.json.Jsonx
-import play.api.libs.json.{Format, OFormat}
+import com.gu.contentatom.thrift.atom.media.{Asset => ThriftAsset}
+import play.api.libs.json.Format
 
 case class Asset(assetType: AssetType,
                  version: Long,

diff --git a/common/src/main/scala/com/gu/media/model/ContentChangeDetails.scala b/common/src/main/scala/com/gu/media/model/ContentChangeDetails.scala
@@ -1,9 +1,9 @@
 package com.gu.media.model
 
 import ai.x.play.json.Encoders.encoder
-import com.gu.contentatom.thrift.{ContentChangeDetails => ThriftContentChangeDetails}
 import ai.x.play.json.Jsonx
-import play.api.libs.json.{Format, OFormat}
+import com.gu.contentatom.thrift.{ContentChangeDetails => ThriftContentChangeDetails}
+import play.api.libs.json.Format
 
 case class ContentChangeDetails(
   lastModified: Option[ChangeRecord],

diff --git a/common/src/main/scala/com/gu/media/model/Image.scala b/common/src/main/scala/com/gu/media/model/Image.scala
@@ -1,9 +1,9 @@
 package com.gu.media.model
 
 import ai.x.play.json.Encoders.encoder
-import com.gu.contentatom.thrift.{Image => ThriftImage, ImageAsset => ThriftImageAsset, ImageAssetDimensions => ThriftImageAssetDimensions}
 import ai.x.play.json.Jsonx
-import play.api.libs.json.{Format, OFormat}
+import com.gu.contentatom.thrift.{Image => ThriftImage, ImageAsset => ThriftImageAsset, ImageAssetDimensions => ThriftImageAssetDimensions}
+import play.api.libs.json.Format
 
 case class ImageAssetDimensions(height: Int, width: Int) {
   def asThrift = ThriftImageAssetDimensions(height, width)

diff --git a/common/src/main/scala/com/gu/media/model/MediaAtom.scala b/common/src/main/scala/com/gu/media/model/MediaAtom.scala
@@ -1,12 +1,12 @@
 package com.gu.media.model
 
+import ai.x.play.json.Encoders._
+import ai.x.play.json.Jsonx
 import com.gu.contentatom.thrift.atom.media.{MediaAtom => ThriftMediaAtom, Metadata => ThriftMetadata, YoutubeData => ThriftYoutubeData}
-import play.api.libs.json.{Format, OFormat}
 import com.gu.contentatom.thrift.{AtomData, Atom => ThriftAtom, AtomType => ThriftAtomType, Flags => ThriftFlags}
 import com.gu.media.util.MediaAtomImplicits
 import com.gu.media.youtube.{MediaAtomYoutubeDescriptionHandler, YoutubeDescription}
-import ai.x.play.json.Jsonx
-import ai.x.play.json.Encoders._
+import play.api.libs.json.Format
 
 abstract class MediaAtomBase {
   //generic metadata