From 84b8224d414514062cfdc3e07a09e3c81551f6ab Mon Sep 17 00:00:00 2001 From: "Francois @fanf42 Armand" Date: Fri, 17 May 2024 18:32:03 +0200 Subject: [PATCH] Fixes #24877: Upmerge breaks build from 8.0 and up --- .../normation/utils/DateFormaterService.scala | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/webapp/sources/utils/src/main/scala/com/normation/utils/DateFormaterService.scala b/webapp/sources/utils/src/main/scala/com/normation/utils/DateFormaterService.scala index 5976dab3c1..e3ec1d3796 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/utils/DateFormaterService.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/utils/DateFormaterService.scala @@ -60,11 +60,16 @@ object DateFormaterService { } object json { - implicit val encoderDateTime: JsonEncoder[DateTime] = JsonEncoder[String].contramap(serialize) - implicit val decoderDateTime: JsonDecoder[DateTime] = JsonDecoder[String].mapOrFail(parseDate(_).left.map(_.fullMsg)) + implicit val encoderDateTime: JsonEncoder[DateTime] = JsonEncoder[String].contramap(serialize) + implicit val decoderDateTime: JsonDecoder[DateTime] = JsonDecoder[String].mapOrFail(parseDate(_).left.map(_.fullMsg)) + implicit val codecDateTime: JsonCodec[DateTime] = new JsonCodec[DateTime](encoderDateTime, decoderDateTime) + implicit val encoderZonedDateTime: JsonEncoder[ZonedDateTime] = JsonEncoder[String].contramap(serializeZDT) implicit val decoderZonedDateTime: JsonDecoder[ZonedDateTime] = JsonDecoder[String].mapOrFail(parseDateZDT(_).left.map(_.fullMsg)) + + implicit val codecZonedDateTime: JsonCodec[ZonedDateTime] = + new JsonCodec[ZonedDateTime](encoderZonedDateTime, decoderZonedDateTime) } val displayDateFormat: DateTimeFormatter = new DateTimeFormatterBuilder() @@ -165,11 +170,4 @@ object DateFormaterService { .appendFractionOfSecond(3, 9) .toFormatter() - object json { - implicit val encoderDateTime: JsonEncoder[DateTime] = JsonEncoder.string.contramap(DateFormaterService.serialize) - implicit val decoderDateTime: JsonDecoder[DateTime] = - JsonDecoder.string.mapOrFail(d => DateFormaterService.parseDate(d).left.map(_.fullMsg)) - - implicit val codecDateTime: JsonCodec[DateTime] = new JsonCodec[DateTime](encoderDateTime, decoderDateTime) - } }