Remove indirections correctly from dataflow confidentiality model

Author: Entenwilli

bundles/org.dataflowanalysis.pcm.extension.model.edit/META-INF/MANIFEST.MF

@@ -20,6 +20,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.dataflowanalysis.pcm.extension.dictionary.characterized.edit;visibility:=reexport,
  de.uka.ipd.sdq.identifier;visibility:=reexport,
  de.uka.ipd.sdq.identifier.edit;visibility:=reexport,
+ org.palladiosimulator.indirections;visibility:=reexport,
  org.palladiosimulator.pcm;visibility:=reexport,
  org.palladiosimulator.pcm.edit;visibility:=reexport,
  de.uka.ipd.sdq.probfunction;visibility:=reexport,
@@ -28,6 +29,7 @@ Require-Bundle: org.eclipse.core.runtime,
  de.uka.ipd.sdq.stoex.edit;visibility:=reexport,
  de.uka.ipd.sdq.units;visibility:=reexport,
  de.uka.ipd.sdq.units.edit;visibility:=reexport,
+ org.palladiosimulator.indirections.edit;bundle-version="1.0.0";visibility:=reexport,
  tools.mdsd.library.emfeditutils;bundle-version="0.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17

bundles/org.dataflowanalysis.pcm.extension.model.editor/META-INF/MANIFEST.MF

@@ -18,6 +18,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.dataflowanalysis.pcm.extension.dictionary.edit;visibility:=reexport,
  org.dataflowanalysis.pcm.extension.dictionary.characterized.edit;visibility:=reexport,
  de.uka.ipd.sdq.identifier.edit;visibility:=reexport,
+ org.palladiosimulator.indirections.edit;visibility:=reexport,
  org.palladiosimulator.pcm.edit;visibility:=reexport,
  de.uka.ipd.sdq.probfunction.edit;visibility:=reexport,
  de.uka.ipd.sdq.stoex.edit;visibility:=reexport,

bundles/org.dataflowanalysis.pcm.extension.model/model/dataFlowConfidentiality.ecore

@@ -92,6 +92,41 @@
       <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG"/>
       <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG"/>
     </eAnnotations>
+    <eClassifiers xsi:type="ecore:EClass" name="DataChannelBehaviour" eSuperTypes="../../org.palladiosimulator.pcm/model/pcm.ecore#//core/entity/Entity">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+        <details key="constraints" value="variableUsagesReferToValidSourceRoleParameter variableReferencesReferToValidSinkRoleParameter reusedBehavioursOnlyBindValidVariables"/>
+      </eAnnotations>
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG">
+        <details key="variableUsagesReferToValidSourceRoleParameter" value="self.variableUsages->forAll(usage |&#xA;&#x9;self.dataSources->collect(&#xA;&#x9;&#x9;role | role.entityName.concat('.').concat(role.dataInterface.dataSignature.parameter.parameterName)&#x9;&#x9;&#xA;&#x9;)->includes(usage.namedReference__VariableUsage.referenceName)&#xA;)"/>
+        <details key="variableReferencesReferToValidSinkRoleParameter" value="self.variableUsages.variableCharacterisation_VariableUsage->selectByKind(confidentiality::ConfidentialityVariableCharacterisation)->forAll(characterisation |&#xA;&#x9;characterisation.rhs.oclAsType(ecore::EObject)->closure(eContents()->selectByKind(ecore::EObject))->selectByKind(stoex::VariableReference)->forAll(reference |&#xA;&#x9;&#x9;self.dataSinks->collect(&#xA;&#x9;&#x9;&#x9;role | role.entityName.concat('.').concat(role.dataInterface.dataSignature.parameter.parameterName)&#xA;&#x9;&#x9;)->includes(reference.referenceName)&#xA;&#x9;)&#xA;)"/>
+        <details key="reusedBehavioursOnlyBindValidVariables" value="let validSourceNames : Set(String) = self.dataSources->collect(&#xA;&#x9;role | role.entityName.concat('.').concat(role.dataInterface.dataSignature.parameter.parameterName)&#xA;)->asSet() in&#xA;&#xA;    let validSinkNames : Set(String) = self.dataSinks->collect(&#xA;        role | role.entityName.concat('.').concat(role.dataInterface.dataSignature.parameter.parameterName)&#xA;    )->asSet() in&#xA;&#xA;        let validReferenceNames : Set(String) = validSourceNames->union(validSinkNames) in&#xA;&#xA;            let usedReferenceNames : Set(String) = self.reusedBehaviours->collect(variableBindings)->flatten()->collect(boundValue.referenceName)->asSet() in&#xA;&#xA;                validReferenceNames->includesAll(usedReferenceNames)"/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="dataSources" upperBound="-1"
+          eType="ecore:EClass ../../org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataSourceRole"
+          changeable="false" volatile="true" transient="true" derived="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG">
+          <details key="derivation" value="self.dataChannel.dataSourceRoles"/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="dataSinks" upperBound="-1"
+          eType="ecore:EClass ../../org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataSinkRole"
+          changeable="false" volatile="true" transient="true" derived="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG">
+          <details key="derivation" value="self.dataChannel.dataSinkRoles"/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="variableUsages" upperBound="-1"
+          eType="ecore:EClass ../../org.palladiosimulator.pcm/model/pcm.ecore#//parameter/VariableUsage"
+          containment="true"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="reusedBehaviours" upperBound="-1"
+          eType="#//behaviour/BehaviourReuse" containment="true"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Behaviours" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="dataChannelBehaviour"
+          upperBound="-1" eType="#//behaviour/DataChannelBehaviour" containment="true"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="reusableBehaviours" upperBound="-1"
+          eType="#//behaviour/ReusableBehaviour" containment="true"/>
+    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="ReusableBehaviour" eSuperTypes="../../org.palladiosimulator.pcm/model/pcm.ecore#//core/entity/Entity">
       <eStructuralFeatures xsi:type="ecore:EReference" name="inputVariables" upperBound="-1"
           eType="ecore:EClass platform:/plugin/de.uka.ipd.sdq.stoex/model/stoex.ecore#//VariableReference"
@@ -144,6 +179,6 @@
   </eSubpackages>
   <eSubpackages name="dictionary" nsURI="http://palladiosimulator.org/dataflow/confidentiality/pcm/0.1.0/dictionary"
       nsPrefix="dictionary">
-    <eClassifiers xsi:type="ecore:EClass" name="PCMDataDictionary" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier #//characteristics/CharacteristicTypeDictionary #//characteristics/Characteristics"/>
+    <eClassifiers xsi:type="ecore:EClass" name="PCMDataDictionary" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier #//characteristics/CharacteristicTypeDictionary #//characteristics/Characteristics #//behaviour/Behaviours"/>
   </eSubpackages>
 </ecore:EPackage>

bundles/org.dataflowanalysis.pcm.extension.model/model/dataFlowConfidentiality.genmodel

@@ -9,7 +9,7 @@
     reflectiveDelegation="true" importerID="org.eclipse.emf.importer.cdo" featureDelegation="Reflective"
     complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
     editPluginID="org.dataflowanalysis.pcm.extension.model.edit" editorPluginID="org.dataflowanalysis.pcm.extension.model.editor"
-    usedGenPackages="../../org.dataflowanalysis.pcm.extension.dictionary/model/DataDictionary.genmodel#//DataDictionary ../../org.dataflowanalysis.pcm.extension.dictionary.characterized/model/DataDictionaryCharacterized.genmodel#//DataDictionaryCharacterized ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../de.uka.ipd.sdq.identifier/model/identifier.genmodel#//identifier ../../org.palladiosimulator.pcm/model/pcm.genmodel#//pcm ../../de.uka.ipd.sdq.probfunction/model/ProbabilityFunction.genmodel#//probfunction ../../de.uka.ipd.sdq.stoex/model/stoex.genmodel#//stoex ../../de.uka.ipd.sdq.units/model/Units.genmodel#//units"
+    usedGenPackages="../../org.dataflowanalysis.pcm.extension.dictionary/model/DataDictionary.genmodel#//DataDictionary ../../org.dataflowanalysis.pcm.extension.dictionary.characterized/model/DataDictionaryCharacterized.genmodel#//DataDictionaryCharacterized ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../de.uka.ipd.sdq.identifier/model/identifier.genmodel#//identifier ../../org.palladiosimulator.indirections/model/indirections.genmodel#//indirections ../../org.palladiosimulator.pcm/model/pcm.genmodel#//pcm ../../de.uka.ipd.sdq.probfunction/model/ProbabilityFunction.genmodel#//probfunction ../../de.uka.ipd.sdq.stoex/model/stoex.genmodel#//stoex ../../de.uka.ipd.sdq.units/model/Units.genmodel#//units"
     importOrganizing="true">
   <foreignModel>dataFlowConfidentiality.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
@@ -64,6 +64,18 @@
     </nestedGenPackages>
     <nestedGenPackages prefix="Behaviour" basePackage="org.dataflowanalysis.pcm.extension.model.confidentiality"
         disposableProviderFactory="true" ecorePackage="dataFlowConfidentiality.ecore#//behaviour">
+      <genClasses ecoreClass="dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour">
+        <genFeatures property="Readonly" notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour/dataSources"/>
+        <genFeatures property="Readonly" notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour/dataSinks"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour/variableUsages"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour/reusedBehaviours"/>
+      </genClasses>
+      <genClasses ecoreClass="dataFlowConfidentiality.ecore#//behaviour/Behaviours">
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/Behaviours/dataChannelBehaviour"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/Behaviours/reusableBehaviours"/>
+      </genClasses>
       <genClasses ecoreClass="dataFlowConfidentiality.ecore#//behaviour/ReusableBehaviour">
         <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/ReusableBehaviour/inputVariables"/>
         <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/ReusableBehaviour/outputVariables"/>