Show correct error message in NodeKindViolation for blank nodes

Author: atextor

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/NodeKindViolation.java

@@ -48,6 +48,9 @@ public String violationSpecificMessage() {
          return String.format( "Property %s on %s is %s, but it must be %s.",
                propertyName(), context.element().isAnon() ? "the element" : elementName(),
                nodeKindString.apply( actualNodeKind ), nodeKindString.apply( allowedNodeKind ) );
+      } else if ( context.parentProperty().isPresent() ) {
+         return String.format( "Property %s on %s is %s, but it must be %s.",
+               parentPropertyName(), parentElementName(), nodeKindString.apply( actualNodeKind ), nodeKindString.apply( allowedNodeKind ) );
       }
       return context.element().isAnon() ?
             String.format( "The element is %s, but it must be %s.",

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/Violation.java

@@ -175,10 +175,20 @@ default String elementName() {
             .orElse( "anonymous element" );
    }
 
+   default String parentElementName() {
+      return context().parentElement().map( Resource::getURI )
+            .map( this::shortUri )
+            .orElse( "anonymous element" );
+   }
+
    default String propertyName() {
       return context().property().map( Resource::getURI ).map( this::shortUri ).orElse( elementName() );
    }
 
+   default String parentPropertyName() {
+      return context().parentProperty().map( Resource::getURI ).map( this::shortUri ).orElse( propertyName() );
+   }
+
    default String value( final Property property ) {
       return shortUri( property.getURI() );
    }