Fix code and tests that broke due to merge

Author: atextor

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

@@ -80,7 +80,7 @@ public List<Violation> validateModel( final VersionedModel versionedModel ) {
       cycleDetectionReport.clear();
 
       model = versionedModel.getModel();
-      final Optional<KnownVersion> metaModelVersion = KnownVersion.fromVersionString( versionedModel.getVersion().toString() );
+      final Optional<KnownVersion> metaModelVersion = KnownVersion.fromVersionString( versionedModel.getMetaModelVersion().toString() );
       bamm = new BAMM( metaModelVersion.get() );
       initializeQuery( metaModelVersion.get() );
 

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

@@ -76,7 +76,8 @@ public void testValidAspect( final KnownVersion metaModelVersion ) {
          "ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_MIN_VALUE", // uses bamm-c:OPEN
          "ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_UPPER_BOUND", // uses bamm-c:OPEN
          "ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_UPPER_BOUND_INCL_BOUND_DEFINITION", // uses bamm-c:OPEN
-         "MODEL_WITH_CYCLES" // contains cycles
+         "MODEL_WITH_CYCLES",
+         "MODEL_WITH_BROKEN_CYCLES"// contains cycles
    } )
    public void testValidateTestAspectModel( final TestAspect testAspect ) {
       final KnownVersion metaModelVersion = KnownVersion.getLatest();
@@ -147,7 +148,7 @@ public void testValidateInvalidModelElement( final KnownVersion metaModelVersion
       final BAMM bamm = new BAMM( metaModelVersion );
       assertThat( violation.context().element() ).isEqualTo( element );
       assertThat( violation.context().property().get() ).isEqualTo( bamm.exampleValue() );
-      assertThat( violation.bindings().get( "value" ).asResource().getURI() ).isEqualTo( XSD.xint.getURI() );
+      assertThat( violation.bindings().get( "value" ).asLiteral().getString() ).isEqualTo( XSD.xint.getURI() );
    }
 
    @ParameterizedTest