Correctly handle unbound variables in SHACL SPARQLConstraints

Author: atextor

core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/shacl/constraint/SparqlConstraint.java

@@ -51,7 +51,9 @@ public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext con
          final ResultSet resultSet = queryExecution.execSelect();
          while ( resultSet.hasNext() ) {
             final QuerySolution solution = resultSet.next();
-            final Map<String, RDFNode> bindings = resultSet.getResultVars().stream().collect( Collectors.toMap( Function.identity(), solution::get ) );
+            final Map<String, RDFNode> bindings = resultSet.getResultVars().stream()
+                  .filter( resultVar -> solution.get( resultVar ) != null )
+                  .collect( Collectors.toMap( Function.identity(), solution::get ) );
             results.add( new SparqlConstraintViolation( context, message, bindings ) );
          }
       }

core/sds-aspect-model-validator/src/test/java/io/openmanufacturing/sds/aspectmodel/validation/services/AspectModelValidatorTest.java

@@ -14,6 +14,7 @@
 package io.openmanufacturing.sds.aspectmodel.validation.services;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -98,9 +99,11 @@ public void testValidateProperty( final TestProperty testProperty ) {
    @ParameterizedTest
    @MethodSource( "invalidTestModels" )
    public void testValidateInvalidTestAspectModel( final InvalidTestAspect testModel, final KnownVersion metaModelVersion ) {
-      final Try<VersionedModel> invalidAspectModel = TestResources.getModel( testModel, metaModelVersion );
-      final List<Violation> violations = service.get( metaModelVersion ).validateModel( invalidAspectModel );
-      assertThat( violations ).isNotEmpty();
+      assertThatCode( () -> {
+         final Try<VersionedModel> invalidAspectModel = TestResources.getModel( testModel, metaModelVersion );
+         final List<Violation> violations = service.get( metaModelVersion ).validateModel( invalidAspectModel );
+         assertThat( violations ).isNotEmpty();
+      } ).doesNotThrowAnyException();
    }
 
    @ParameterizedTest

core/sds-test-aspect-models/src/main/java/io/openmanufacturing/sds/test/InvalidTestAspect.java

@@ -25,7 +25,8 @@ public enum InvalidTestAspect implements TestModel {
    INVALID_SYNTAX,
    MISSING_ASPECT_DECLARATION,
    INVALID_EXAMPLE_VALUE_DATATYPE,
-   INVALID_PREFERRED_NAME_DATATYPE;
+   INVALID_PREFERRED_NAME_DATATYPE,
+   RANGE_CONSTRAINT_WITH_WRONG_TYPE;
 
    @Override
    public String getName() {

core/sds-test-aspect-models/src/main/resources/invalid/bamm_2_0_0/io.openmanufacturing.test/1.0.0/RangeConstraintWithWrongType.ttl

@@ -0,0 +1,16 @@
+@prefix bamm: <urn:bamm:io.openmanufacturing:meta-model:2.0.0#>.
+@prefix bamm-c: <urn:bamm:io.openmanufacturing:characteristic:2.0.0#>.
+@prefix bamm-e: <urn:bamm:io.openmanufacturing:entity:2.0.0#>.
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
+@prefix : <urn:bamm:io.openmanufacturing.test:1.0.0#>.
+
+:NumberTrait a bamm-c:Trait ;
+   bamm-c:baseCharacteristic :NumberList;
+   bamm-c:constraint :RangeConstraintWithWrongType .
+
+:RangeConstraintWithWrongType a bamm-c:RangeConstraint;
+   bamm-c:minValue "5"^^xsd:nonNegativeInteger ;
+   bamm-c:maxValue "10"^^xsd:nonNegativeInteger .
+
+:NumberList a bamm-c:List ;
+   bamm:dataType xsd:float .