From 2c264ce993503220b44e5513177942586feb435f Mon Sep 17 00:00:00 2001 From: Mark Tomko Date: Thu, 18 Apr 2024 09:08:30 -0700 Subject: [PATCH] =?UTF-8?q?Improved=20error=20messaging=20=E2=80=A2=20quot?= =?UTF-8?q?e=20with=20`=20=E2=80=A2=20use=20mkString=20to=20avoid=20showin?= =?UTF-8?q?g=20`List()`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/broadinstitute/gpp/poolq3/parser/BarcodeSet.scala | 2 +- .../org/broadinstitute/gpp/poolq3/parser/ReferenceData.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/org/broadinstitute/gpp/poolq3/parser/BarcodeSet.scala b/src/main/scala/org/broadinstitute/gpp/poolq3/parser/BarcodeSet.scala index d5345e1..9f6f9ad 100644 --- a/src/main/scala/org/broadinstitute/gpp/poolq3/parser/BarcodeSet.scala +++ b/src/main/scala/org/broadinstitute/gpp/poolq3/parser/BarcodeSet.scala @@ -46,7 +46,7 @@ object BarcodeSet: .asScala .toList .map(_.trim) - .traverse(parseBarcode(s => InvalidFileException(file, s"Invalid DNA barcode '$s'"))) + .traverse(parseBarcode(s => InvalidFileException(file, s"Invalid DNA barcode `$s`"))) .map(bcs => new BarcodeSet(bcs.toSet)) .flatTap(checkSet(file, _)) .get // throws if an error was encountered diff --git a/src/main/scala/org/broadinstitute/gpp/poolq3/parser/ReferenceData.scala b/src/main/scala/org/broadinstitute/gpp/poolq3/parser/ReferenceData.scala index 9b1ded7..16f8327 100644 --- a/src/main/scala/org/broadinstitute/gpp/poolq3/parser/ReferenceData.scala +++ b/src/main/scala/org/broadinstitute/gpp/poolq3/parser/ReferenceData.scala @@ -93,11 +93,11 @@ object ReferenceData: // and reject cases where the barcode is empty but the ID is non-empty if barcode.isEmpty && id.isEmpty then None else if isReferenceBarcode(barcode) then Some(ReferenceEntry(barcode, id)) - else throw InvalidFileException(file, s"Invalid DNA barcode '$barcode' for ID '$id'") + else throw InvalidFileException(file, s"Invalid DNA barcode '$barcode' for ID `$id`") case _ => throw InvalidFileException( file, - s"Incorrect number of columns. At least 2 required, got: ${xs.length}: $xs" + s"Incorrect number of columns. At least 2 required, got: ${xs.length}: ${xs.mkString("`", "`, `", "`")}" ) }