Fix failed unit tests.

Author: RaMisess

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

@@ -16,26 +16,29 @@
 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;
 import org.eclipse.esmf.metamodel.loader.MetaModelBaseAttributes;
+import org.eclipse.esmf.metamodel.loader.ModelElementFactory;
 import org.eclipse.esmf.metamodel.visitor.AspectVisitor;
 
 public class DefaultAbstractEntity extends DefaultComplexType implements AbstractEntity {
    public static DefaultAbstractEntity createDefaultAbstractEntity(
          final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties,
          final Optional<ComplexType> _extends,
-         final List<ComplexType> extendingElements ) {
-      return new DefaultAbstractEntity( metaModelBaseAttributes, properties, _extends, extendingElements );
+         final List<AspectModelUrn> extendingElements ) {
+      return new DefaultAbstractEntity( metaModelBaseAttributes, properties, _extends, extendingElements, null );
    }
 
    public DefaultAbstractEntity( final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties,
          final Optional<ComplexType> _extends,
-         final List<ComplexType> extendingElements ) {
-      super( metaModelBaseAttributes, properties, _extends, extendingElements );
+         final List<AspectModelUrn> extendingElements,
+         final ModelElementFactory loadedElements ) {
+      super( metaModelBaseAttributes, properties, _extends, extendingElements, loadedElements );
    }
 
    /**

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

@@ -17,25 +17,30 @@
 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.Property;
 import org.eclipse.esmf.metamodel.loader.MetaModelBaseAttributes;
+import org.eclipse.esmf.metamodel.loader.ModelElementFactory;
 import org.eclipse.esmf.metamodel.visitor.AspectVisitor;
 
 public class DefaultComplexType extends ModelElementImpl implements ComplexType {
    private final List<Property> properties;
    private final Optional<ComplexType> _extends;
-   private final List<ComplexType> extendingElements;
+   private final List<AspectModelUrn> extendingElements;
+   private final ModelElementFactory loadedElements;
 
    protected DefaultComplexType(
          final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties,
          final Optional<ComplexType> _extends,
-         final List<ComplexType> extendingElements ) {
+         final List<AspectModelUrn> extendingElements,
+         final ModelElementFactory loadedElements ) {
       super( metaModelBaseAttributes );
       this.properties = new ArrayList<>( properties );
       this._extends = _extends;
       this.extendingElements = extendingElements;
+      this.loadedElements = loadedElements;
    }
 
    /**
@@ -58,7 +63,10 @@ public Optional<ComplexType> getExtends() {
     */
    @Override
    public List<ComplexType> getExtendingElements() {
-      return extendingElements;
+      if ( loadedElements == null ) {
+         throw new RuntimeException( "No inheritance information is available." );
+      }
+      return loadedElements.getExtendingElements( extendingElements );
    }
 
    @Override

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

@@ -16,31 +16,34 @@
 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;
 import org.eclipse.esmf.metamodel.loader.MetaModelBaseAttributes;
+import org.eclipse.esmf.metamodel.loader.ModelElementFactory;
 import org.eclipse.esmf.metamodel.visitor.AspectVisitor;
 
 public class DefaultEntity extends DefaultComplexType implements Entity {
 
    public static DefaultEntity createDefaultEntity( final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties, final Optional<ComplexType> _extends ) {
-      return new DefaultEntity( metaModelBaseAttributes, properties, _extends, Collections.emptyList() );
+      return new DefaultEntity( metaModelBaseAttributes, properties, _extends, Collections.emptyList(), null );
    }
 
    public DefaultEntity(
          final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties ) {
-      this( metaModelBaseAttributes, properties, Optional.empty(), Collections.emptyList() );
+      this( metaModelBaseAttributes, properties, Optional.empty(), Collections.emptyList(), null );
    }
 
    public DefaultEntity(
          final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<? extends Property> properties,
          final Optional<ComplexType> _extends,
-         final List<ComplexType> extendingElements ) {
-      super( metaModelBaseAttributes, properties, _extends, extendingElements );
+         final List<AspectModelUrn> extendingElements,
+         final ModelElementFactory loadedElements ) {
+      super( metaModelBaseAttributes, properties, _extends, extendingElements, loadedElements );
    }
 
    /**

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

@@ -16,6 +16,7 @@
 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;
@@ -34,11 +35,12 @@ protected AbstractEntity createDefaultEntity(
          final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<Property> properties,
          final Optional<ComplexType> extendedEntity,
-         final List<ComplexType> extendingComplexTypes ) {
+         final List<AspectModelUrn> extendingComplexTypes ) {
       return new DefaultAbstractEntity(
             metaModelBaseAttributes,
             properties,
             extendedEntity,
-            extendingComplexTypes );
+            extendingComplexTypes,
+            modelElementFactory );
    }
 }

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

@@ -70,13 +70,13 @@ public T apply( final Resource resource ) {
 
       final Optional<ComplexType> extendedEntity = getExtendedEntity( resource );
 
-      final List<ComplexType> extending = new ArrayList<>();
+      final List<AspectModelUrn> extending = new ArrayList<>();
 
       final T entity = createDefaultEntity( metaModelBaseAttributes, properties, extendedEntity, extending );
 
       creatingElements.put( resource, entity );
 
-      extending.addAll( modelElementFactory.getExtendingElements( getExtending( resource ) ) );
+      extending.addAll( getExtending( resource ) );
 
       return entity;
    }
@@ -111,5 +111,5 @@ protected abstract T createDefaultEntity(
          MetaModelBaseAttributes metaModelBaseAttributes,
          List<Property> properties,
          Optional<ComplexType> extendedEntity,
-         List<ComplexType> extendingComplexTypes );
+         List<AspectModelUrn> extendingComplexTypes );
 }

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

@@ -16,6 +16,7 @@
 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;
@@ -33,11 +34,12 @@ protected Entity createDefaultEntity(
          final MetaModelBaseAttributes metaModelBaseAttributes,
          final List<Property> properties,
          final Optional<ComplexType> extendedEntity,
-         final List<ComplexType> extendingComplexTypes ) {
+         final List<AspectModelUrn> extendingComplexTypes ) {
       return new DefaultEntity(
             metaModelBaseAttributes,
             properties,
             extendedEntity,
-            extendingComplexTypes );
+            extendingComplexTypes,
+            modelElementFactory );
    }
 }