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

Author: atextor

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/loader/AspectModelLoader.java

@@ -60,9 +60,10 @@
 public class AspectModelLoader {
    private static final Logger LOG = LoggerFactory.getLogger( AspectModelLoader.class );
 
-   private static final Set<KnownVersion> supportedVersions = ImmutableSet.of(
+   private static final Set<KnownVersion> SUPPORTED_VERSIONS = ImmutableSet.of(
          KnownVersion.SAMM_1_0_0,
-         KnownVersion.SAMM_2_0_0
+         KnownVersion.SAMM_2_0_0,
+         KnownVersion.SAMM_2_1_0
    );
 
    private static final MigratorService migratorService = new MigratorService();
@@ -115,7 +116,7 @@ public static Try<List<ModelNamespace>> getNamespaces( final VersionedModel vers
     */
    public static Try<List<ModelElement>> getElements( final VersionedModel versionedModel ) {
       final Optional<KnownVersion> metaModelVersion = KnownVersion.fromVersionString( versionedModel.getMetaModelVersion().toString() );
-      if ( metaModelVersion.isEmpty() || !supportedVersions.contains( metaModelVersion.get() ) ) {
+      if ( metaModelVersion.isEmpty() || !SUPPORTED_VERSIONS.contains( metaModelVersion.get() ) ) {
          return Try.failure( new UnsupportedVersionException( versionedModel.getMetaModelVersion() ) );
       }
 

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/loader/CurieRdfType.java

@@ -83,7 +83,7 @@ public int getHashCode( final LiteralLabel lit ) {
 
    @Override
    public Class<Curie> getJavaClass() {
-      return (Class<Curie>) Curie.class;
+      return Curie.class;
    }
 
    @Override