From 303b06742cec3bd1713adac15fb8828088acc0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0est=C3=A1k=20V=C3=ADt?= Date: Wed, 4 Jan 2017 17:20:41 +0100 Subject: [PATCH] Team filter cleanup --- app/controllers/DependencyCheckReportsParser.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/DependencyCheckReportsParser.scala b/app/controllers/DependencyCheckReportsParser.scala index 4e8cbc9..9a0cf87 100644 --- a/app/controllers/DependencyCheckReportsParser.scala +++ b/app/controllers/DependencyCheckReportsParser.scala @@ -63,10 +63,10 @@ final case class TeamFilter(team: Team) extends Filter{ val reportInfoByFriendlyProjectNameMap = toMapStrict(r.projectsReportInfo.ungroupedReportsInfo.map(ri => friendlyProjectNameString(ri) -> ri)) val ProjectName = """^(.*): (.*)$""".r val failedProjectsFriendlyNames = r.failedProjects.failedProjectsSet.map(_.projectName) - val rootProjectReports = reportInfoByFriendlyProjectNameMap.toSeq.map{ - case (ProjectName(rootProject, _subproject), v) => (rootProject, v) - case value @ (rootProject, v) => value - }.groupBy(_._1).mapValues(_.map(_._2)).withDefault(name => + val rootProjectReports = reportInfoByFriendlyProjectNameMap.groupBy{ + case (ProjectName(rootProject, _subproject), v) => rootProject + case (rootProject, v) => rootProject + }.mapValues(_.values).map(identity).withDefault(name => if(failedProjectsFriendlyNames contains name) Seq() else sys.error("Unknown project: "+name) )