Improve validation messages for sh:closed and sh:xone

atextor · atextor · commit 2646af773965 · 2023-06-14T15:40:52.000+02:00
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ClassTypeViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ClassTypeViolation.java
@@ -24,7 +24,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has type %s, but only %s is allowed.",
             propertyName(), elementName(), shortUri( actualClass().getURI() ), shortUri( allowedClass().getURI() ) );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ClosedViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ClosedViolation.java
@@ -29,13 +29,22 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
-      final Set<String> allowed = Stream.concat( allowedProperties().stream(), ignoredProperties().stream() )
+   public String violationSpecificMessage() {
+      final List<String> allowed = allowedProperties().stream()
             .map( Property::getURI )
             .map( this::shortUri )
-            .collect( Collectors.toSet() );
-      return String.format( "%s is used on %s. It is not allowed there; allowed are only %s.",
-            shortUri( actual.getURI() ), elementName(), allowed );
+            .collect( Collectors.toSet() )
+            .stream()
+            .sorted()
+            .toList();
+      final String allowedText = switch ( allowed.size() ) {
+         case 0 -> "no properties are allowed";
+         case 1 -> "only " + allowed.iterator().next() + " is allowed";
+         default -> "allowed are only " + allowed;
+      };
+
+      return String.format( "%s is used on %s. It is not allowed there; %s.",
+            shortUri( actual.getURI() ), elementName(), allowedText );
    }
 
    @Override
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/DatatypeViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/DatatypeViolation.java
@@ -36,13 +36,16 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       if ( context.property().isPresent() ) {
-         return allowedTypeUri.equals( RDF.langString.getURI() ) && actualTypeUri.equals( XSD.xstring.getURI() ) ?
-               String.format( "Property %s on %s is missing a language tag.",
-                     propertyName(), elementName() ) :
-               String.format( "Property %s on %s uses data type %s, but only %s is allowed.",
-                     propertyName(), elementName(), shortUri( actualTypeUri ), shortUri( allowedTypeUri ) );
+         if ( allowedTypeUri.equals( RDF.langString.getURI() ) && actualTypeUri.equals( XSD.xstring.getURI() ) ) {
+            return String.format( "Property %s on %s is missing a language tag.", propertyName(), elementName() );
+         } else if ( allowedTypeUri.equals( XSD.xstring.getURI() ) && actualTypeUri.equals( RDF.langString.getURI() ) ) {
+            return String.format( "Property %s on %s must not have a language tag.", propertyName(), elementName() );
+         } else {
+            return String.format( "Property %s on %s uses data type %s, but only %s is allowed.",
+                  propertyName(), elementName(), shortUri( actualTypeUri ), shortUri( allowedTypeUri ) );
+         }
       }
       return String.format( "%s uses data type %s, but only %s is allowed.",
             elementName(), shortUri( actualTypeUri ), shortUri( allowedTypeUri ) );
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/DisjointViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/DisjointViolation.java
@@ -25,7 +25,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s may not have the same value as property %s (%s).",
             propertyName(), elementName(), shortUri( otherProperty.getURI() ), otherValue );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/EqualsViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/EqualsViolation.java
@@ -26,7 +26,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s must have the same value as property %s (%s), but has value %s.",
             propertyName(), elementName(), shortUri( otherProperty.getURI() ), allowedValue, actualValue );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/EvaluationContext.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/EvaluationContext.java
@@ -27,14 +27,15 @@
 public record EvaluationContext( Resource element, Shape shape, Optional<Shape.Property> propertyShape, Optional<Property> property,
       List<Statement> offendingStatements, ShaclValidator validator, Model resolvedModel ) {
    public EvaluationContext withProperty( final Property newProperty ) {
-      return new EvaluationContext( element(), shape(), Optional.of( newProperty ), offendingStatements(), validator(), resolvedModel );
+      return new EvaluationContext( element(), shape(), propertyShape(), Optional.of( newProperty ), offendingStatements(), validator(),
+            resolvedModel );
    }
 
    public EvaluationContext withElement( final Resource newElement ) {
-      return new EvaluationContext( newElement, shape(), property(), offendingStatements(), validator(), resolvedModel );
+      return new EvaluationContext( newElement, shape(), propertyShape(), property(), offendingStatements(), validator(), resolvedModel );
    }
 
    public EvaluationContext withOffendingStatements( final List<Statement> newOffendingStatements ) {
-      return new EvaluationContext( element(), shape(), property(), newOffendingStatements, validator(), resolvedModel );
+      return new EvaluationContext( element(), shape(), propertyShape(), property(), newOffendingStatements, validator(), resolvedModel );
    }
 }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/InvalidSyntaxViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/InvalidSyntaxViolation.java
@@ -32,6 +32,11 @@ public EvaluationContext context() {
       return null;
    }
 
+   @Override
+   public String message() {
+      return violationSpecificMessage;
+   }
+
    @Override
    public <T> T accept( final Visitor<T> visitor ) {
       return visitor.visitInvalidSyntaxViolation( this );
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/InvalidValueViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/InvalidValueViolation.java
@@ -24,7 +24,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has value %s, but only %s is allowed.",
             propertyName(), elementName(), value( actual ), value( allowed ) );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/JsConstraintViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/JsConstraintViolation.java
@@ -37,15 +37,15 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       if ( constraintMessage().isEmpty() ) {
          return context.property().isPresent() ?
                String.format( "Property %s on %s is invalid.", propertyName(), elementName() ) :
                String.format( "%s is invalid.", elementName() );
       }
       String interpolatedMessage = bindings.getOrDefault( "message", constraintMessage() ).toString();
       for ( final Map.Entry<String, Object> entry : bindings.entrySet() ) {
-         String value = "";
+         final String value;
          if ( entry.getValue() instanceof final Node_Literal literal ) {
             value = literal.getLiteralLexicalForm();
          } else if ( entry.getValue() instanceof final Node_URI namedNode ) {
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/LanguageFromListViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/LanguageFromListViolation.java
@@ -24,7 +24,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has language tag %s, which is not in the list of allowed languages: %s.",
             propertyName(), elementName(), actual, allowed );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/LessThanOrEqualsViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/LessThanOrEqualsViolation.java
@@ -26,7 +26,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s must have a value that is less than or equal to that of %s: %s must be less than %s.",
             propertyName(), elementName(), shortUri( otherProperty.getURI() ), value( actualValue ), value( otherValue ) );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/LessThanViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/LessThanViolation.java
@@ -26,7 +26,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s must have a value that is less than that of %s: %s must be less than %s.",
             propertyName(), elementName(), shortUri( otherProperty.getURI() ), value( actualValue ), value( otherValue ) );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MaxCountViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MaxCountViolation.java
@@ -22,7 +22,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return allowed == 0 ?
             String.format( "Property %s may not be used on %s.", propertyName(), elementName() ) :
             String.format( "Property %s is used %d time%s on %s, but may only be used %d time%s.",
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MaxExclusiveViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MaxExclusiveViolation.java
@@ -24,7 +24,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has value %s, but it must be less than %s.",
             propertyName(), elementName(), value( actual ), value( max ) );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MaxInclusiveViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MaxInclusiveViolation.java
@@ -24,7 +24,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has value %s, but it must be less than or equal to %s.",
             propertyName(), elementName(), value( actual ), value( max ) );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MaxLengthViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MaxLengthViolation.java
@@ -22,7 +22,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has length %s, but its length must be less than or equal to %s.",
             propertyName(), elementName(), actual, max );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MinCountViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MinCountViolation.java
@@ -22,7 +22,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return allowed == 1 ?
             String.format( "Mandatory property %s is missing on %s.", propertyName(), elementName() ) :
             String.format( "Property %s must be present on %s at least %d time%s, but is present only %d time%s.",
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MinExclusiveViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MinExclusiveViolation.java
@@ -24,7 +24,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has value %s, but it must be greater than %s.",
             propertyName(), elementName(), value( actual ), value( min ) );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MinInclusiveViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MinInclusiveViolation.java
@@ -24,7 +24,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has value %s, but it must be greater than or equal to %s.",
             propertyName(), elementName(), value( actual ), value( min ) );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MinLengthViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MinLengthViolation.java
@@ -22,7 +22,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has length %s, but its length must be greater than or equal to %s.",
             propertyName(), elementName(), actual, min );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MissingTypeViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/MissingTypeViolation.java
@@ -22,7 +22,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Could not determine type of %s.", elementName() );
    }
 
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/NodeKindViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/NodeKindViolation.java
@@ -27,7 +27,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       final Function<Shape.NodeKind, String> nodeKindString = nodeKind -> switch ( nodeKind ) {
          case BlankNode -> "an anonymous node";
          case BlankNodeOrIRI -> "an anonymous node or a named element";
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/NotViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/NotViolation.java
@@ -24,10 +24,13 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return context.property().isPresent() ?
-            String.format( "Expected violation of constraint %s on %s on %s, but it did not occur.", negatedConstraint.name(), propertyName(), elementName() ) :
-            String.format( "Expected violation of constraint %s on element %s, but it did not occur.", negatedConstraint.name(), elementName() );
+            String.format( "Expected violation of constraint %s on %s on %s, but it did not occur.", negatedConstraint.name(),
+                  propertyName(),
+                  elementName() ) :
+            String.format( "Expected violation of constraint %s on element %s, but it did not occur.", negatedConstraint.name(),
+                  elementName() );
    }
 
    @Override
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/PatternViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/PatternViolation.java
@@ -22,7 +22,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has value %s, which does not match the required pattern %s.",
             propertyName(), elementName(), actual, pattern );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ProcessingViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ProcessingViolation.java
@@ -30,6 +30,11 @@ public EvaluationContext context() {
       return null;
    }
 
+   @Override
+   public String message() {
+      return violationSpecificMessage;
+   }
+
    @Override
    public <T> T accept( final Visitor<T> visitor ) {
       return visitor.visitProcessingViolation( this );
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/SparqlConstraintViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/SparqlConstraintViolation.java
@@ -32,7 +32,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       if ( constraintMessage().isEmpty() ) {
          if ( context.property().isPresent() ) {
             return String.format( "Property %s on %s is invalid.", propertyName(), elementName() );
@@ -42,7 +42,9 @@ public String message() {
 
       String interpolatedMessage = constraintMessage();
       for ( final Map.Entry<String, RDFNode> entry : bindings.entrySet() ) {
-         final String value = entry.getValue().isURIResource() ? shortUri( entry.getValue().asResource().getURI() ) : entry.getValue().toString();
+         final String value = entry.getValue().isURIResource() ?
+               shortUri( entry.getValue().asResource().getURI() ) :
+               entry.getValue().toString();
          interpolatedMessage = interpolatedMessage.replaceAll( "\\{[$?]" + entry.getKey() + "\\}", value );
       }
       return interpolatedMessage;
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/UniqueLanguageViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/UniqueLanguageViolation.java
@@ -24,7 +24,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s uses language tag that has been used already: %s.",
             propertyName(), elementName(), duplicates );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ValueFromListViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ValueFromListViolation.java
@@ -27,9 +27,10 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return String.format( "Property %s on %s has value %s which is not in the list of allowed values: %s.",
-            propertyName(), elementName(), value( actual ), allowed.stream().map( this::value ).collect( Collectors.joining( ", ", "[", "]" ) ) );
+            propertyName(), elementName(), value( actual ),
+            allowed.stream().map( this::value ).collect( Collectors.joining( ", ", "[", "]" ) ) );
    }
 
    @Override
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/Violation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/Violation.java
@@ -34,7 +34,7 @@ public interface Violation {
 
    EvaluationContext context();
 
-   String message();
+   String violationSpecificMessage();
 
    <T> T accept( Visitor<T> visitor );
 
@@ -196,6 +196,14 @@ default String value( final Literal literal ) {
       return literal.getLexicalForm();
    }
 
+   default String message() {
+      final String nodeShapeMessage = context().shape().attributes().message().map( message -> message.replaceAll( "\\.$", "" )
+            + ", more specifically: " ).orElse( "" );
+      final String propertyShapeMessage = context().propertyShape().flatMap( propertyShape -> propertyShape.attributes().message() )
+            .orElseGet( this::violationSpecificMessage );
+      return nodeShapeMessage + propertyShapeMessage;
+   }
+
    default List<Fix> fixes() {
       return List.of();
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/XoneViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/XoneViolation.java
@@ -26,7 +26,7 @@ public String errorCode() {
    }
 
    @Override
-   public String message() {
+   public String violationSpecificMessage() {
       return "One of the following violations" +
             (context.property().isPresent() ? " for " + propertyName() : "")
             + " must be fixed: " +

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public String errorCode() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
`27`		`- public String message() {`
	`27`	`+ public String violationSpecificMessage() {`
`28`	`28`	`return String.format( "Property %s on %s has type %s, but only %s is allowed.",`
`29`	`29`	`propertyName(), elementName(), shortUri( actualClass().getURI() ), shortUri( allowedClass().getURI() ) );`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public String errorCode() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`		`- public String message() {`
	`28`	`+ public String violationSpecificMessage() {`
`29`	`29`	`return String.format( "Property %s on %s may not have the same value as property %s (%s).",`
`30`	`30`	`propertyName(), elementName(), shortUri( otherProperty.getURI() ), otherValue );`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public String errorCode() {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`
`29`		`- public String message() {`
	`29`	`+ public String violationSpecificMessage() {`
`30`	`30`	`return String.format( "Property %s on %s must have the same value as property %s (%s), but has value %s.",`
`31`	`31`	`propertyName(), elementName(), shortUri( otherProperty.getURI() ), allowedValue, actualValue );`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,15 @@`
`27`	`27`	`public record EvaluationContext( Resource element, Shape shape, Optional<Shape.Property> propertyShape, Optional<Property> property,`
`28`	`28`	`List<Statement> offendingStatements, ShaclValidator validator, Model resolvedModel ) {`
`29`	`29`	`public EvaluationContext withProperty( final Property newProperty ) {`
`30`		`- return new EvaluationContext( element(), shape(), Optional.of( newProperty ), offendingStatements(), validator(), resolvedModel );`
	`30`	`+ return new EvaluationContext( element(), shape(), propertyShape(), Optional.of( newProperty ), offendingStatements(), validator(),`
	`31`	`+ resolvedModel );`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public EvaluationContext withElement( final Resource newElement ) {`
`34`		`- return new EvaluationContext( newElement, shape(), property(), offendingStatements(), validator(), resolvedModel );`
	`35`	`+ return new EvaluationContext( newElement, shape(), propertyShape(), property(), offendingStatements(), validator(), resolvedModel );`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public EvaluationContext withOffendingStatements( final List<Statement> newOffendingStatements ) {`
`38`		`- return new EvaluationContext( element(), shape(), property(), newOffendingStatements, validator(), resolvedModel );`
	`39`	`+ return new EvaluationContext( element(), shape(), propertyShape(), property(), newOffendingStatements, validator(), resolvedModel );`
`39`	`40`	`}`
`40`	`41`	`}`