Incorporate PR suggestions

atextor · atextor · commit 6573c60d0d16 · 2022-11-04T15:04:44.000+01:00
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/constraint/OrConstraint.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/constraint/OrConstraint.java
@@ -30,7 +30,7 @@ public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext con
       final List<Violation> result = new ArrayList<>();
       for ( final Constraint constraint : constraints ) {
          final List<Violation> violations = constraint.apply( rdfNode, context );
-         if ( violations.isEmpty() && result.isEmpty() ) {
+         if ( violations.isEmpty() ) {
             return List.of();
          }
          result.addAll( violations );
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/ClassTypeViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/ClassTypeViolation.java
@@ -25,7 +25,7 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has type %s, but only %s is allowed",
+      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/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/ClosedViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/ClosedViolation.java
@@ -34,7 +34,7 @@ public String message() {
             .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",
+      return String.format( "%s is used on %s. It is not allowed there; allowed are only %s.",
             shortUri( actual.getURI() ), elementName(), allowed );
    }
 
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/DatatypeViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/DatatypeViolation.java
@@ -39,12 +39,12 @@ public String errorCode() {
    public String message() {
       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",
+               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",
+               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",
+      return String.format( "%s uses data type %s, but only %s is allowed.",
             elementName(), shortUri( actualTypeUri ), shortUri( allowedTypeUri ) );
    }
 
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/DisjointViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/DisjointViolation.java
@@ -26,7 +26,7 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s may not have the same value as property %s (%s)",
+      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/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/EqualsViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/EqualsViolation.java
@@ -26,7 +26,7 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s must have the same value as property %s (%s), but has value %s",
+      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/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/InvalidValueViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/InvalidValueViolation.java
@@ -25,8 +25,8 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has value %s, but only %s is allowed",
-            propertyName(), elementName(), actual, allowed );
+      return String.format( "Property %s on %s has value %s, but only %s is allowed.",
+            propertyName(), elementName(), value( actual ), value( allowed ) );
    }
 
    @Override
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/JsConstraintViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/JsConstraintViolation.java
@@ -41,8 +41,8 @@ public String errorCode() {
    public String message() {
       if ( constraintMessage().isEmpty() ) {
          return context.property().isPresent() ?
-               String.format( "Property %s on %s is invalid", propertyName(), elementName() ) :
-               String.format( "%s is invalid", elementName() );
+               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() ) {
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/LanguageFromListViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/LanguageFromListViolation.java
@@ -25,7 +25,7 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has language tag %s, which is not in the list of allowed languages: %s",
+      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/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/LessThanOrEqualsViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/LessThanOrEqualsViolation.java
@@ -26,8 +26,8 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s must have a value that is less than or equal to that of %s: %s must less than %s",
-            propertyName(), elementName(), shortUri( otherProperty.getURI() ), actualValue, otherValue );
+      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 ) );
    }
 
    @Override
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/LessThanViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/LessThanViolation.java
@@ -26,8 +26,8 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s must have a value that is less than that of %s: %s must less than %s",
-            propertyName(), elementName(), shortUri( otherProperty.getURI() ), actualValue, otherValue );
+      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 ) );
    }
 
    @Override
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MaxCountViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MaxCountViolation.java
@@ -24,8 +24,8 @@ public String errorCode() {
    @Override
    public String message() {
       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",
+            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.",
                   propertyName(), actual, actual > 1 ? "s" : "", elementName(), allowed, allowed > 1 ? "s" : "" );
    }
 
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MaxExclusiveViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MaxExclusiveViolation.java
@@ -25,8 +25,8 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has value %s, but it must be less than %s",
-            propertyName(), elementName(), actual, max );
+      return String.format( "Property %s on %s has value %s, but it must be less than %s.",
+            propertyName(), elementName(), value( actual ), value( max ) );
    }
 
    @Override
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MaxInclusiveViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MaxInclusiveViolation.java
@@ -25,8 +25,8 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has value %s, but it must be less than or equal to %s",
-            propertyName(), elementName(), actual, max );
+      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 ) );
    }
 
    @Override
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MaxLengthViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MaxLengthViolation.java
@@ -23,7 +23,7 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has length %s, but its length must be less than or equal to %s",
+      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/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MinCountViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MinCountViolation.java
@@ -24,8 +24,8 @@ public String errorCode() {
    @Override
    public String message() {
       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",
+            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.",
                   propertyName(), elementName(), allowed, allowed > 1 ? "s" : "", actual, actual > 1 ? "s" : "" );
    }
 
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MinExclusiveViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MinExclusiveViolation.java
@@ -25,8 +25,8 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has value %s, but it must be greater than %s",
-            propertyName(), elementName(), actual, min );
+      return String.format( "Property %s on %s has value %s, but it must be greater than %s.",
+            propertyName(), elementName(), value( actual ), value( min ) );
    }
 
    @Override
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MinInclusiveViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MinInclusiveViolation.java
@@ -25,8 +25,8 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has value %s, but it must be greater than or equal to %s",
-            propertyName(), elementName(), actual, min );
+      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 ) );
    }
 
    @Override
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MinLengthViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MinLengthViolation.java
@@ -23,7 +23,7 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has length %s, but its length must be greater than or equal to %s",
+      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/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MissingTypeViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/MissingTypeViolation.java
@@ -23,7 +23,7 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Could not determine type of %s", elementName() );
+      return String.format( "Could not determine type of %s.", elementName() );
    }
 
    @Override
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/NodeKindViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/NodeKindViolation.java
@@ -36,14 +36,14 @@ public String message() {
          case IRIOrLiteral -> "a named element or a value";
       };
       if ( context.property().isPresent() ) {
-         return String.format( "Property %s on %s is %s, but it must be %s",
+         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 ) );
       }
       return context.element().isAnon() ?
-            String.format( "The element is %s, but it must be %s",
+            String.format( "The element is %s, but it must be %s.",
                   nodeKindString.apply( actualNodeKind ), nodeKindString.apply( allowedNodeKind ) ) :
-            String.format( "Element %s is %s, but it must be %s",
+            String.format( "Element %s is %s, but it must be %s.",
                   elementName(), nodeKindString.apply( actualNodeKind ), nodeKindString.apply( allowedNodeKind ) );
    }
 
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/NotViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/NotViolation.java
@@ -26,8 +26,8 @@ public String errorCode() {
    @Override
    public String message() {
       return context.property().isPresent() ?
-            String.format( "Expected violation of constraint %s on %s on %s, but did not occur", negatedConstraint.name(), propertyName(), elementName() ) :
-            String.format( "Expected violation of constraint %s on element %s, but 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/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/PatternViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/PatternViolation.java
@@ -23,7 +23,7 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has value %s, this must match the pattern %s but it does not",
+      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/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/SparqlConstraintViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/SparqlConstraintViolation.java
@@ -34,9 +34,9 @@ public String errorCode() {
    public String message() {
       if ( constraintMessage().isEmpty() ) {
          if ( context.property().isPresent() ) {
-            return String.format( "Property %s on %s is invalid", propertyName(), elementName() );
+            return String.format( "Property %s on %s is invalid.", propertyName(), elementName() );
          }
-         return String.format( "%s is invalid", elementName() );
+         return String.format( "%s is invalid.", elementName() );
       }
 
       String interpolatedMessage = constraintMessage();
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/UniqueLanguageViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/UniqueLanguageViolation.java
@@ -25,7 +25,7 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s uses language tag that has has been used already: %s",
+      return String.format( "Property %s on %s uses language tag that has been used already: %s.",
             propertyName(), elementName(), duplicates );
    }
 
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/ValueFromListViolation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/ValueFromListViolation.java
@@ -14,6 +14,7 @@
 package io.openmanufacturing.sds.aspectmodel.shacl.violation;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.jena.rdf.model.RDFNode;
 
@@ -27,8 +28,8 @@ public String errorCode() {
 
    @Override
    public String message() {
-      return String.format( "Property %s on %s has value %s which is not in the list of allowed values: %s",
-            propertyName(), elementName(), actual, allowed );
+      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( ", ", "[", "]" ) ) );
    }
 
    @Override
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/Violation.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/violation/Violation.java
@@ -16,6 +16,9 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
 
 import io.openmanufacturing.sds.aspectmodel.shacl.fix.Fix;
@@ -156,7 +159,9 @@ default AppliesTo appliesTo() {
    }
 
    default String shortUri( final String uri ) {
-      return context().element().getModel().shortForm( uri );
+      final String shortened = context().element().getModel().shortForm( uri );
+      return shortened.equals( uri ) ?
+            context().validator().getShapesModel().shortForm( uri ) : shortened;
    }
 
    default String elementName() {
@@ -169,6 +174,24 @@ default String propertyName() {
       return context().property().map( Resource::getURI ).map( this::shortUri ).orElse( elementName() );
    }
 
+   default String value( final Property property ) {
+      return shortUri( property.getURI() );
+   }
+
+   default String value( final RDFNode node ) {
+      if ( node.isLiteral() ) {
+         return value( node.asLiteral() );
+      }
+      if ( node.isURIResource() ) {
+         return shortUri( node.asResource().getURI() );
+      }
+      return "anonymous element";
+   }
+
+   default String value( final Literal literal ) {
+      return literal.getLexicalForm();
+   }
+
    default List<Fix> fixes() {
       return List.of();
    }
diff --git a/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/validation/services/DetailedViolationFormatter.java b/core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/validation/services/DetailedViolationFormatter.java
diff --git a/core/sds-aspect-model-validator/src/test/java/io/openmanufacturing/sds/aspectmodel/shacl/ShaclValidatorTest.java b/core/sds-aspect-model-validator/src/test/java/io/openmanufacturing/sds/aspectmodel/shacl/ShaclValidatorTest.java
diff --git a/core/sds-aspect-model-validator/src/test/resources/JsConstraintTest.js b/core/sds-aspect-model-validator/src/test/resources/JsConstraintTest.js
diff --git a/core/sds-test-aspect-models/src/main/resources/invalid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/InvalidPreferredNameDatatype.ttl b/core/sds-test-aspect-models/src/main/resources/invalid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/InvalidPreferredNameDatatype.ttl
diff --git a/documentation/developer-guide/modules/tooling-guide/pages/maven-plugin.adoc b/documentation/developer-guide/modules/tooling-guide/pages/maven-plugin.adoc
diff --git a/tools/sds-aspect-model-maven-plugin/src/main/java/io/openmanufacturing/sds/aspectmodel/AspectModelMojo.java b/tools/sds-aspect-model-maven-plugin/src/main/java/io/openmanufacturing/sds/aspectmodel/AspectModelMojo.java

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext con`
`30`	`30`	`final List<Violation> result = new ArrayList<>();`
`31`	`31`	`for ( final Constraint constraint : constraints ) {`
`32`	`32`	`final List<Violation> violations = constraint.apply( rdfNode, context );`
`33`		`- if ( violations.isEmpty() && result.isEmpty() ) {`
	`33`	`+ if ( violations.isEmpty() ) {`
`34`	`34`	`return List.of();`
`35`	`35`	`}`
`36`	`36`	`result.addAll( violations );`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public String errorCode() {`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public String message() {`
`28`		`- return String.format( "Property %s on %s has type %s, but only %s is allowed",`
	`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`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public String message() {`
`34`	`34`	`.map( Property::getURI )`
`35`	`35`	`.map( this::shortUri )`
`36`	`36`	`.collect( Collectors.toSet() );`
`37`		`- return String.format( "%s is used on %s. It is not allowed there; allowed are only %s",`
	`37`	`+ return String.format( "%s is used on %s. It is not allowed there; allowed are only %s.",`
`38`	`38`	`shortUri( actual.getURI() ), elementName(), allowed );`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public String errorCode() {`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`public String message() {`
`29`		`- return String.format( "Property %s on %s may not have the same value as property %s (%s)",`
	`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`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ public String errorCode() {`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public String message() {`
`28`		`- return String.format( "Property %s on %s has value %s, but only %s is allowed",`
`29`		`- propertyName(), elementName(), actual, allowed );`
	`28`	`+ return String.format( "Property %s on %s has value %s, but only %s is allowed.",`
	`29`	`+ propertyName(), elementName(), value( actual ), value( allowed ) );`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public String errorCode() {`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`public String message() {`
`29`		`- return String.format( "Property %s on %s must have a value that is less than or equal to that of %s: %s must less than %s",`
`30`		`- propertyName(), elementName(), shortUri( otherProperty.getURI() ), actualValue, otherValue );`
	`29`	`+ 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.",`
	`30`	`+ propertyName(), elementName(), shortUri( otherProperty.getURI() ), value( actualValue ), value( otherValue ) );`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`