Adapt esmf-aspect-meta-model-version-migrator to SAMM 2.1.0

Author: atextor

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

@@ -15,23 +15,22 @@
 import java.util.List;
 
 import org.eclipse.esmf.aspectmodel.resolver.AspectMetaModelResourceResolver;
-import org.eclipse.esmf.aspectmodel.versionupdate.migrator.Migrator;
-
-import com.google.common.collect.ImmutableList;
-
-import org.eclipse.esmf.samm.KnownVersion;
-
 import org.eclipse.esmf.aspectmodel.resolver.services.SammAspectMetaModelResourceResolver;
+import org.eclipse.esmf.aspectmodel.versionupdate.migrator.Migrator;
 import org.eclipse.esmf.aspectmodel.versionupdate.migrator.SammMetaModelVersionUriRewriter;
 import org.eclipse.esmf.aspectmodel.versionupdate.migrator.SammRemoveSammNameMigrator;
 import org.eclipse.esmf.aspectmodel.versionupdate.migrator.UnitInSammNamespaceMigrator;
+import org.eclipse.esmf.samm.KnownVersion;
+
+import com.google.common.collect.ImmutableList;
 
 /**
  * Includes all SAMM migrators
  */
 public class SammMigratorFactory {
    private final SammAspectMetaModelResourceResolver metaModelResourceResolver = new SammAspectMetaModelResourceResolver();
    private final List<Migrator> migrators = ImmutableList.<Migrator> builder()
+         .add( new SammMetaModelVersionUriRewriter( KnownVersion.SAMM_2_0_0, KnownVersion.SAMM_2_1_0 ) )
          .add( new SammMetaModelVersionUriRewriter( KnownVersion.SAMM_1_0_0, KnownVersion.SAMM_2_0_0 ) )
          .add( new SammRemoveSammNameMigrator( KnownVersion.SAMM_1_0_0, KnownVersion.SAMM_2_0_0 ) )
          .add( new UnitInSammNamespaceMigrator() )

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

@@ -22,25 +22,23 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.eclipse.esmf.aspectmodel.VersionNumber;
+import org.eclipse.esmf.aspectmodel.resolver.services.VersionedModel;
+import org.eclipse.esmf.aspectmodel.vocabulary.SAMM;
+import org.eclipse.esmf.samm.KnownVersion;
+import org.eclipse.esmf.test.MetaModelVersions;
+import org.eclipse.esmf.test.TestAspect;
+
+import com.google.common.collect.Streams;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.vocabulary.RDF;
 import org.assertj.core.api.Assertions;
-import org.eclipse.esmf.aspectmodel.VersionNumber;
-import org.eclipse.esmf.aspectmodel.resolver.services.VersionedModel;
-import org.eclipse.esmf.aspectmodel.vocabulary.SAMM;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import com.google.common.collect.Streams;
-
-import org.eclipse.esmf.samm.KnownVersion;
-
-import org.eclipse.esmf.test.MetaModelVersions;
-import org.eclipse.esmf.test.TestAspect;
-
 public class MigratorTest extends MetaModelVersions {
 
    private final MigratorService migratorService = new MigratorService();
@@ -66,7 +64,8 @@ public void testUriRewriting( final KnownVersion metaModelVersion ) {
       final VersionedModel versionedModel = TestResources.getModelWithoutResolution( TestAspect.ASPECT, metaModelVersion );
       final VersionedModel rewrittenModel = migratorService.updateMetaModelVersion( versionedModel ).get();
 
-      Assertions.assertThat( rewrittenModel.getMetaModelVersion() ).isEqualTo( VersionNumber.parse( KnownVersion.getLatest().toVersionString() ) );
+      Assertions.assertThat( rewrittenModel.getMetaModelVersion() )
+            .isEqualTo( VersionNumber.parse( KnownVersion.getLatest().toVersionString() ) );
       final Model model = rewrittenModel.getRawModel();
       assertThat( model.getNsPrefixURI( "samm" ) ).contains( KnownVersion.getLatest().toVersionString() );
 
@@ -81,25 +80,28 @@ public void testUriRewriting( final KnownVersion metaModelVersion ) {
    @ParameterizedTest
    @MethodSource( "allVersions" )
    public void testUriRewritingDoesNotChangeCustomNamespaces( final KnownVersion metaModelVersion ) {
-      final VersionedModel versionedModel = TestResources.getModelWithoutResolution( TestAspect.ASPECT_WITH_CUSTOM_NAMESPACE, metaModelVersion );
+      final VersionedModel versionedModel = TestResources.getModelWithoutResolution( TestAspect.ASPECT_WITH_CUSTOM_NAMESPACE,
+            metaModelVersion );
       final VersionedModel rewrittenModel = migratorService.updateMetaModelVersion( versionedModel ).get();
 
       assertThat( rewrittenModel.getRawModel().getNsPrefixMap() ).containsKey( "custom" );
    }
 
    @Test
    public void testMigrateUnitsToSammNamespace() {
-      final VersionedModel oldModel = TestResources.getModelWithoutResolution( TestAspect.ASPECT_WITH_CUSTOM_UNIT, KnownVersion.SAMM_1_0_0 );
+      final VersionedModel oldModel = TestResources.getModelWithoutResolution( TestAspect.ASPECT_WITH_CUSTOM_UNIT,
+            KnownVersion.SAMM_1_0_0 );
       final Model rewrittenModel = migratorService.updateMetaModelVersion( oldModel ).get().getRawModel();
-      final SAMM samm = new SAMM( KnownVersion.SAMM_2_0_0 );
+      final SAMM samm = new SAMM( KnownVersion.getLatest() );
 
       assertThat( rewrittenModel.contains( null, RDF.type, samm.Unit() ) ).isTrue();
       assertThat( rewrittenModel.contains( null, samm.symbol(), (RDFNode) null ) ).isTrue();
       assertThat( rewrittenModel.contains( null, samm.quantityKind(), (RDFNode) null ) ).isTrue();
       final Set<String> uris = getAllUris( rewrittenModel );
-      assertThat( uris ).noneMatch( uri -> uri.contains( "urn:samm:org.eclipse.esmf.samm:unit:2.0.0#Unit" ) );
-      assertThat( uris ).noneMatch( uri -> uri.contains( "urn:samm:org.eclipse.esmf.samm:unit:2.0.0#symbol" ) );
-      assertThat( uris ).noneMatch( uri -> uri.contains( "urn:samm:org.eclipse.esmf.samm:unit:2.0.0#quantityKind" ) );
+      final String sammVersion = KnownVersion.getLatest().toVersionString();
+      assertThat( uris ).noneMatch( uri -> uri.contains( "urn:samm:org.eclipse.esmf.samm:unit:" + sammVersion + "#Unit" ) );
+      assertThat( uris ).noneMatch( uri -> uri.contains( "urn:samm:org.eclipse.esmf.samm:unit:" + sammVersion + "#symbol" ) );
+      assertThat( uris ).noneMatch( uri -> uri.contains( "urn:samm:org.eclipse.esmf.samm:unit:" + sammVersion + "#quantityKind" ) );
    }
 
    @ParameterizedTest