Rename entity value to entity instance (#186)

* rename entity value to entity instance

* rename from entity-value to entity-instance

* fix jest test

* fix code review comments

Author: larisaVasile

core/libs/aspect-exporter/src/lib/domain-model-to-rdf.service.ts

@@ -21,7 +21,7 @@ import {
   DefaultCharacteristic,
   DefaultConstraint,
   DefaultEntity,
-  DefaultEntityValue,
+  DefaultEntityInstance,
   DefaultEvent,
   DefaultOperation,
   DefaultProperty,
@@ -139,7 +139,7 @@ export class DomainModelToRdfService {
       return this.entityVisitorService;
     } else if (metaModelElement instanceof DefaultAbstractEntity) {
       return this.abstractEntityVisitorService;
-    } else if (metaModelElement instanceof DefaultEntityValue) {
+    } else if (metaModelElement instanceof DefaultEntityInstance) {
       return this.entityValueVisitor;
     } else if (metaModelElement instanceof DefaultEvent) {
       return this.eventVisitorService;

core/libs/aspect-exporter/src/lib/visitor/characteristic/characteristic-visitor.ts

@@ -20,7 +20,7 @@ import {
   DefaultDuration,
   DefaultEither,
   DefaultEntity,
-  DefaultEntityValue,
+  DefaultEntityInstance,
   DefaultEnumeration,
   DefaultList,
   DefaultMeasurement,
@@ -147,7 +147,7 @@ export class CharacteristicVisitor extends BaseVisitor<DefaultCharacteristic> {
     }
 
     for (const value of characteristic.values) {
-      if (value instanceof DefaultEntityValue) {
+      if (value instanceof DefaultEntityInstance) {
         this.setPrefix(value.aspectModelUrn);
       }
     }

core/libs/aspect-exporter/src/lib/visitor/entity-value/entity-value-visitor.ts

@@ -12,7 +12,7 @@
  */
 
 import {Injectable} from '@angular/core';
-import {DefaultCollection, DefaultEntityValue, EntityValueProperty} from '@ame/meta-model';
+import {DefaultCollection, DefaultEntityInstance, EntityValueProperty} from '@ame/meta-model';
 import {ModelService, RdfService} from '@ame/rdf/services';
 import {DataFactory, Literal, NamedNode} from 'n3';
 import {BaseVisitor} from '../base-visitor';
@@ -21,7 +21,7 @@ import {RdfListService} from '../../rdf-list';
 import {Samm} from '@ame/vocabulary';
 
 @Injectable()
-export class EntityValueVisitor extends BaseVisitor<DefaultEntityValue> {
+export class EntityValueVisitor extends BaseVisitor<DefaultEntityInstance> {
   constructor(
     private rdfListService: RdfListService,
     public modelService: ModelService,
@@ -30,18 +30,18 @@ export class EntityValueVisitor extends BaseVisitor<DefaultEntityValue> {
     super(rdfService);
   }
 
-  visit(entityValue: DefaultEntityValue): DefaultEntityValue {
+  visit(entityValue: DefaultEntityInstance): DefaultEntityInstance {
     return this.visitModel(entityValue);
   }
 
-  visitModel(entityValue: DefaultEntityValue): DefaultEntityValue {
+  visitModel(entityValue: DefaultEntityInstance): DefaultEntityInstance {
     this.setPrefix(entityValue.aspectModelUrn);
     this.updateProperties(entityValue);
     this.updateBaseProperties(entityValue);
     return entityValue;
   }
 
-  private updateProperties(entityValue: DefaultEntityValue): void {
+  private updateProperties(entityValue: DefaultEntityInstance): void {
     const {aspectModelUrn} = entityValue;
     const rdfModel = this.modelService.currentRdfModel;
 
@@ -90,7 +90,7 @@ export class EntityValueVisitor extends BaseVisitor<DefaultEntityValue> {
   }
 
   private createObjectForRDF({key, value, language}: EntityValueProperty): NamedNode | Literal {
-    if (value instanceof DefaultEntityValue) {
+    if (value instanceof DefaultEntityInstance) {
       return DataFactory.namedNode(value.aspectModelUrn);
     }
 
@@ -103,12 +103,12 @@ export class EntityValueVisitor extends BaseVisitor<DefaultEntityValue> {
   }
 
   private handleExternalReference(value: any, aspectModelUrn: string): void {
-    if (value instanceof DefaultEntityValue && value.isExternalReference()) {
+    if (value instanceof DefaultEntityInstance && value.isExternalReference()) {
       this.setPrefix(aspectModelUrn);
     }
   }
 
-  private updateBaseProperties(entityValue: DefaultEntityValue): void {
+  private updateBaseProperties(entityValue: DefaultEntityInstance): void {
     const rdfModel = this.modelService.currentRdfModel;
     rdfModel.store.addQuad(
       DataFactory.namedNode(entityValue.aspectModelUrn),

core/libs/cache/src/lib/cached-file.ts

@@ -20,7 +20,7 @@ import {
   DefaultAspect,
   DefaultCharacteristic,
   DefaultEntity,
-  DefaultEntityValue,
+  DefaultEntityInstance,
   DefaultEvent,
   DefaultProperty,
   DefaultUnit,
@@ -138,9 +138,9 @@ export class CachedFile {
     return properties;
   }
 
-  getCachedEntityValues(): Array<DefaultEntityValue> {
+  getCachedEntityValues(): Array<DefaultEntityInstance> {
     return Array.from(this.cachedElements.values()).reduce(
-      (acc: DefaultEntityValue[], item: any) => (item instanceof DefaultEntityValue ? [...acc, item] : acc),
+      (acc: DefaultEntityInstance[], item: any) => (item instanceof DefaultEntityInstance ? [...acc, item] : acc),
       [],
     );
   }

core/libs/connection/src/lib/multi-shape-connection-handlers/abstract-entity--abstract-property.service.ts

@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import {EntityValueService} from '@ame/editor';
+import {EntityInstanceService} from '@ame/editor';
 import {FiltersService} from '@ame/loader-filters';
 import {DefaultAbstractEntity, DefaultAbstractProperty, DefaultEntity, DefaultProperty} from '@ame/meta-model';
 import {MxGraphService, MxGraphHelper} from '@ame/mx-graph';
@@ -29,7 +29,7 @@ export class AbstractEntityAbstractPropertyConnectionHandler
 {
   constructor(
     private mxGraphService: MxGraphService,
-    private entityValueService: EntityValueService,
+    private entityInstanceService: EntityInstanceService,
     private propertyAbstractPropertyConnector: PropertyAbstractPropertyConnectionHandler,
     private entityPropertyConnector: EntityPropertyConnectionHandler,
     private filtersService: FiltersService,
@@ -45,7 +45,7 @@ export class AbstractEntityAbstractPropertyConnectionHandler
       const overWrittenProperty = {property: childMetaModel, keys: {}};
       parentMetaModel.properties.push(overWrittenProperty as any);
       parentMetaModel.children.push(childMetaModel);
-      this.entityValueService.onNewProperty(overWrittenProperty as any, parentMetaModel);
+      this.entityInstanceService.onNewProperty(overWrittenProperty as any, parentMetaModel);
     }
 
     const grandParents = this.mxGraphService.graph

core/libs/connection/src/lib/multi-shape-connection-handlers/abstract-entity--property.service.ts

@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import {EntityValueService} from '@ame/editor';
+import {EntityInstanceService} from '@ame/editor';
 import {DefaultAbstractEntity, DefaultProperty} from '@ame/meta-model';
 import {MxGraphService} from '@ame/mx-graph';
 import {Injectable} from '@angular/core';
@@ -24,7 +24,7 @@ import {mxgraph} from 'mxgraph-factory';
 export class AbstractEntityPropertyConnectionHandler implements MultiShapeConnector<DefaultAbstractEntity, DefaultProperty> {
   constructor(
     private mxGraphService: MxGraphService,
-    private entityValueService: EntityValueService,
+    private entityInstanceService: EntityInstanceService,
   ) {}
 
   public connect(
@@ -36,7 +36,7 @@ export class AbstractEntityPropertyConnectionHandler implements MultiShapeConnec
     if (!parentMetaModel.properties.find(({property}) => property.aspectModelUrn === childMetaModel.aspectModelUrn)) {
       const overWrittenProperty = {property: childMetaModel, keys: {}};
       parentMetaModel.properties.push(overWrittenProperty);
-      this.entityValueService.onNewProperty(overWrittenProperty, parentMetaModel);
+      this.entityInstanceService.onNewProperty(overWrittenProperty, parentMetaModel);
     }
     this.mxGraphService.assignToParent(childCell, parentCell);
   }

core/libs/connection/src/lib/multi-shape-connection-handlers/characteristic--entity.service.ts

@@ -18,7 +18,7 @@ import {
   DefaultEnumeration,
   DefaultProperty,
   DefaultUnit,
-  DefaultEntityValue,
+  DefaultEntityInstance,
   DefaultStructuredValue,
 } from '@ame/meta-model';
 import {MxGraphService, MxGraphAttributeService, MxGraphShapeOverlayService, MxGraphHelper} from '@ame/mx-graph';
@@ -104,7 +104,7 @@ export class CharacteristicEntityConnectionHandler implements MultiShapeConnecto
     }
 
     // TODO: Should be defined in more details
-    if (metaModel instanceof DefaultEntityValue) {
+    if (metaModel instanceof DefaultEntityInstance) {
       for (const child of metaModel.children) {
         MxGraphHelper.removeRelation(metaModel, child);
       }

core/libs/connection/src/lib/multi-shape-connection-handlers/entity--property.service.ts

@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import {EntityValueService} from '@ame/editor';
+import {EntityInstanceService} from '@ame/editor';
 import {DefaultEntity, DefaultProperty} from '@ame/meta-model';
 import {MxGraphService} from '@ame/mx-graph';
 import {Injectable} from '@angular/core';
@@ -24,14 +24,14 @@ import {mxgraph} from 'mxgraph-factory';
 export class EntityPropertyConnectionHandler implements MultiShapeConnector<DefaultEntity, DefaultProperty> {
   constructor(
     private mxGraphService: MxGraphService,
-    private entityValueService: EntityValueService,
+    private entityInstanceService: EntityInstanceService,
   ) {}
 
   public connect(parentMetaModel: DefaultEntity, childMetaModel: DefaultProperty, parentCell: mxgraph.mxCell, childCell: mxgraph.mxCell) {
     if (!parentMetaModel.properties.find(({property}) => property.aspectModelUrn === childMetaModel.aspectModelUrn)) {
       const overWrittenProperty = {property: childMetaModel, keys: {}};
       parentMetaModel.properties.push(overWrittenProperty);
-      this.entityValueService.onNewProperty(overWrittenProperty, parentMetaModel);
+      this.entityInstanceService.onNewProperty(overWrittenProperty, parentMetaModel);
     }
     this.mxGraphService.assignToParent(childCell, parentCell);
   }

core/libs/connection/src/lib/multi-shape-connection-handlers/enumeration--entity-value.service.ts

@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import {DefaultEnumeration, DefaultEntityValue} from '@ame/meta-model';
+import {DefaultEnumeration, DefaultEntityInstance} from '@ame/meta-model';
 import {MxGraphService, MxGraphHelper} from '@ame/mx-graph';
 import {Injectable} from '@angular/core';
 import {mxgraph} from 'mxgraph-factory';
@@ -20,10 +20,10 @@ import {MultiShapeConnector} from '../models';
 @Injectable({
   providedIn: 'root',
 })
-export class EnumerationEntityValueConnectionHandler implements MultiShapeConnector<DefaultEnumeration, DefaultEntityValue> {
+export class EnumerationEntityValueConnectionHandler implements MultiShapeConnector<DefaultEnumeration, DefaultEntityInstance> {
   constructor(private mxGraphService: MxGraphService) {}
 
-  connect(parentMetaModel: DefaultEnumeration, childMetaModel: DefaultEntityValue, parent: mxgraph.mxCell, child: mxgraph.mxCell): void {
+  connect(parentMetaModel: DefaultEnumeration, childMetaModel: DefaultEntityInstance, parent: mxgraph.mxCell, child: mxgraph.mxCell): void {
     childMetaModel.addParent(parentMetaModel);
     parentMetaModel.values.push(childMetaModel);
 

core/libs/connection/src/lib/shape-connector-util.ts

@@ -21,7 +21,7 @@ import {
   DefaultConstraint,
   DefaultEither,
   DefaultEntity,
-  DefaultEntityValue,
+  DefaultEntityInstance,
   DefaultEnumeration,
   DefaultEvent,
   DefaultMeasurement,
@@ -164,7 +164,7 @@ export class ShapeConnectorUtil {
   static isEnumerationEntityValueConnection(parentModel: BaseMetaModelElement, childModel: BaseMetaModelElement): boolean {
     return (
       parentModel instanceof DefaultEnumeration &&
-      childModel instanceof DefaultEntityValue &&
+      childModel instanceof DefaultEntityInstance &&
       parentModel.dataType?.getUrn() === childModel.entity?.getUrn()
     );
   }