From c4aa0d21ba58fc992f54db95e46f568154886960 Mon Sep 17 00:00:00 2001 From: Georges Lebreton <102960844+Georges-GNM@users.noreply.github.com> Date: Tue, 19 Nov 2024 15:27:07 +0000 Subject: [PATCH] tidy code (deleting unused imports, whitespace changes, etc.) --- .../scala/com/gu/facia/client/models/Collection.scala | 1 - .../com/gu/facia/api/utils/ResolvedMetaData.scala | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/facia-json/src/main/scala/com/gu/facia/client/models/Collection.scala b/facia-json/src/main/scala/com/gu/facia/client/models/Collection.scala index 9d47c245..b541f18e 100644 --- a/facia-json/src/main/scala/com/gu/facia/client/models/Collection.scala +++ b/facia-json/src/main/scala/com/gu/facia/client/models/Collection.scala @@ -55,7 +55,6 @@ sealed trait MetaDataCommonFields { lazy val hideShowMore: Option[Boolean] = json.get("hideShowMore").flatMap(_.asOpt[Boolean]) lazy val atomId: Option[String] = json.get("atomId").flatMap(_.asOpt[String]) lazy val blockId: Option[String] = json.get("blockId").flatMap(_.asOpt[String]) - lazy val aspectRatio: Option[String] = json.get("aspectRatio").flatMap(_.asOpt[String]) } object SupportingItemMetaData { diff --git a/fapi-client/src/main/scala/com/gu/facia/api/utils/ResolvedMetaData.scala b/fapi-client/src/main/scala/com/gu/facia/api/utils/ResolvedMetaData.scala index 50e4e3c1..6e302490 100644 --- a/fapi-client/src/main/scala/com/gu/facia/api/utils/ResolvedMetaData.scala +++ b/fapi-client/src/main/scala/com/gu/facia/api/utils/ResolvedMetaData.scala @@ -1,11 +1,8 @@ package com.gu.facia.api.utils -import com.fasterxml.jackson.databind.`type`.CollectionType import com.gu.facia.client.models.MetaDataCommonFields import play.api.libs.json.{Format, Json} import com.gu.contentapi.client.model.v1.{Content, Element, ElementType} -import com.gu.facia.api.models.CollectionConfig - sealed trait BoostLevel { def label: String @@ -63,8 +60,7 @@ object ResolvedMetaData { showByline = false, imageCutoutReplace = false, showQuotedHeadline = false, - imageSlideshowReplace = false - ) + imageSlideshowReplace = false) def fromTrailMetaData(trailMeta: MetaDataCommonFields): ResolvedMetaData = ResolvedMetaData( @@ -115,7 +111,7 @@ object ResolvedMetaData { showQuotedHeadline = trailMeta.showQuotedHeadline.getOrElse(metaDataFromContent.showQuotedHeadline), imageSlideshowReplace = trailMeta.imageSlideshowReplace.getOrElse(metaDataFromContent.imageSlideshowReplace))} - def toMap(resolvedMetaData: ResolvedMetaData, collectionConfig: CollectionConfig): Map[String, Boolean] = resolvedMetaData match { + def toMap(resolvedMetaData: ResolvedMetaData): Map[String, Boolean] = resolvedMetaData match { case ResolvedMetaData( isBreaking, isBoosted, @@ -150,8 +146,7 @@ object ResolvedMetaData { "showByline" -> showByline, "imageCutoutReplace" -> imageCutoutReplace, "showQuotedHeadline" -> showQuotedHeadline, - "imageSlideshowReplace" -> imageSlideshowReplace, - ) + "imageSlideshowReplace" -> imageSlideshowReplace) } }