[478878] Migrate Legacy expressions to AQL in "do not migrate" VSMs

The migration is done using the text editor in order to avoid the
automatic migration of the .odesign files.

Bug: 478878
Change-Id: I61e4d2614feb8eabd666377962f061a7e00a9856

3 files changed, 8 insertions, 8 deletions

diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/VP-1981/base.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/VP-1981/base.odesign
index 3b843d022a..6878ce2acd 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/VP-1981/base.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/VP-1981/base.odesign
@@ -3,14 +3,14 @@
   <ownedViewpoints name="EdgeLabelRefreshPb" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description:DiagramDescription" name="EdgeLabelRefreshPb" domainClass="EPackage">
       <defaultLayer name="Default">
-        <nodeMappings name="Class" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="10" labelSize="81" labelFormat="italic" showIcon="false" labelExpression="&lt;%name%>1" tooltipExpression="OneToolTip" sizeComputationExpression="31" labelPosition="node" hideLabelByDefault="true" resizeKind="NSEW" width="1" height="1">
+        <nodeMappings name="Class" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="10" labelSize="81" labelFormat="italic" showIcon="false" labelExpression="aql:self.name + '1'" tooltipExpression="OneToolTip" sizeComputationExpression="31" labelPosition="node" hideLabelByDefault="true" resizeKind="NSEW" width="1" height="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="edge" deletionDescription="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@toolSections.0/@ownedTools[name='TestDel']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="edge" deletionDescription="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@toolSections.0/@ownedTools[name='TestDel']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
           <style lineStyle="dot" sizeComputationExpression="2" routingStyle="manhattan" foldingStyle="SOURCE">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <centerLabelStyleDescription labelSize="5" labelFormat="bold" showIcon="false" labelExpression="plop1">
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/VP-1981/referencing.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/VP-1981/referencing.odesign
index 700c82fc63..742dfb74da 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/VP-1981/referencing.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/VP-1981/referencing.odesign
@@ -3,7 +3,7 @@
   <ownedViewpoints name="ReferencingViewpoint">
     <ownedRepresentations xsi:type="description:DiagramDescription" name="ReferencingDiagram">
       <defaultLayer name="Default">
-        <edgeMappings name="edge" semanticElements="var:self" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="edge" semanticElements="var:self" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
           <style lineStyle="dot" sizeComputationExpression="2" routingStyle="manhattan" foldingStyle="SOURCE">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <centerLabelStyleDescription labelSize="5" labelFormat="bold" showIcon="false" labelExpression="plop1">
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/ddiagramSetRemoval/2077.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/ddiagramSetRemoval/2077.odesign
index 202c708a5e..7fcb8ee10b 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/ddiagramSetRemoval/2077.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/ddiagramSetRemoval/2077.odesign
@@ -3,16 +3,16 @@
   <ownedViewpoints name="2077" modelFileExtension="*.ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2077" domainClass="EPackage">
       <defaultLayer name="Default">
-        <edgeMappings name="EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" sourceMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer()%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e | not e.eOpposite)" sourceMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="aql:self.eContainer()" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']">
-          <subNodeMappings name="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <containerMappings name="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']">
+          <subNodeMappings name="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
             <style xsi:type="style:SquareDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>