Adapt esmf-aspect-meta-model-resolver to SAMM 2.1.0

Author: atextor

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

@@ -30,7 +30,7 @@
 
    <properties>
       <samm-revision>
-         https://raw.githubusercontent.com/eclipse-esmf/esmf-semantic-aspect-meta-model/bf9196547384bf072095cc8300d45ca7117a3211/esmf-semantic-aspect-meta-model
+         https://raw.githubusercontent.com/eclipse-esmf/esmf-semantic-aspect-meta-model/179f97e7f12e3f05d5daa1211ff414d07d3b2f9e/esmf-semantic-aspect-meta-model
       </samm-revision>
    </properties>
 
@@ -185,6 +185,23 @@
                      <skipCache>true</skipCache>
                   </configuration>
                </execution>
+               <execution>
+                  <id>download-meta-model-shapes-2-1-0</id>
+                  <phase>process-resources</phase>
+                  <goals>
+                     <goal>wget</goal>
+                  </goals>
+                  <configuration>
+                     <url>
+                        ${samm-revision}/src/main/resources/samm/meta-model/2.1.0/aspect-meta-model-shapes.ttl
+                     </url>
+                     <outputFileName>aspect-meta-model-shapes.ttl</outputFileName>
+                     <outputDirectory>${project.build.directory}/classes/samm/meta-model/2.1.0</outputDirectory>
+                     <overwrite>true</overwrite>
+                     <followRedirects>true</followRedirects>
+                     <skipCache>true</skipCache>
+                  </configuration>
+               </execution>
                <execution>
                   <id>download-characteristics-shapes-1-0-0</id>
                   <phase>process-resources</phase>
@@ -219,6 +236,23 @@
                      <skipCache>true</skipCache>
                   </configuration>
                </execution>
+               <execution>
+                  <id>download-characteristics-shapes-2-1-0</id>
+                  <phase>process-resources</phase>
+                  <goals>
+                     <goal>wget</goal>
+                  </goals>
+                  <configuration>
+                     <url>
+                        ${samm-revision}/src/main/resources/samm/characteristic/2.1.0/characteristic-shapes.ttl
+                     </url>
+                     <outputFileName>characteristic-shapes.ttl</outputFileName>
+                     <outputDirectory>${project.build.directory}/classes/samm/characteristic/2.1.0</outputDirectory>
+                     <overwrite>true</overwrite>
+                     <followRedirects>true</followRedirects>
+                     <skipCache>true</skipCache>
+                  </configuration>
+               </execution>
             </executions>
          </plugin>
 

core/esmf-aspect-meta-model-resolver/src/test/java/org/eclipse/esmf/aspectmodel/resolver/services/DataTypeTest.java

@@ -31,6 +31,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import org.eclipse.esmf.metamodel.datatypes.Curie;
+
 import lombok.Value;
 
 public class DataTypeTest {
@@ -84,6 +85,11 @@ public <T> void testConfigurableParserChecks( final TestConfiguration<T> testCon
    private static class TestConfiguration<T> {
       TypedRdfDatatype<T> type;
       Map<String, Predicate<T>> predicates;
+
+      @Override
+      public String toString() {
+         return type.toString();
+      }
    }
 
    static Stream<TestConfiguration<?>> getTestConfigurationsWithLexicalErrors() {
@@ -312,13 +318,13 @@ static Stream<TestConfiguration<?>> getValidTestConfigurations() {
 
       final Stream<TestConfiguration<Curie>> curieTypes =
             DataType.getAllSupportedTypes().stream()
-                    .filter( dataType -> dataType.getJavaClass() != null
-                          && dataType.getJavaClass().equals( Curie.class ) )
-                    .map( dataType -> (TypedRdfDatatype<Curie>) dataType )
-                    .map( curieType -> new TestConfiguration<>( curieType, Map.of(
-                          "xsd:string", v -> ((Curie) v).getValue().equals( "xsd:string" ),
-                          "unit:hectopascal", v -> ((Curie) v).getValue().equals( "unit:hectopascal" )
-                    ) ) );
+                  .filter( dataType -> dataType.getJavaClass() != null
+                        && dataType.getJavaClass().equals( Curie.class ) )
+                  .map( dataType -> (TypedRdfDatatype<Curie>) dataType )
+                  .map( curieType -> new TestConfiguration<>( curieType, Map.of(
+                        "xsd:string", v -> ((Curie) v).getValue().equals( "xsd:string" ),
+                        "unit:hectopascal", v -> ((Curie) v).getValue().equals( "unit:hectopascal" )
+                  ) ) );
 
       return Stream.concat( extendedXsdTypes, curieTypes );
    }