From b8c3d5ced42d93cf648c5fb4a218266e6e9681dd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Sep 2023 22:02:36 +0000 Subject: [PATCH 1/2] Update circe-core, circe-jawn, circe-parser, ... to 0.14.6 --- project/src/main/scala/modules/scalaAkkaHttp.scala | 2 +- project/src/main/scala/modules/scalaHttp4s.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/src/main/scala/modules/scalaAkkaHttp.scala b/project/src/main/scala/modules/scalaAkkaHttp.scala index 0660389764..6cc1d1f1f9 100644 --- a/project/src/main/scala/modules/scalaAkkaHttp.scala +++ b/project/src/main/scala/modules/scalaAkkaHttp.scala @@ -10,7 +10,7 @@ object scalaAkkaHttp { val akkaHttpVersion = "10.2.10" val akkaVersion = "2.6.20" val catsVersion = "2.10.0" - val circeVersion = "0.14.3" + val circeVersion = "0.14.6" val hibernateVersion = "6.2.5.Final" val jacksonVersion = "2.15.2" val javaxAnnotationVersion = "1.3.2" diff --git a/project/src/main/scala/modules/scalaHttp4s.scala b/project/src/main/scala/modules/scalaHttp4s.scala index ca5608c940..8e503226cf 100644 --- a/project/src/main/scala/modules/scalaHttp4s.scala +++ b/project/src/main/scala/modules/scalaHttp4s.scala @@ -7,7 +7,7 @@ import sbt.Keys._ object scalaHttp4s { val catsVersion = "2.10.0" - val circeVersion = "0.14.3" + val circeVersion = "0.14.6" val javaxAnnotationVersion = "1.3.2" val jaxbApiVersion = "2.3.1" val scalatestVersion = "3.2.17" From b1a5303429eb1f166c1518675b5c6128752e1e70 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Mon, 9 Oct 2023 22:39:50 -0700 Subject: [PATCH 2/2] Updating circe error messages --- .../src/test/scala/core/issues/Issue148.scala | 6 +++--- .../scala/generators/Circe/refined/ValidationTest.scala | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/sample-akkaHttp/src/test/scala/core/issues/Issue148.scala b/modules/sample-akkaHttp/src/test/scala/core/issues/Issue148.scala index 2318c06d94..d7662ad42a 100644 --- a/modules/sample-akkaHttp/src/test/scala/core/issues/Issue148.scala +++ b/modules/sample-akkaHttp/src/test/scala/core/issues/Issue148.scala @@ -82,7 +82,7 @@ class Issue148Suite extends AnyFunSuite with Matchers with EitherValues with Sca .withHeaders(RawHeader("x-header", "false")) .withEntity(ContentTypes.`application/json`, "{}") ~> route ~> check { rejection match { - case ex: MalformedRequestContentRejection => ex.message shouldBe "Missing required field: DownField(type)" + case ex: MalformedRequestContentRejection => ex.message shouldBe "DecodingFailure at .type: Missing required field" } } @@ -95,7 +95,7 @@ class Issue148Suite extends AnyFunSuite with Matchers with EitherValues with Sca .withHeaders(RawHeader("x-header", "false")) .withEntity(ContentTypes.`application/json`, """{"type": "blep"}""") ~> route ~> check { rejection match { - case ex: MalformedRequestContentRejection => ex.message shouldBe "Unknown value blep (valid: Bar): DownField(type)" + case ex: MalformedRequestContentRejection => ex.message shouldBe "DecodingFailure at .type: Unknown value blep (valid: Bar)" } } @@ -109,7 +109,7 @@ class Issue148Suite extends AnyFunSuite with Matchers with EitherValues with Sca .withHeaders(RawHeader("x-header", "false")) .withEntity(ContentTypes.`application/json`, """{"type": "Bar"}""") ~> route ~> check { rejection match { - case ex: MalformedRequestContentRejection => ex.message shouldBe "Missing required field: DownField(name)" + case ex: MalformedRequestContentRejection => ex.message shouldBe "DecodingFailure at .name: Missing required field" } } diff --git a/modules/sample-akkaHttp/src/test/scala/generators/Circe/refined/ValidationTest.scala b/modules/sample-akkaHttp/src/test/scala/generators/Circe/refined/ValidationTest.scala index fde3d2e75e..2bf9272995 100644 --- a/modules/sample-akkaHttp/src/test/scala/generators/Circe/refined/ValidationTest.scala +++ b/modules/sample-akkaHttp/src/test/scala/generators/Circe/refined/ValidationTest.scala @@ -23,8 +23,7 @@ class ValidationTest extends AnyFreeSpec with Matchers with EitherValues { ) .left .value - .toString - .contains("""DecodingFailure(Predicate failed: "does not match"""") shouldBe true + .toString should include("""Predicate failed: "does not match"""") } "should fail if collection elements rejected by the predicate (number)" in {