Merge pull request #352 from bci-oss/bugfix/esmf-fix-validation-issues

Fix validation issues after update to esmf.

Author: atextor

core/esmf-aspect-meta-model-resolver/pom.xml

@@ -29,7 +29,9 @@
    <packaging>jar</packaging>
 
    <properties>
-      <samm-revision>https://raw.githubusercontent.com/eclipse-esmf/esmf-semantic-aspect-meta-model/34468bf</samm-revision>
+      <samm-revision>
+         https://raw.githubusercontent.com/eclipse-esmf/esmf-semantic-aspect-meta-model/bf9196547384bf072095cc8300d45ca7117a3211/esmf-semantic-aspect-meta-model
+      </samm-revision>
    </properties>
 
    <dependencies>
@@ -144,8 +146,6 @@
 
          <!-- Download updated meta model shape files -->
          <!-- This refers to the state of the shape files after merging of https://github.com/eclipse-esmf/esmf-semantic-aspect-meta-model/pull/176 -->
-         <!-- TODO: Enable this section once https://github.com/eclipse-esmf/esmf-semantic-aspect-meta-model/pull/186 has been merged -->
-         <!--
          <plugin>
             <groupId>com.googlecode.maven-download-plugin</groupId>
             <artifactId>download-maven-plugin</artifactId>
@@ -221,7 +221,6 @@
                </execution>
             </executions>
          </plugin>
-         -->
 
       </plugins>
    </build>

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

@@ -13,11 +13,15 @@
 
 package org.eclipse.esmf.aspectmodel.versionupdate.migrator;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Statement;
+import org.eclipse.esmf.aspectmodel.vocabulary.Namespace;
 import org.eclipse.esmf.samm.KnownVersion;
 
 /**
@@ -67,4 +71,24 @@ protected Optional<String> rewriteUri( final String oldUri, final Map<String, St
       result = result.replace( "urn:bamm:", "urn:samm:" );
       return Optional.of( result );
    }
+
+   @Override
+   public Model migrate( final Model sourceModel ) {
+      final Map<String, String> targetPrefixes = Namespace.createPrefixMap( getTargetKnownVersion() );
+      final Map<String, String> oldToNewNamespaces = buildReplacementPrefixMap( sourceModel, targetPrefixes );
+
+      final List<Statement> remappedStatements = new ArrayList<>();
+
+      // it is important to do the remapping "in situ" (in the same model), because otherwise the position information would be lost.
+      sourceModel.listStatements().forEach( statement ->
+            remappedStatements.add( sourceModel.createStatement( updateResource( statement.getSubject(), oldToNewNamespaces ),
+                  updateProperty( statement.getPredicate(), oldToNewNamespaces ),
+                  updateRdfNode( statement.getObject(), oldToNewNamespaces ) ) )
+      );
+
+      sourceModel.removeAll();
+      remappedStatements.forEach( sourceModel::add );
+      sourceModel.setNsPrefixes( buildPrefixMap( sourceModel, targetPrefixes, oldToNewNamespaces ) );
+      return sourceModel;
+   }
 }