Merge pull request #2259 from bosch-io/bug/issue-2172_noDublicatedMap…

…pingKeys Prevent properties from being added multiple times. Fixes #2172
eclipse-vorto · Jan 29, 2020 · 499bf7a · 499bf7a
2 parents ad8ee26 + 4fdcda1
commit 499bf7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...del/org.eclipse.vorto.core/src/org/eclipse/vorto/core/api/model/ModelConversionUtils.java b/...del/org.eclipse.vorto.core/src/org/eclipse/vorto/core/api/model/ModelConversionUtils.java
@@ -209,6 +209,7 @@ private static List<Property> getFlatStatusProperties(FunctionblockModel fbm) {
             if (objectType.getType() instanceof Entity) { // only flatten entities
               Entity entity = (Entity) ((ObjectPropertyType) property.getType()).getType();
               EList<Property> entityProperties = getFlatProperties(entity);
+              entity.getProperties().clear();
               entity.getProperties().addAll(entityProperties);
               if (entity.getSuperType() != null) {
                 removeSuperTypeModelReference(entity);
@@ -235,6 +236,7 @@ private static Property copyProperty(Property property) {
     newProperty.setPresence(property.getPresence());
     newProperty.setMultiplicity(property.isMultiplicity());
     newProperty.setDescription(property.getDescription());
+    newProperty.setConstraintRule(property.getConstraintRule());
 
     if (property.getType() instanceof PrimitivePropertyType) {
       PrimitivePropertyType newPrimitiveType =

diff --git a/utilities/dsl-reader/src/test/java/org/eclipse/vorto/utilities/ModelReaderTest.java b/utilities/dsl-reader/src/test/java/org/eclipse/vorto/utilities/ModelReaderTest.java
@@ -200,7 +200,7 @@ public void testFlatInheritanceFBwithDatatypes() {
 
     ObjectPropertyType type = (ObjectPropertyType) colorLightProperty.getType();
     Entity colorLight = (Entity) type.getType();
-    assertEquals(3, colorLight.getProperties().size());
+    assertEquals(2, colorLight.getProperties().size());
     assertEquals(1, colorLight.getReferences().size());
 
     assertEquals(1, infomodel.getProperties().get(0).getType().getReferences().size());