Prefer UML PrimitiveTypes over JAVA PrimitiveTypes

- PcmUmlClassHelper.mapPrimitiveTypes returns now only one PrimitiveType instead of a set of matching Types. UML Primitive Types are used if available, the JAVA PrimitiveTypes are only used if no matching type is existent - goal: make clear which PrimitiveType is used by the reaction (and avoid indeterminism) - adapted some tests
vitruv-tools · Sep 26, 2023 · a42320d · a42320d
1 parent a580305
commit a42320d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/bundles/tools.vitruv.applications.pcmumlclass/META-INF/MANIFEST.MF b/bundles/tools.vitruv.applications.pcmumlclass/META-INF/MANIFEST.MF
@@ -75,6 +75,7 @@ Require-Bundle: org.eclipse.uml2.uml;visibility:=reexport,
  org.palladiosimulator.pcm;visibility:=reexport,
  edu.kit.ipd.sdq.activextendannotations,
  edu.kit.ipd.sdq.commons.util.emf,
+ edu.kit.ipd.sdq.commons.util.java,
  tools.vitruv.framework.applications,
  tools.vitruv.dsls.reactions.runtime,
  tools.vitruv.applications.util.temporary

diff --git a/...pplications.pcmumlclass/src/tools/vitruv/applications/pcmumlclass/PcmUmlClassHelper.xtend b/...pplications.pcmumlclass/src/tools/vitruv/applications/pcmumlclass/PcmUmlClassHelper.xtend
@@ -20,18 +20,21 @@ import org.palladiosimulator.pcm.system.System
 import org.palladiosimulator.pcm.core.entity.Entity
 import tools.vitruv.applications.util.temporary.other.CorrespondenceRetriever
 
+import static extension edu.kit.ipd.sdq.commons.util.java.lang.IterableUtil.claimOne
+
 @Utility
 class PcmUmlClassHelper {
 
-	def static Iterable<PrimitiveType> mapPrimitiveTypes(PrimitiveDataType pcmPredefinedPrimitiveType,
+	def static PrimitiveType mapPrimitiveTypes(PrimitiveDataType pcmPredefinedPrimitiveType,
 		Iterable<PrimitiveType> umlPredefinedPrimitiveTypes) {
+		// Prefer UML Types over JAVA Types
 		return switch (pcmPredefinedPrimitiveType.type) {
-			case PrimitiveTypeEnum.BOOL: umlPredefinedPrimitiveTypes.filter[it.name.toLowerCase == "bool" || it.name.toLowerCase == "boolean"]
-			case PrimitiveTypeEnum.BYTE: umlPredefinedPrimitiveTypes.filter[it.name.toLowerCase == "byte"]
-			case PrimitiveTypeEnum.CHAR: umlPredefinedPrimitiveTypes.filter[it.name.toLowerCase == "char"]
-			case PrimitiveTypeEnum.INT: umlPredefinedPrimitiveTypes.filter[it.name.toLowerCase == "int" || it.name.toLowerCase == "integer"]
-			case PrimitiveTypeEnum.DOUBLE: umlPredefinedPrimitiveTypes.filter[it.name.toLowerCase == "double" || it.name.toLowerCase == "real"]
-			case PrimitiveTypeEnum.STRING: umlPredefinedPrimitiveTypes.filter[it.name.toLowerCase == "string"]
+			case PrimitiveTypeEnum.BOOL: umlPredefinedPrimitiveTypes.filter[it.name == "Boolean"].claimOne
+			case PrimitiveTypeEnum.BYTE: umlPredefinedPrimitiveTypes.filter[it.name == "byte"].claimOne
+			case PrimitiveTypeEnum.CHAR: umlPredefinedPrimitiveTypes.filter[it.name == "char"].claimOne
+			case PrimitiveTypeEnum.INT: umlPredefinedPrimitiveTypes.filter[it.name == "Integer"].claimOne
+			case PrimitiveTypeEnum.DOUBLE: umlPredefinedPrimitiveTypes.filter[it.name == "Real"].claimOne
+			case PrimitiveTypeEnum.STRING: umlPredefinedPrimitiveTypes.filter[it.name == "String"].claimOne
 			default: null
 		// uml::UnlimitedNatural are not mapped and the user is notified if one of these types is set
 		}

diff --git a/...ons.pcmumlclass/src/tools/vitruv/applications/pcmumlclass/pcm2uml/PcmRepository.reactions b/...ons.pcmumlclass/src/tools/vitruv/applications/pcmumlclass/pcm2uml/PcmRepository.reactions
@@ -176,10 +176,8 @@ routine bootstrapPrimitiveDatatypes(pcm::Repository pcmRepo) {
 		val pcmPrimitiveTypes = PcmDataTypeUtil.getPcmPrimitiveTypes(pcmRepo)
 		val umlPrimitiveTypes = UmlTypeUtil.getUmlPrimitiveTypes(pcmRepo.eResource.resourceSet)
 		for (pcmType : pcmPrimitiveTypes) {
-			val umlTypes = PcmUmlClassHelper.mapPrimitiveTypes(pcmType, umlPrimitiveTypes)
-			for (umlType : umlTypes) {
-				addPrimitiveDatatypeCorrespondence(pcmType, umlType)
-			}
+			val umlType = PcmUmlClassHelper.mapPrimitiveTypes(pcmType, umlPrimitiveTypes)
+			addPrimitiveDatatypeCorrespondence(pcmType, umlType)
 		}
 	}
 }

diff --git a/...umlclass.tests/src/tools/vitruv/applications/pcmumlclass/tests/AttributeConceptTest.xtend b/...umlclass.tests/src/tools/vitruv/applications/pcmumlclass/tests/AttributeConceptTest.xtend
@@ -169,7 +169,7 @@ class AttributeConceptTest extends PcmUmlClassApplicationTest {
 		val pcmCollectionDataType = new FluentPCMCollectionDataTypeBuilder(
 			PcmUmlClassApplicationTestHelper.COLLECTION_DATATYPE_NAME, pcmCompositeDataType2).build
 
-		testCreateAttributeConcept_UML([it.name == "int"], 1, 1,
+		testCreateAttributeConcept_UML([it.name == "Integer"], 1, 1,
 			#[pcmCompositeDataType1, pcmCompositeDataType2, pcmCollectionDataType])
 	}
 

diff --git a/...umlclass.tests/src/tools/vitruv/applications/pcmumlclass/tests/ParameterConceptTest.xtend b/...umlclass.tests/src/tools/vitruv/applications/pcmumlclass/tests/ParameterConceptTest.xtend
@@ -91,7 +91,7 @@ class ParameterConceptTest extends PcmUmlClassApplicationTest {
 		val pcmInterface = new FluentPCMOperationInterfaceBuilder(PcmUmlClassApplicationTestHelper.INTERFACE_NAME).
 			addSignature(PcmUmlClassApplicationTestHelper.SIGNATURE_NAME,
 				#[new Pair(TEST_PARAMETER_NAME, pcmIntDataType)]).build
-		testCreateParameterConcept_UML([it.name == "int"], 1, 1,
+		testCreateParameterConcept_UML([it.name == "Integer"], 1, 1,
 			#[pcmCompositeDataType1, pcmCompositeDataType2, pcmCollectionDataType], pcmInterface)
 	}
 
@@ -181,7 +181,7 @@ class ParameterConceptTest extends PcmUmlClassApplicationTest {
 			it.filter[it instanceof PrimitiveDataType].findFirst [
 				(it as PrimitiveDataType).type == PrimitiveTypeEnum.INT
 			]
-		], "int", 1, 1)
+		], "Integer", 1, 1)
 	}
 
 	@Test

diff --git a/...umlclass.tests/src/tools/vitruv/applications/pcmumlclass/tests/SignatureConceptTest.xtend b/...umlclass.tests/src/tools/vitruv/applications/pcmumlclass/tests/SignatureConceptTest.xtend
@@ -121,7 +121,7 @@ class SignatureConceptTest extends PcmUmlClassApplicationTest {
 
 		_testCreateSignatureConceptUML()
 		_testReturnTypePropagation_UML(
-			[it instanceof PrimitiveType && (it as PrimitiveType).name == "int"],
+			[it instanceof PrimitiveType && (it as PrimitiveType).name == "Integer"],
 			1,
 			1,
 			[it instanceof PrimitiveDataType && (it as PrimitiveDataType).type == PrimitiveTypeEnum.INT]
@@ -188,7 +188,7 @@ class SignatureConceptTest extends PcmUmlClassApplicationTest {
 		createRepositoryWithInterface()
 		_testCreateSignatureConcept_PCM_withReturnType([
 			it instanceof PrimitiveDataType && (it as PrimitiveDataType).type == PrimitiveTypeEnum.INT
-		], 1, 1, [it.name == "int"])
+		], 1, 1, [it.name == "Integer"])
 	}
 
 	@Test