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

Improve message for 'ResourceShaclEngineRejection' #4862

Merged
merged 2 commits into from
Apr 11, 2024
Merged

Improve message for 'ResourceShaclEngineRejection' #4862

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8f84c7
Improve message for 'ResourceShaclEngineRejection'
Apr 10, 2024
842a54b
Merge branch 'master' into 4830-improve-shaclenginerejection
olivergrabinski Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resources/ValidateResource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ object ValidateResource {
schema.value.shapes,
reportDetails = true
).adaptError { e =>
ResourceShaclEngineRejection(jsonld.id, schemaRef, e.getMessage)
ResourceShaclEngineRejection(jsonld.id, schemaRef, e)
}.span("validateShacl")

private def assertNotDeprecated(schema: ResourceF[Schema]) = {
Expand Down
31 changes: 17 additions & 14 deletions .../src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resources/model/ResourceRejection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,10 @@ object ResourceRejection {
* @param details
* the SHACL engine errors
*/
final case class ResourceShaclEngineRejection(id: Iri, schema: ResourceRef, details: String)
extends ResourceRejection(s"Resource '$id' failed to produce a SHACL engine for schema '$schema'.")
final case class ResourceShaclEngineRejection(id: Iri, schema: ResourceRef, cause: Throwable)
extends ResourceRejection(
s"${ClassUtils.simpleName(cause)}: The SHACL engine could not be instantiated for resource '$id' and schema '$schema'."
)

/**
* Rejection returned when attempting to update/deprecate a resource that is already deprecated.
Expand Down Expand Up @@ -211,13 +213,13 @@ object ResourceRejection {
val tpe = ClassUtils.simpleName(r)
val obj = JsonObject.empty.add(keywords.tpe, tpe.asJson).add("reason", r.reason.asJson)
r match {
case ResourceShaclEngineRejection(_, _, details) => obj.add("details", details.asJson)
case InvalidResource(_, _, report, expanded) =>
case ResourceShaclEngineRejection(_, _, cause) => obj.add("details", cause.getMessage.asJson)
case InvalidResource(_, _, report, expanded) =>
obj.addContext(contexts.shacl).add("details", report.json).add("expanded", expanded.json)
case InvalidSchemaRejection(_, _, report) =>
case InvalidSchemaRejection(_, _, report) =>
obj.addContext(contexts.resolvers).add("report", report.asJson)
case IncorrectRev(provided, expected) => obj.add("provided", provided.asJson).add("expected", expected.asJson)
case _ => obj
case IncorrectRev(provided, expected) => obj.add("provided", provided.asJson).add("expected", expected.asJson)
case _ => obj
}
}

Expand All @@ -226,12 +228,13 @@ object ResourceRejection {

implicit val responseFieldsResources: HttpResponseFields[ResourceRejection] =
HttpResponseFields {
case RevisionNotFound(_, _) => StatusCodes.NotFound
case ResourceNotFound(_, _) => StatusCodes.NotFound
case TagNotFound(_) => StatusCodes.NotFound
case InvalidSchemaRejection(_, _, _) => StatusCodes.NotFound
case ResourceAlreadyExists(_, _) => StatusCodes.Conflict
case IncorrectRev(_, _) => StatusCodes.Conflict
case _ => StatusCodes.BadRequest
case RevisionNotFound(_, _) => StatusCodes.NotFound
case ResourceNotFound(_, _) => StatusCodes.NotFound
case TagNotFound(_) => StatusCodes.NotFound
case InvalidSchemaRejection(_, _, _) => StatusCodes.NotFound
case ResourceShaclEngineRejection(_, _, _) => StatusCodes.InternalServerError
case ResourceAlreadyExists(_, _) => StatusCodes.Conflict
case IncorrectRev(_, _) => StatusCodes.Conflict
case _ => StatusCodes.BadRequest
}
}