Merge pull request #222 from bci-oss/221-validate-models-with-multiple-aspects

Successfully validate RDF models containing multiple Aspects

Author: atextor

core/sds-aspect-model-validator/src/main/java/io/openmanufacturing/sds/aspectmodel/validation/services/AspectModelValidator.java

@@ -43,6 +43,7 @@
 import io.openmanufacturing.sds.aspectmetamodel.KnownVersion;
 import io.openmanufacturing.sds.aspectmodel.UnsupportedVersionException;
 import io.openmanufacturing.sds.aspectmodel.resolver.ModelResolutionException;
+import io.openmanufacturing.sds.aspectmodel.resolver.exceptions.InvalidRootElementCountException;
 import io.openmanufacturing.sds.aspectmodel.resolver.exceptions.InvalidVersionException;
 import io.openmanufacturing.sds.aspectmodel.resolver.services.SdsAspectMetaModelResourceResolver;
 import io.openmanufacturing.sds.aspectmodel.resolver.services.VersionedModel;
@@ -130,14 +131,14 @@ public ValidationReport validate( final Try<VersionedModel> versionedModel ) {
                   if ( report.getProperty( SH.conforms ).getObject().asLiteral().getBoolean() ) {
                      // The SHACL validation succeeded. But to catch false positives, also try to load the model
                      final Try<Aspect> aspects = AspectModelLoader.fromVersionedModel( model );
-                     if ( aspects.isFailure() ) {
+                     if ( aspects.isFailure() && !(aspects.getCause() instanceof InvalidRootElementCountException) ) {
                         return new ValidationReportBuilder()
                               .withValidationErrors( List.of( new ValidationError.Processing(
-                                          "Validation succeeded, but an error was found while processing the model. "
-                                                + "This indicates an error in the model validation; please consider reporting this issue including the model "
-                                                + "at https://github.com/OpenManufacturingPlatform/sds-bamm-aspect-meta-model/issues -- "
-                                                + buildCauseMessage( aspects.getCause() ) ) ) )
-                                    .buildInvalidReport();
+                                    "Validation succeeded, but an error was found while processing the model. "
+                                          + "This indicates an error in the model validation; please consider reporting this issue including the model "
+                                          + "at https://github.com/OpenManufacturingPlatform/sds-bamm-aspect-meta-model/issues -- "
+                                          + buildCauseMessage( aspects.getCause() ) ) ) )
+                              .buildInvalidReport();
                      }
                      return new ValidationReportBuilder().buildValidReport();
                   }

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

@@ -312,4 +312,21 @@ public Void visit( final ValidationError.Processing error ) {
          }
       } );
    }
+
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testValidationWithMultipleAspects( final KnownVersion metaModelVersion ) {
+      final Try<VersionedModel> model = TestResources.getModel( TestAspect.ASPECT, metaModelVersion );
+      model.forEach( versionedModel -> {
+         final VersionedModel model2 = TestResources.getModel( TestAspect.ASPECT_WITH_SIMPLE_TYPES, metaModelVersion ).get();
+         versionedModel.getModel().add( model2.getRawModel() );
+         versionedModel.getRawModel().add( model2.getRawModel() );
+      } );
+
+      final ValidationReport report = service.validate( model );
+      if ( !report.conforms() ) {
+         report.getValidationErrors().forEach( System.out::println );
+      }
+      assertThat( report.conforms() ).isTrue();
+   }
 }