From 574cda580870d21de506eecf0ac9dd25bdc4be72 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Wed, 8 Nov 2017 18:28:43 -0800 Subject: Upgrade sbt settings and support Scala 2.12 --- src/main/scala/xyz/driver/pdsuicommon/db/Sorting.scala | 4 ++-- .../xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala | 11 +++++------ .../scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala | 6 +++--- .../scala/xyz/driver/pdsuicommon/utils/ServiceUtils.scala | 4 ++-- .../driver/pdsuidomain/fakes/entities/recordprocessing.scala | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/Sorting.scala b/src/main/scala/xyz/driver/pdsuicommon/db/Sorting.scala index a2c5a75..8adf629 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/db/Sorting.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/db/Sorting.scala @@ -40,7 +40,7 @@ object Sorting { def filter(sorting: Sorting, p: Dimension => Boolean): Seq[Dimension] = sorting match { case x: Dimension if p(x) => Seq(x) - case x: Dimension => Seq.empty + case _: Dimension => Seq.empty case Sequential(xs) => xs.filter(p) } @@ -51,7 +51,7 @@ object Sorting { r += f(x) r.result() - case x: Dimension => bf.apply().result() + case _: Dimension => bf.apply().result() case Sequential(xs) => xs.collect(f) } diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala index 718a42d..aeb6c16 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala @@ -5,7 +5,6 @@ import java.util.UUID import xyz.driver.pdsuicommon.utils.Implicits.{toCharOps, toStringOps} import fastparse.all._ import fastparse.core.Parsed -import fastparse.parsers.Intrinsics.CharPred import xyz.driver.pdsuicommon.db.{SearchFilterBinaryOperation, SearchFilterExpr, SearchFilterNAryOperation} import xyz.driver.pdsuicommon.utils.Utils._ @@ -150,14 +149,14 @@ object SearchFilterParser { case head :: Nil => atomParser.parse(head) match { - case Parsed.Success(x, _) => x - case e: Parsed.Failure => throw new ParseQueryArgException("filters" -> formatFailure(1, e)) + case Parsed.Success(x, _) => x + case e: Parsed.Failure[_, _] => throw new ParseQueryArgException("filters" -> formatFailure(1, e)) } case xs => val parsed = xs.map(x => atomParser.parse(x)) val failures: Seq[String] = parsed.zipWithIndex.collect { - case (e: Parsed.Failure, index) => formatFailure(index, e) + case (e: Parsed.Failure[_, _], index) => formatFailure(index, e) } if (failures.isEmpty) { @@ -172,8 +171,8 @@ object SearchFilterParser { } } - private def formatFailure(sectionIndex: Int, e: Parsed.Failure): String = { - s"section $sectionIndex: ${ParseError.msg(e.extra.input, e.extra.traced.expected, e.index)}" + private def formatFailure(sectionIndex: Int, e: Parsed.Failure[_, _]): String = { + s"section $sectionIndex: ${fastparse.core.ParseError.msg(e.extra.input, e.extra.traced.expected, e.index)}" } } diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala index 4bfc669..a04d278 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala @@ -49,7 +49,7 @@ object SortingParser { val parser = sequentialSortingParser(validDimensions.toSeq) parser.parse(rawSorting) match { case Parsed.Success(x, _) => x - case e: Parsed.Failure => + case e: Parsed.Failure[_, _] => throw new ParseQueryArgException("sort" -> formatFailure(e)) } @@ -57,8 +57,8 @@ object SortingParser { } } - private def formatFailure(e: Parsed.Failure): String = { - ParseError.msg(e.extra.input, e.extra.traced.expected, e.index) + private def formatFailure(e: Parsed.Failure[_, _]): String = { + fastparse.core.ParseError.msg(e.extra.input, e.extra.traced.expected, e.index) } } diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/ServiceUtils.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/ServiceUtils.scala index cf53e6b..68070f4 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/ServiceUtils.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/ServiceUtils.scala @@ -15,8 +15,8 @@ object ServiceUtils extends PhiLogging { def findEqFilter(filter: SearchFilterExpr, dimension: Dimension): Option[SearchFilterExpr] = { filter.find { - case Atom.Binary(dimension, Eq, _) => true - case _ => false + case Atom.Binary(`dimension`, Eq, _) => true + case _ => false } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala index 5903dc8..d3d76b8 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala @@ -264,7 +264,7 @@ object recordprocessing { ) } - def nextExtractedDataLabel(dataId: LongId[ExtractedData]): ExtractedDataLabel = { + def nextExtractedDataLabel(): ExtractedDataLabel = { ExtractedDataLabel( id = nextLongId[ExtractedDataLabel], dataId = nextLongId[ExtractedData], @@ -280,7 +280,7 @@ object recordprocessing { extractedData = extractedData, labels = List.fill( nextInt(maxItemsInCollectionNumber) - )(nextExtractedDataLabel(extractedData.id)) + )(nextExtractedDataLabel()) ) } -- cgit v1.2.3