Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JSON Validation: Report correct paths for JSON Validation errors #445

Merged
merged 1 commit into from Sep 10, 2012
Merged

JSON Validation: Report correct paths for JSON Validation errors #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions framework/src/play/src/main/scala/play/api/libs/json/JsConstraints.scala
View file
Open in desktop
Expand Up @@ -20,10 +20,10 @@ trait PathReads {
def required(path:JsPath): Reads[JsValue] = at(path)

def at[A](path:JsPath)(implicit reads:Reads[A]): Reads[A] =
Reads[A]( js => path.asSingleJsResult(js).flatMap(reads.reads) )
Reads[A]( js => path.asSingleJsResult(js).flatMap(reads.reads(_).repath(path)))

def optional[A](path:JsPath)(implicit reads:Reads[A]): Reads[Option[A]] =
Reads[Option[A]](json => path.asSingleJsResult(json).fold(_ => JsSuccess(None), a => reads.reads(a).map(Some(_))))
Reads[Option[A]](json => path.asSingleJsResult(json).fold(_ => JsSuccess(None), a => reads.reads(a).repath(path).map(Some(_))))

}

Expand Down
18 changes: 14 additions & 4 deletions framework/src/play/src/test/scala/play/api/libs/json/JsonValidSpec.scala
View file
Open in desktop
Expand Up @@ -344,6 +344,18 @@ object JsonValidSpec extends Specification {
}

"JSON Reads" should {
"report correct path for validation errors" in {
case class User(email: String, phone: Option[String])

implicit val UserReads = (
(__ \ 'email).read(email) and
(__ \ 'phone).readOpt(minLength[String](8))
)(User)

Json.obj("email" -> "john").validate[User] must beEqualTo(JsError(__ \ "email", ValidationError("validate.error.email")))
Json.obj("email" -> "john.doe@blibli.com", "phone" -> "4").validate[User] must beEqualTo(JsError(__ \ "phone", ValidationError("validate.error.minlength", 8)))
}

"mix reads constraints" in {
case class User(id: Long, email: String, age: Int)

Expand All @@ -353,10 +365,8 @@ object JsonValidSpec extends Specification {
(__ \ 'age).read( max(55) or min(65) )
)(User)


Json.obj( "id" -> 123L, "email" -> "john.doe@blibli.com", "age" -> 50).validate[User] must beEqualTo(JsSuccess(User(123L, "john.doe@blibli.com", 50)))
Json.obj( "id" -> 123L, "email" -> "john.doe@blibli.com", "age" -> 60).validate[User] must beEqualTo(JsError(ValidationError("validate.error.max", 55)) ++ JsError(ValidationError("validate.error.min", 65)))
Json.obj( "id" -> 123L, "email" -> "john.doe", "age" -> 60).validate[User] must beEqualTo(JsError(ValidationError("validate.error.email")) ++ JsError(ValidationError("validate.error.max", 55)) ++ JsError(ValidationError("validate.error.min", 65)))
Json.obj( "id" -> 123L, "email" -> "john.doe@blibli.com", "age" -> 60).validate[User] must beEqualTo(JsError(__ \ "age", ValidationError("validate.error.max", 55)) ++ JsError(__ \ "age", ValidationError("validate.error.min", 65)))
}

"verifyingIf reads" in {
Expand All @@ -372,7 +382,7 @@ object JsonValidSpec extends Specification {
val d = (new java.util.Date()).getTime()
Json.obj("type" -> "coucou", "data" -> Json.obj()).validate(TupleReads) must beEqualTo(JsSuccess("coucou" -> Json.obj()))
Json.obj("type" -> "coucou", "data" -> Json.obj( "title" -> "blabla", "created" -> d)).validate(TupleReads) must beEqualTo(JsSuccess("coucou" -> Json.obj( "title" -> "blabla", "created" -> d)))
Json.obj("type" -> "coucou", "data" -> Json.obj( "title" -> "blabla")).validate(TupleReads) must beEqualTo(JsError( __ \ "created", "validate.error.missing-path"))
Json.obj("type" -> "coucou", "data" -> Json.obj( "title" -> "blabla")).validate(TupleReads) must beEqualTo(JsError( __ \ "data" \ "created", "validate.error.missing-path"))
}

"recursive reads" in {
Expand Down