From fdd5b9f8d5ce63314f5582eefccbbabd664b317b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0est=C3=A1k=20V=C3=ADt?= Date: Fri, 31 Jan 2020 13:25:16 +0100 Subject: [PATCH] Fixed timestamp parsing --- app/controllers/DependencyCheckReportsProcessor.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/DependencyCheckReportsProcessor.scala b/app/controllers/DependencyCheckReportsProcessor.scala index aa68b27..58cdfec 100644 --- a/app/controllers/DependencyCheckReportsProcessor.scala +++ b/app/controllers/DependencyCheckReportsProcessor.scala @@ -34,8 +34,13 @@ final class DependencyCheckReportsProcessor @Inject() ( if(dt.forall(_.isDigit)){ new DateTime(dt.toLong) // TODO: timezone (I don't care much, though) }else{ - val formatter = DateTimeFormat.forPattern("dd/MM/yyyy HH:mm:ss") // TODO: timezone (I don't care much, though) - formatter.parseDateTime(dt) + val formatter1 = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss") // TODO: timezone (I don't care much, though) + val formatter2 = DateTimeFormat.forPattern("dd/MM/yyyy HH:mm:ss") // TODO: timezone (I don't care much, though) + try{ + formatter1.parseDateTime(dt) + }catch {case e: IllegalArgumentException => + formatter2.parseDateTime(dt) + } } }