diff --git a/admin/app/football/model/PA.scala b/admin/app/football/model/PA.scala index 190b429860dc..ed3b1e66ba7c 100644 --- a/admin/app/football/model/PA.scala +++ b/admin/app/football/model/PA.scala @@ -1,11 +1,10 @@ package football.model import pa.{Season, Team} -import implicits.Collections import java.time.ZoneId -object PA extends Collections { +object PA { val competitionNames = Map[String, String]( ("100", "Premier League"), diff --git a/commercial/app/controllers/BookOffersController.scala b/commercial/app/controllers/BookOffersController.scala index c65c1ae4e349..f0d67f425b6d 100644 --- a/commercial/app/controllers/BookOffersController.scala +++ b/commercial/app/controllers/BookOffersController.scala @@ -17,7 +17,6 @@ class BookOffersController( ) extends BaseController with ImplicitControllerExecutionContext with GuLogging - with implicits.Collections with implicits.Requests { private def booksSample(isbns: Seq[String], segment: Segment): Seq[Book] = diff --git a/common/app/common/TrailsToRss.scala b/common/app/common/TrailsToRss.scala index 7a0b8ce6d557..4fb3d84f93da 100644 --- a/common/app/common/TrailsToRss.scala +++ b/common/app/common/TrailsToRss.scala @@ -27,7 +27,7 @@ object RssDates { } } -object TrailsToRss extends implicits.Collections { +object TrailsToRss { // The CAPI blocks we would like consumers to request to build our item intro text from val BlocksToGenerateRssIntro = "body:oldest:10" diff --git a/common/app/implicits/Collections.scala b/common/app/implicits/Collections.scala deleted file mode 100644 index cc2b78b8d6dd..000000000000 --- a/common/app/implicits/Collections.scala +++ /dev/null @@ -1,28 +0,0 @@ -package implicits - -import language.higherKinds -import scala.collection.generic.CanBuildFrom -import collection.mutable.{HashSet => MutableHashSet} -import scala.collection.BuildFrom - -trait Collections { - - // thanks https://gist.github.com/1189097 - implicit class Seq2Distinct[T, C[T] <: Seq[T]](tees: C[T]) { -// def distinctBy[S](hash: T => S)(implicit cbf: CanBuildFrom[C[T], T, C[T]]): C[T] = { -// val builder = cbf() -// val seen = MutableHashSet[S]() -// -// for (t <- tees) { -// if (!seen(hash(t))) { -// builder += t -// seen += hash(t) -// } -// } -// -// builder.result -// } - } -} - -object CollectionsOps extends Collections diff --git a/common/app/layout/Front.scala b/common/app/layout/Front.scala index 31b24a8ca5dd..f03d9780e2df 100644 --- a/common/app/layout/Front.scala +++ b/common/app/layout/Front.scala @@ -14,7 +14,7 @@ case class Front( containers: Seq[FaciaContainer], ) -object Front extends implicits.Collections { +object Front { type TrailUrl = String def itemsVisible(containerDefinition: ContainerDefinition): Int = diff --git a/common/app/model/facia/PressedCollection.scala b/common/app/model/facia/PressedCollection.scala index d4d488634845..7cc4eb11ddf2 100644 --- a/common/app/model/facia/PressedCollection.scala +++ b/common/app/model/facia/PressedCollection.scala @@ -5,7 +5,6 @@ import com.gu.facia.api.{models => fapi} import com.gu.facia.api.utils.ContainerBrandingFinder import com.gu.facia.client.models.{Branded, TargetedTerritory} import common.Edition -import implicits.CollectionsOps._ import model.pressed._ import org.joda.time.DateTime import services.CollectionConfigWithId diff --git a/common/app/services/repositories.scala b/common/app/services/repositories.scala index e8c63c3cdaf4..2917d0d087c9 100644 --- a/common/app/services/repositories.scala +++ b/common/app/services/repositories.scala @@ -5,14 +5,13 @@ import com.gu.contentapi.client.model.ContentApiError import com.gu.contentapi.client.model.v1.{ItemResponse, SearchResponse, Section => ApiSection} import common._ import contentapi.{ContentApiClient, QueryDefaults, SectionTagLookUp, SectionsLookUp} -import implicits.Collections import model._ import org.joda.time.DateTime import play.api.mvc.{RequestHeader, Result => PlayResult} import scala.concurrent.Future -trait Index extends ConciergeRepository with Collections { +trait Index extends ConciergeRepository { implicit val context: ApplicationContext diff --git a/common/app/views/support/MostPopularTags.scala b/common/app/views/support/MostPopularTags.scala index e102facce721..39eb738178f0 100644 --- a/common/app/views/support/MostPopularTags.scala +++ b/common/app/views/support/MostPopularTags.scala @@ -5,7 +5,7 @@ import model.Tag import model.pressed.PressedContent import implicits.FaciaContentFrontendHelpers.FaciaContentFrontendHelper -object MostPopularTags extends implicits.Collections { +object MostPopularTags { /** A descending list of the tags that occur most frequently within the given items of content and how frequently * they occur diff --git a/sport/app/football/feed/agent.scala b/sport/app/football/feed/agent.scala index b66f0c14141f..b3a4a3243a8c 100644 --- a/sport/app/football/feed/agent.scala +++ b/sport/app/football/feed/agent.scala @@ -88,7 +88,7 @@ trait Fixtures extends GuLogging { } } -trait Results extends GuLogging with implicits.Collections { +trait Results extends GuLogging { def footballClient: FootballClient def teamNameBuilder: TeamNameBuilder