Improvements from PR review.

Author: RaMisess

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

@@ -31,11 +31,7 @@ public interface ComplexType extends Type, StructureElement {
    default List<ComplexType> getExtendingElements() {
       return Collections.emptyList();
    }
-
-   default List<ComplexType> getExtendingElements( final ExtendedAspectContext context ) {
-      return Collections.emptyList();
-   }
-
+   
    default boolean isAbstractEntity() {
       return false;
    }

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

@@ -16,7 +16,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.metamodel.AbstractEntity;
 import org.eclipse.esmf.metamodel.ComplexType;
 import org.eclipse.esmf.metamodel.Property;
@@ -28,14 +27,14 @@ public static DefaultAbstractEntity createDefaultAbstractEntity(
          final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties,
          final Optional<ComplexType> _extends,
-         final List<AspectModelUrn> extendingElements ) {
+         final List<ComplexType> extendingElements ) {
       return new DefaultAbstractEntity( metaModelBaseAttributes, properties, _extends, extendingElements );
    }
 
    public DefaultAbstractEntity( final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties,
          final Optional<ComplexType> _extends,
-         final List<AspectModelUrn> extendingElements ) {
+         final List<ComplexType> extendingElements ) {
       super( metaModelBaseAttributes, properties, _extends, extendingElements );
    }
 

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/impl/DefaultAbstractEntity.java

@@ -14,42 +14,25 @@
 package org.eclipse.esmf.metamodel.impl;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.WeakHashMap;
-import java.util.stream.Collectors;
 
-import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
-import org.eclipse.esmf.metamodel.Aspect;
 import org.eclipse.esmf.metamodel.ComplexType;
-import org.eclipse.esmf.metamodel.ExtendedAspectContext;
 import org.eclipse.esmf.metamodel.Property;
 import org.eclipse.esmf.metamodel.loader.MetaModelBaseAttributes;
 import org.eclipse.esmf.metamodel.visitor.AspectVisitor;
 
 public class DefaultComplexType extends ModelElementImpl implements ComplexType {
-
-   /**
-    * Used to keep track of all {@link ComplexType} instances regardles of whether they are directly or indirectly
-    * referenced in the {@link Aspect}.
-    */
-   private static final WeakHashMap<AspectModelUrn, ComplexType> instances = new WeakHashMap<>();
-
    private final List<Property> properties;
    private final Optional<ComplexType> _extends;
-   private final List<AspectModelUrn> extendingElements;
+   private final List<ComplexType> extendingElements;
 
    protected DefaultComplexType(
          final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties,
          final Optional<ComplexType> _extends,
-         final List<AspectModelUrn> extendingElements ) {
+         final List<ComplexType> extendingElements ) {
       super( metaModelBaseAttributes );
-      //noinspection OptionalGetWithoutIsPresent
-      instances.put( metaModelBaseAttributes.getUrn().get(), this );
       this.properties = new ArrayList<>( properties );
       this._extends = _extends;
       this.extendingElements = extendingElements;
@@ -71,26 +54,11 @@ public Optional<ComplexType> getExtends() {
    }
 
    /**
-    * @return all {@link ComplexType} instances from the {@link DefaultComplexType#instances} Map which extend this
-    *       Abstract Entity.
+    * @return all {@link ComplexType} instances which extend this Abstract Entity.
     */
-   @Deprecated( forRemoval = true )
    @Override
    public List<ComplexType> getExtendingElements() {
-      return extendingElements.stream().map( instances::get ).filter( Objects::nonNull ).collect( Collectors.toList() );
-   }
-
-   @Override
-   public List<ComplexType> getExtendingElements( final ExtendedAspectContext context ) {
-      return extendingElements.stream()
-            .map( urn -> context.loadedElements().get( urn ) )
-            .filter( Objects::nonNull )
-            .map( modelElement -> (ComplexType) modelElement )
-            .collect( Collectors.toList() );
-   }
-
-   public static Map<AspectModelUrn, ComplexType> getInstances() {
-      return Collections.unmodifiableMap( instances );
+      return extendingElements;
    }
 
    @Override

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/impl/DefaultComplexType.java

@@ -16,7 +16,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.metamodel.ComplexType;
 import org.eclipse.esmf.metamodel.Entity;
 import org.eclipse.esmf.metamodel.Property;
@@ -40,7 +39,7 @@ public DefaultEntity(
          final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties,
          final Optional<ComplexType> _extends,
-         final List<AspectModelUrn> extendingElements ) {
+         final List<ComplexType> extendingElements ) {
       super( metaModelBaseAttributes, properties, _extends, extendingElements );
    }
 

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/impl/DefaultEntity.java

@@ -19,7 +19,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -35,12 +34,10 @@
 import org.eclipse.esmf.aspectmodel.resolver.exceptions.InvalidNamespaceException;
 import org.eclipse.esmf.aspectmodel.resolver.exceptions.InvalidRootElementCountException;
 import org.eclipse.esmf.aspectmodel.resolver.services.VersionedModel;
-import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.aspectmodel.versionupdate.MigratorService;
 import org.eclipse.esmf.aspectmodel.vocabulary.SAMM;
 import org.eclipse.esmf.metamodel.Aspect;
 import org.eclipse.esmf.metamodel.AspectContext;
-import org.eclipse.esmf.metamodel.ExtendedAspectContext;
 import org.eclipse.esmf.metamodel.ModelElement;
 import org.eclipse.esmf.metamodel.ModelNamespace;
 import org.eclipse.esmf.metamodel.NamedElement;
@@ -203,19 +200,6 @@ public static Try<Aspect> getSingleAspect( final VersionedModel versionedModel )
       return getSingleAspect( versionedModel, aspect -> true );
    }
 
-   /**
-    * Convenience method to load the single Aspect + it's extended context from a model, when the model contains exactly one Aspect.
-    *
-    * <b>Caution:</b> The method handles this special case. Aspect Models are allowed to contain any number of Aspects (including zero),
-    * so for the general case you should use {@link #getElements(VersionedModel)} instead.
-    *
-    * @param versionedModel The RDF model representation of the Aspect model
-    * @return the single Aspect contained in the model together with it's extended context
-    */
-   public static Try<ExtendedAspectContext> getSingleAspectWithContext( final VersionedModel versionedModel ) {
-      return getSingleAspectWithContext( versionedModel, aspect -> true );
-   }
-
    /**
     * Convenience method to load the single Aspect from a model, when the model contains exactly one Aspect. Does the same as
     * {@link #getSingleAspect(VersionedModel)} but throws an exception on failure.
@@ -232,24 +216,7 @@ public static Aspect getSingleAspectUnchecked( final VersionedModel versionedMod
          throw new AspectLoadingException( cause );
       } );
    }
-
-   /**
-    * Convenience method to load the single Aspect from a model, when the model contains exactly one Aspect. Does the same as
-    * {@link #getSingleAspectWithContext(VersionedModel)} but throws an exception on failure.
-    *
-    * <b>Caution:</b> The method handles this special case. Aspect Models are allowed to contain any number of Aspects (including zero),
-    * so for the general case you should use {@link #getElementsUnchecked(VersionedModel)} instead.
-    *
-    * @param versionedModel The RDF model representation of the Aspect model
-    * @return the single Aspect contained in the model plus it's extended context (elements loaded in the context of this model)
-    */
-   public static ExtendedAspectContext getSingleAspectUncheckedWithContext( final VersionedModel versionedModel ) {
-      return getSingleAspectWithContext( versionedModel ).getOrElseThrow( cause -> {
-         LOG.error( "Could not load aspect", cause );
-         throw new AspectLoadingException( cause );
-      } );
-   }
-
+   
    /**
     * Similar to {@link #getSingleAspect(VersionedModel)}, except that a predicate can be provided to select which of potentially
     * multiple aspects should be selected
@@ -285,32 +252,4 @@ public static Try<AspectContext> getAspectContext( final File input ) {
             getSingleAspect( versionedModel, aspect -> aspect.getName().equals( input.getName() ) )
                   .map( aspect -> new AspectContext( versionedModel, aspect ) ) );
    }
-
-   /**
-    * Similar to {@link #getSingleAspectWithContext(VersionedModel)}, except that a predicate can be provided to select which of potentially
-    * multiple aspects should be selected
-    * @param versionedModel the RDF model reprensentation of the Aspect model
-    * @param selector the predicate to select an Aspect
-    * @return the extended context, or a failure if 0 or more than 1 matching Aspects were found
-    */
-   public static Try<ExtendedAspectContext> getSingleAspectWithContext( final VersionedModel versionedModel, final Predicate<Aspect> selector ) {
-      final Try<List<ModelElement>> allElements = getElements( versionedModel );
-      final List<Aspect> aspects = allElements.map( elements -> elements.stream().filter( element -> element.is( Aspect.class ) )
-            .map( element -> element.as( Aspect.class ) )
-            .filter( selector )
-            .toList() ).get();
-      return switch ( aspects.size() ) {
-         case 1 -> Try.success( new ExtendedAspectContext( versionedModel, aspects.iterator().next(), getLoadedElementMap( allElements.get() ) ) );
-         case 0 -> Try.failure( new InvalidRootElementCountException( "No Aspects were found in the model" ) );
-         default -> Try.failure( new AspectLoadingException( "Multiple Aspects were found in the resolved model" ) );
-      };
-   }
-
-   private static Map<AspectModelUrn, ModelElement> getLoadedElementMap( final List<ModelElement> loadedElements ) {
-      return loadedElements.stream()
-            .filter( element -> element.is( NamedElement.class ) )
-            .map( element -> element.as( NamedElement.class ) )
-            .filter( element -> element.getAspectModelUrn().isPresent() )
-            .collect( Collectors.toMap( element -> element.getAspectModelUrn().get(), Function.identity() ) );
-   }
 }

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

@@ -14,7 +14,9 @@
 package org.eclipse.esmf.metamodel.loader;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -27,19 +29,18 @@
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.vocabulary.RDF;
 import org.apache.jena.vocabulary.RDFS;
-
-import com.google.common.collect.Streams;
-
-import org.eclipse.esmf.samm.KnownVersion;
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.aspectmodel.vocabulary.SAMM;
 import org.eclipse.esmf.aspectmodel.vocabulary.SAMMC;
 import org.eclipse.esmf.aspectmodel.vocabulary.UNIT;
+import org.eclipse.esmf.metamodel.ComplexType;
 import org.eclipse.esmf.metamodel.Entity;
 import org.eclipse.esmf.metamodel.ModelElement;
 import org.eclipse.esmf.metamodel.ModelNamespace;
 import org.eclipse.esmf.metamodel.QuantityKind;
+import org.eclipse.esmf.metamodel.QuantityKinds;
 import org.eclipse.esmf.metamodel.Unit;
+import org.eclipse.esmf.metamodel.Units;
 import org.eclipse.esmf.metamodel.impl.DefaultUnit;
 import org.eclipse.esmf.metamodel.loader.instantiator.AbstractEntityInstantiator;
 import org.eclipse.esmf.metamodel.loader.instantiator.AspectInstantiator;
@@ -72,9 +73,9 @@
 import org.eclipse.esmf.metamodel.loader.instantiator.StructuredValueInstantiator;
 import org.eclipse.esmf.metamodel.loader.instantiator.TimeSeriesInstantiator;
 import org.eclipse.esmf.metamodel.loader.instantiator.TraitInstantiator;
+import org.eclipse.esmf.samm.KnownVersion;
 
-import org.eclipse.esmf.metamodel.QuantityKinds;
-import org.eclipse.esmf.metamodel.Units;
+import com.google.common.collect.Streams;
 
 public class ModelElementFactory extends AttributeValueRetriever {
    private final KnownVersion metaModelVersion;
@@ -224,4 +225,12 @@ protected SAMMC getSammc() {
    public UNIT getUnit() {
       return unit;
    }
+
+   public List<ComplexType> getExtendingElements( final List<AspectModelUrn> extendingElements ) {
+      return extendingElements.stream().map( urn -> getModel().createResource( urn.toString() ) )
+            .map( loadedElements::get )
+            .filter( Objects::nonNull )
+            .map( modelElement -> (ComplexType) modelElement )
+            .collect( Collectors.toList() );
+   }
 }

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

@@ -16,7 +16,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.metamodel.AbstractEntity;
 import org.eclipse.esmf.metamodel.ComplexType;
 import org.eclipse.esmf.metamodel.Property;
@@ -32,10 +31,10 @@ public AbstractEntityInstantiator( final ModelElementFactory modelElementFactory
 
    @Override
    protected AbstractEntity createDefaultEntity(
-         MetaModelBaseAttributes metaModelBaseAttributes,
-         List<Property> properties,
-         Optional<ComplexType> extendedEntity,
-         List<AspectModelUrn> extendingComplexTypes ) {
+         final MetaModelBaseAttributes metaModelBaseAttributes,
+         final List<Property> properties,
+         final Optional<ComplexType> extendedEntity,
+         final List<ComplexType> extendingComplexTypes ) {
       return new DefaultAbstractEntity(
             metaModelBaseAttributes,
             properties,