Scala 2.13: Fix ambiguous overloaded JsonComponent method

admin/app/controllers/admin/CommercialController.scala

@@ -126,7 +126,7 @@ class CommercialController(
       val lineItems: Seq[GuLineItem] = Store.getDfpLineItemsReport().lineItems filter (_.orderId.toString == orderId)
 
       Cached(5.minutes) {
-        JsonComponent(Json.toJson(lineItems))
+        JsonComponent.fromWritable(lineItems)
       }
     }
 
@@ -144,7 +144,7 @@ class CommercialController(
         }) getOrElse Nil
 
       Cached(5.minutes) {
-        JsonComponent(Json.toJson(previewUrls))
+        JsonComponent.fromWritable(previewUrls)
       }
     }
 

admin/app/football/controllers/PlayerController.scala

@@ -152,7 +152,7 @@ class PlayerController(val wsClient: WSClient, val controllerComponents: Control
             ),
           ),
         )
-        Cached(600)(JsonComponent(responseJson))
+        Cached(600)(JsonComponent.fromWritable(responseJson))
       }
     }
 }

applications/app/controllers/GalleryController.scala

@@ -39,7 +39,7 @@ class GalleryController(contentApiClient: ContentApiClient, val controllerCompon
       val index = request.getIntParameter("index") getOrElse 1
       lookup(path, index, isTrail = false) map {
         case Right(other) => RenderOtherStatus(other)
-        case Left(model)  => Cached(model) { JsonComponent(model.gallery.lightbox.javascriptConfig) }
+        case Left(model)  => Cached(model) { JsonComponent.fromWritable(model.gallery.lightbox.javascriptConfig) }
       }
     }
 

applications/app/controllers/ImageContentController.scala

@@ -65,7 +65,7 @@ class ImageContentController(
             case _                     => None
           },
         )
-        Cached(CacheTime.Default)(JsonComponent(JsArray(lightboxJson)))
+        Cached(CacheTime.Default)(JsonComponent.fromWritable(JsArray(lightboxJson)))
       }
     }
 }

applications/app/controllers/MediaController.scala

@@ -33,7 +33,7 @@ class MediaController(contentApiClient: ContentApiClient, val controllerComponen
         case Left(model)  => MediaInfo(expired = false, shouldHideAdverts = model.media.content.shouldHideAdverts)
         case Right(other) => MediaInfo(expired = other.header.status == GONE, shouldHideAdverts = true)
       } map { mediaInfo =>
-        Cached(60)(JsonComponent(withRefreshStatus(Json.toJson(mediaInfo).as[JsObject])))
+        Cached(60)(JsonComponent.fromWritable(withRefreshStatus(Json.toJson(mediaInfo).as[JsObject])))
       }
     }
 

commercial/app/controllers/BookOffersController.scala

@@ -30,12 +30,12 @@ class BookOffersController(
   def getBook: Action[AnyContent] =
     Action { implicit request =>
       lazy val failedLookupResult: Result = Cached(30.seconds)(JsonNotFound())(request)
-      lazy val badRequestResponse: Result = Cached(1.day)(JsonComponent(JsNull))(request)
+      lazy val badRequestResponse: Result = Cached(1.day)(JsonComponent.fromWritable(JsNull))(request)
 
       specificId match {
         case Some(isbn) if isValidIsbn(isbn) =>
           bookFinder.findByIsbn(isbn) map { book: Book =>
-            Cached(1.hour)(JsonComponent(Json.toJson(book)))
+            Cached(1.hour)(JsonComponent.fromWritable(book))
           } getOrElse failedLookupResult
         case Some(invalidIsbn) =>
           log.error(s"Book lookup called with invalid ISBN '$invalidIsbn'. Returning empty response.")
@@ -49,9 +49,8 @@ class BookOffersController(
 
   def getBooks: Action[AnyContent] =
     Action { implicit request =>
-      val json: JsValue = Json.toJson(booksSample(specificIds, segment))
       Cached(60.seconds) {
-        JsonComponent(json)
+        JsonComponent.fromWritable(booksSample(specificIds, segment))
       }
     }
 }

commercial/app/controllers/ContentApiOffersController.scala

@@ -62,11 +62,11 @@ class ContentApiOffersController(
         case Nil => Cached(componentNilMaxAge) { jsonFormat.nilResult }
         case content if isMulti =>
           Cached(1.hour) {
-            JsonComponent(CapiMultiple.fromContent(content, Edition(request)))
+            JsonComponent.fromWritable(CapiMultiple.fromContent(content, Edition(request)))
           }
         case first :: _ =>
           Cached(1.hour) {
-            JsonComponent(CapiSingle.fromContent(first, Edition(request)))
+            JsonComponent.fromWritable(CapiSingle.fromContent(first, Edition(request)))
           }
       }
 

commercial/app/controllers/JobsController.scala

@@ -20,7 +20,7 @@ class JobsController(jobsAgent: JobsAgent, val controllerComponents: ControllerC
   def getJobs: Action[AnyContent] =
     Action { implicit request =>
       Cached(60.seconds) {
-        JsonComponent(jobSample(specificIds, segment))
+        JsonComponent.fromWritable(jobSample(specificIds, segment))
       }
     }
 }

commercial/app/controllers/LiveEventsController.scala

@@ -16,7 +16,7 @@ class LiveEventsController(liveEventAgent: LiveEventAgent, val controllerCompone
         for {
           id <- specificId
           event <- liveEventAgent.specificLiveEvent(id)
-        } yield Cached(componentMaxAge) { JsonComponent(event) }
+        } yield Cached(componentMaxAge) { JsonComponent.fromWritable(event) }
       } getOrElse Cached(componentNilMaxAge) { jsonFormat.nilResult }
     }
 }

commercial/app/controllers/Multi.scala

@@ -72,7 +72,7 @@ class Multi(
 
       if (offerTypes.size == contents.size) {
         Cached(componentMaxAge) {
-          JsonComponent(JsArray((offerTypes zip contents).map {
+          JsonComponent.fromWritable(JsArray((offerTypes zip contents).map {
             case (contentType, content) =>
               Json.obj(
                 "type" -> contentType,

commercial/app/controllers/TrafficDriverController.scala

@@ -44,7 +44,7 @@ class TrafficDriverController(
         case None => Cached(componentNilMaxAge) { jsonFormat.nilResult }
         case Some(content) =>
           Cached(60.seconds) {
-            JsonComponent(TrafficDriver.fromContent(content, Edition(request)))
+            JsonComponent.fromWritable(TrafficDriver.fromContent(content, Edition(request)))
           }
       }
 

commercial/app/controllers/TravelOffersController.scala

@@ -19,9 +19,8 @@ class TravelOffersController(travelOffersAgent: TravelOffersAgent, val controlle
 
   def getTravel: Action[AnyContent] =
     Action { implicit request =>
-      val json = Json.toJson(travelSample(specificIds, segment))
       Cached(60.seconds) {
-        JsonComponent(json)
+        JsonComponent.fromWritable(travelSample(specificIds, segment))
       }
     }
 }

commercial/app/controllers/nonRefreshableLineItemsController.scala

@@ -15,11 +15,9 @@ class nonRefreshableLineItemsController(val controllerComponents: ControllerComp
   def getIds: Action[AnyContent] =
     Action { implicit request =>
       val nonRefreshableLineItems: Seq[Long] = DfpAgent.nonRefreshableLineItemIds()
-      val json = Json.toJson(nonRefreshableLineItems)
-
       Cors(
         Cached(15.minutes) {
-          JsonComponent(json)
+          JsonComponent.fromWritable(nonRefreshableLineItems)
         },
         None,
         None,

common/app/common/JsonComponent.scala

@@ -14,7 +14,7 @@ object JsonComponent extends Results with implicits.Requests {
 
   def withRefreshStatus(obj: JsObject): JsValue = obj + ("refreshStatus" -> toJson(AutoRefreshSwitch.isSwitchedOn))
 
-  def apply[A](value: A)(implicit request: RequestHeader, writes: Writes[A]): RevalidatableResult =
+  def fromWritable[A](value: A)(implicit request: RequestHeader, writes: Writes[A]): RevalidatableResult =
     resultFor(
       request,
       Json.stringify(Json.toJson(value)),

common/test/common/JsonComponentTest.scala

@@ -61,7 +61,7 @@ class JsonComponentTest extends AnyFlatSpec with Matchers with WithTestExecution
 
     val result = Future {
       implicit val request = FakeRequest("GET", "http://foo.bar.com/data.json")
-      JsonComponent(JsonComponent.withRefreshStatus(obj("name" -> "foo"))).result
+      JsonComponent.fromWritable(JsonComponent.withRefreshStatus(obj("name" -> "foo"))).result
     }
 
     contentType(result) should be(Some("application/json"))

discussion/app/controllers/CommentCountController.scala

@@ -17,7 +17,7 @@ class CommentCountController(val discussionApi: DiscussionApiLike, val controlle
       val counts = discussionApi.commentCounts(shortUrls)
       counts map { counts =>
         Cached(300) {
-          JsonComponent(
+          JsonComponent.fromWritable(
             JsObject(Seq("counts" -> JsArray(counts.map(_.toJson)))),
           )
         }

facia/app/controllers/FaciaController.scala

@@ -77,7 +77,7 @@ trait FaciaController
           val onwardItems = OnwardCollection.pressedCollectionToOnwardCollection(collection)
 
           Cached(CacheTime.Facia) {
-            JsonComponent(onwardItems)
+            JsonComponent.fromWritable(onwardItems)
           }
         case None =>
           Cached(CacheTime.NotFound)(
@@ -156,9 +156,11 @@ trait FaciaController
 
   def renderFrontJsonLite(path: String): Action[AnyContent] =
     Action.async { implicit request =>
-      frontJsonFapi.get(path, liteRequestType).map {
-        case Some(pressedPage) => Cached(CacheTime.Facia)(JsonComponent(FapiFrontJsonLite.get(pressedPage)))
-        case None              => Cached(CacheTime.Facia)(JsonComponent(JsObject(Nil)))
+      frontJsonFapi.get(path, liteRequestType).map { resp =>
+        Cached(CacheTime.Facia)(JsonComponent.fromWritable(resp match {
+          case Some(pressedPage) => FapiFrontJsonLite.get(pressedPage)
+          case None              => JsObject(Nil)
+        }))
       }
     }
 
@@ -211,7 +213,7 @@ trait FaciaController
               RevalidatableResult(Ok(body).as("text/xml; charset=utf-8"), body)
             } else if (request.isJson) {
               if (request.forceDCR) {
-                JsonComponent(
+                JsonComponent.fromWritable(
                   DotcomFrontsRenderingDataModel(
                     page = faciaPage,
                     request = request,

onward/app/controllers/CardController.scala

@@ -57,7 +57,7 @@ class CardController(
                   // To test a story that has no image:
                   // /cards/opengraph/http%3A%2F%2Fwww.theguardian.com%2Fmedia%2Fgreenslade%2F2013%2Faug%2F22%2Fjournalist-safety-egypt.json
 
-                  JsonComponent(
+                  JsonComponent.fromWritable(
                     withRefreshStatus(
                       Json
                         .toJson(
@@ -92,7 +92,7 @@ class CardController(
                   val firstParagraph = fragment.select("#mw-content-text > p").first
                   firstParagraph.select(".reference").remove()
 
-                  JsonComponent(
+                  JsonComponent.fromWritable(
                     withRefreshStatus(
                       Json
                         .toJson(

onward/app/controllers/MostPopularController.scala

@@ -138,7 +138,7 @@ class MostPopularController(
       OnwardItem.contentCardToOnwardItem(contentCard)
     }
     val response = OnwardCollectionResponseDCR(tabs, mostCommented, mostShared)
-    Cached(900)(JsonComponent(response))
+    Cached(900)(JsonComponent.fromWritable(response))
   }
 
   def jsonResponseNx2(mostPopulars: Seq[MostPopularNx2], mostCards: Map[String, Option[ContentCard]])(implicit
@@ -154,7 +154,7 @@ class MostPopularController(
       OnwardItem.contentCardToOnwardItem(contentCard)
     }
     val response = OnwardCollectionResponseDCR(tabs, mostCommented, mostShared)
-    Cached(900)(JsonComponent(response))
+    Cached(900)(JsonComponent.fromWritable(response))
   }
 
   def jsonResponse(mostPopular: MostPopular, countryCode: String)(implicit request: RequestHeader): Result = {
@@ -163,7 +163,7 @@ class MostPopularController(
       heading = mostPopular.heading,
       trails = mostPopular.trails.map(OnwardItem.pressedContentToOnwardItem).take(10),
     )
-    Cached(900)(JsonComponent(data))
+    Cached(900)(JsonComponent.fromWritable(data))
   }
 
   def renderPopularDay(countryCode: String): Action[AnyContent] =

onward/app/controllers/NavigationController.scala

@@ -24,7 +24,7 @@ class NavigationController(val controllerComponents: ControllerComponents) exten
       Edition.byId(editionId) match {
         case Some(edition) =>
           val menu = SimpleMenu(edition)
-          Cached(900)(JsonComponent(menu))
+          Cached(900)(JsonComponent.fromWritable(menu))
         case None =>
           Cached(60) {
             val json = Json.toJson(ApiError("Invalid edition ID.", 400)).toString()

onward/app/controllers/PopularInTag.scala

@@ -40,7 +40,7 @@ class PopularInTag(
       val numberOfCards = if (trails.faciaItems.length == 5 || trails.faciaItems.length == 6) 4 else 8
 
       if (request.forceDCR) {
-        JsonComponent(
+        JsonComponent.fromWritable(
           OnwardCollectionResponse(
             heading = "Related content",
             trails = trails.items.map(_.faciaContent).map(OnwardItem.pressedContentToOnwardItem).take(numberOfCards),

onward/app/controllers/RelatedController.scala

@@ -62,7 +62,7 @@ class RelatedController(
           trails = trails.map(_.faciaContent).map(OnwardItem.pressedContentToOnwardItem).take(10),
         )
 
-        JsonComponent(data)
+        JsonComponent.fromWritable(data)
       } else if (request.isJson) {
         val html = views.html.fragments.containers.facia_cards.container(
           onwardContainer(containerTitle, relatedTrails.map(_.faciaContent)),

onward/app/controllers/RichLinkController.scala

@@ -40,7 +40,7 @@ class RichLinkController(contentApiClient: ContentApiClient, controllerComponent
             pillar = OnwardsUtils.normalisePillar(content.metadata.pillar),
             format = content.metadata.format.getOrElse(ContentFormat.defaultContentFormat),
           )
-          Cached(900)(JsonComponent(richLink)(request, RichLink.writes))
+          Cached(900)(JsonComponent.fromWritable(richLink)(request, RichLink.writes))
         case Some(content) => renderContent(richLinkHtml(content), richLinkBodyHtml(content))
         case None          => NotFound
       }

onward/app/controllers/SeriesController.scala

@@ -32,7 +32,9 @@ class SeriesController(
     Action.async { implicit request =>
       if (request.forceDCR) {
         lookup(Edition(request), seriesId).map { mseries =>
-          mseries.map { series => JsonComponent(SeriesStoriesDCR.fromSeries(series)).result }.getOrElse(NotFound)
+          mseries
+            .map { series => JsonComponent.fromWritable(SeriesStoriesDCR.fromSeries(series)).result }
+            .getOrElse(NotFound)
         }
       } else {
         lookup(Edition(request), seriesId) map { series =>

onward/app/controllers/StocksController.scala

@@ -13,12 +13,12 @@ class StocksController(stocksData: StocksData, val controllerComponents: Control
     Action { implicit request =>
       // Decommissioned, see marker: 7dde429f00b1
       if (false && StocksWidgetSwitch.isSwitchedOff) {
-        Cached(1.minute)(JsonComponent(Stocks(Seq.empty)))
+        Cached(1.minute)(JsonComponent.fromWritable(Stocks(Seq.empty)))
       } else {
         stocksData.get match {
           case None => InternalServerError("Business data not loaded")
           case Some(stocks) =>
-            Cached(1.minute)(JsonComponent(stocks))
+            Cached(1.minute)(JsonComponent.fromWritable(stocks))
         }
       }
     }

onward/app/controllers/StoryPackageController.scala

@@ -30,7 +30,7 @@ class StoryPackageController(val contentApiClient: ContentApiClient, val control
   def render(path: String): Action[AnyContent] =
     Action.async { implicit request =>
       getRelatedContent(path).map(items => {
-        val json = JsonComponent(
+        val json = JsonComponent.fromWritable(
           OnwardCollectionResponse(
             heading = "More on this story",
             trails = items.map(_.faciaContent).map(OnwardItem.pressedContentToOnwardItem).take(10),

onward/app/weather/controllers/LocationsController.scala

@@ -18,7 +18,7 @@ class LocationsController(weatherApi: WeatherApi, val controllerComponents: Cont
   def findCity(query: String): Action[AnyContent] =
     Action.async { implicit request =>
       weatherApi.searchForLocations(query) map { locations =>
-        Cached(7.days)(JsonComponent(CityResponse.fromLocationResponses(locations.toList)))
+        Cached(7.days)(JsonComponent.fromWritable(CityResponse.fromLocationResponses(locations.toList)))
       }
     }
 
@@ -58,7 +58,7 @@ class LocationsController(weatherApi: WeatherApi, val controllerComponents: Cont
               // We do this as AccuWeather writes "New York, New York" if no region is specified, where as we
               // just get "New York" from Fastly.
               val weatherCityWithoutRegion = weatherCity.copy(city = city)
-              Cached(1 hour)(JsonComponent(weatherCityWithoutRegion))
+              Cached(1 hour)(JsonComponent.fromWritable(weatherCityWithoutRegion))
             }
           }
 
@@ -67,7 +67,7 @@ class LocationsController(weatherApi: WeatherApi, val controllerComponents: Cont
             cityFromRequestEdition.fold {
               Cached(CacheTime.NotFound)(JsonNotFound())
             } { city =>
-              Cached(1 hour)(JsonComponent(city))
+              Cached(1 hour)(JsonComponent.fromWritable(city))
             },
           )
       }

sport/app/football/controllers/MatchController.scala

@@ -170,7 +170,7 @@ class MatchController(
         page map { page =>
           if (request.forceDCR) {
             Cached(30) {
-              JsonComponent(Json.toJson(NsAnswer.makeFromFootballMatch(theMatch, page.lineUp)))
+              JsonComponent.fromWritable(NsAnswer.makeFromFootballMatch(theMatch, page.lineUp))
             }
           } else {
             val htmlResponse = () =>

sport/app/football/controllers/MoreOnMatchController.scala

@@ -268,17 +268,15 @@ class MoreOnMatchController(
               filtered <- related map { _ filter hasExactlyTwoTeams }
             } yield {
               Cached(if (theMatch.isLive) 10 else 300) {
-                JsonComponent(
-                  Json.toJson(
-                    NxAnswer.makeFromFootballMatch(
-                      request,
-                      theMatch,
-                      filtered,
-                      lineup,
-                      competition,
-                      theMatch.isResult,
-                      theMatch.isLive,
-                    ),
+                JsonComponent.fromWritable(
+                  NxAnswer.makeFromFootballMatch(
+                    request,
+                    theMatch,
+                    filtered,
+                    lineup,
+                    competition,
+                    theMatch.isResult,
+                    theMatch.isLive,
                   ),
                 )
               }