Merge pull request #374 from bci-oss/bugfix/esmf-363-resolution-old-models-fails

Fix problem with the resolution of the old BAMM 1.0.0 models.

Author: atextor

core/esmf-aspect-meta-model-version-migrator/src/main/java/org/eclipse/esmf/aspectmodel/versionupdate/migrator/BammUriRewriter.java

@@ -49,12 +49,18 @@ protected Map<String, String> buildPrefixMap( final Model sourceModel, final Map
 
    @Override
    protected Map<String, String> buildReplacementPrefixMap( final Model sourceModel, final Map<String, String> targetPrefixes ) {
+      final Map<String, String> oldSamm = Namespace.createPrefixMap( KnownVersion.SAMM_1_0_0 );
       // The mapping of the URNs of the legacy BAMM Aspect Meta model to their corresponding SAMM counterparts
       return Map.of(
             "urn:bamm:io.openmanufacturing:meta-model:2.0.0#", targetPrefixes.get( "samm" ),
             "urn:bamm:io.openmanufacturing:characteristic:2.0.0#", targetPrefixes.get( "samm-c" ),
-            "urn:bamm:io.openmanufacturing:entity:2.0.0#", targetPrefixes.get( "samm-c" ),
-            "urn:bamm:io.openmanufacturing:unit:2.0.0#", targetPrefixes.get( "unit" )
+            "urn:bamm:io.openmanufacturing:entity:2.0.0#", targetPrefixes.get( "samm-e" ),
+            "urn:bamm:io.openmanufacturing:unit:2.0.0#", targetPrefixes.get( "unit" ),
+
+            "urn:bamm:io.openmanufacturing:meta-model:1.0.0#", oldSamm.get( "samm" ),
+            "urn:bamm:io.openmanufacturing:characteristic:1.0.0#", oldSamm.get( "samm-c" ),
+            "urn:bamm:io.openmanufacturing:entity:1.0.0#", oldSamm.get( "samm-e" ),
+            "urn:bamm:io.openmanufacturing:unit:1.0.0#", oldSamm.get( "unit" )
       );
    }
 

core/esmf-aspect-model-resolver/src/test/java/org/eclipse/esmf/aspectmodel/resolver/AspectModelResolverTest.java

@@ -32,7 +32,6 @@
 import org.eclipse.esmf.aspectmodel.vocabulary.SAMM;
 import org.eclipse.esmf.samm.KnownVersion;
 import org.eclipse.esmf.test.MetaModelVersions;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -66,9 +65,9 @@ public void testLoadDataModelExpectSuccess( final KnownVersion metaModelVersion
             .isNotEmpty();
    }
 
-   @Test
-   public void testLoadLegacyBammModelExpectSuccess() throws URISyntaxException {
-      final KnownVersion metaModelVersion = KnownVersion.getLatest();
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testLoadLegacyBammModelExpectSuccess( final KnownVersion metaModelVersion ) throws URISyntaxException {
       final File aspectModelsRootDirectory = new File(
             AspectModelResolverTest.class.getClassLoader()
                   .getResource( metaModelVersion.toString().toLowerCase() )

core/esmf-aspect-model-resolver/src/test/resources/samm_1_0_0/org.eclipse.esmf.test/2.0.0/BammTest.ttl

@@ -0,0 +1,27 @@
+# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+# See the AUTHORS file(s) distributed with this work for additional
+# information regarding authorship.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+
+@prefix bamm:   <urn:bamm:io.openmanufacturing:meta-model:1.0.0#> .
+@prefix bamm-c: <urn:bamm:io.openmanufacturing:characteristic:1.0.0#> .
+@prefix bamm-e: <urn:bamm:io.openmanufacturing:entity:1.0.0#> .
+@prefix :       <urn:bamm:org.eclipse.esmf.test:2.0.0#> .
+@prefix unit:   <urn:bamm:io.openmanufacturing:unit:1.0.0#> .
+@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
+
+:BammTest a bamm:Aspect ;
+   bamm:name "BammTest" ;
+   bamm:preferredName "BAMM Test"@en ;
+   bamm:properties ( :property ) ;
+   bamm:operations ( ) .
+
+:property a bamm:Property ;
+   bamm:name "property" ;
+   bamm:characteristic bamm-c:Text .