Switch to AQL 8.0.x

Change-Id: I9c6ce4e1202bdeff65d159dd13c60f921294caaf Signed-off-by: Pierre-Charles David <[email protected]>
eclipse-sirius · Feb 12, 2024 · 8548de6 · 8548de6
1 parent aa9523a
commit 8548de6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 7.4.0.qualifier
 Require-Bundle: org.eclipse.sirius.common;bundle-version="2.0.0",
  org.eclipse.sirius.common.acceleo.aql;bundle-version="2.0.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.acceleo.query;bundle-version="[5.0.0,8.0.0)"
+ org.eclipse.acceleo.query;bundle-version="8.0.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.sirius.common.acceleo.aql.ide;version="3.1.0",

diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.aql/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.sirius.common;bundle-version="2.0.0",
  org.eclipse.sirius.ecore.extender;bundle-version="2.0.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
  org.eclipse.sirius.ext.base;bundle-version="3.1.0",
- org.eclipse.acceleo.query;bundle-version="[5.0.0,8.0.0)"
+ org.eclipse.acceleo.query;bundle-version="8.0.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.sirius.common.acceleo.aql.business;version="3.0.0",

diff --git a/...aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java b/...aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
@@ -25,15 +25,16 @@
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
+import org.eclipse.acceleo.query.parser.AstResult;
 import org.eclipse.acceleo.query.runtime.AcceleoQueryEvaluationException;
 import org.eclipse.acceleo.query.runtime.AcceleoQueryValidationException;
 import org.eclipse.acceleo.query.runtime.CrossReferenceProvider;
 import org.eclipse.acceleo.query.runtime.EvaluationResult;
 import org.eclipse.acceleo.query.runtime.IQueryBuilderEngine;
-import org.eclipse.acceleo.query.runtime.IQueryBuilderEngine.AstResult;
 import org.eclipse.acceleo.query.runtime.IQueryEnvironment;
 import org.eclipse.acceleo.query.runtime.IQueryEvaluationEngine;
 import org.eclipse.acceleo.query.runtime.IQueryValidationEngine;
+import org.eclipse.acceleo.query.runtime.IService;
 import org.eclipse.acceleo.query.runtime.IValidationMessage;
 import org.eclipse.acceleo.query.runtime.IValidationResult;
 import org.eclipse.acceleo.query.runtime.Query;
@@ -144,7 +145,7 @@ public void loaded(String nsURI, EPackage pak) {
 
             @Override
             public void unloaded(String nsURI, EPackage pak) {
-                queryEnvironment.removeEPackage(pak.getName());
+                queryEnvironment.removeEPackage(pak);
             }
         };
         this.javaExtensions.addClassLoadingCallBack(callback);
@@ -215,7 +216,7 @@ public IEvaluationResult evaluateExpression(final EObject target, final String f
         try {
             AstResult build = parsedExpressions.get(expression);
             IQueryEvaluationEngine evaluationEngine = QueryEvaluation.newEngine(queryEnvironment);
-            final EvaluationResult evalResult = evaluationEngine.eval(build, variables);
+            EvaluationResult evalResult = evaluationEngine.eval(build, variables);
 
             final BasicDiagnostic diagnostic = new BasicDiagnostic();
             if (Diagnostic.OK != build.getDiagnostic().getSeverity()) {
@@ -359,11 +360,11 @@ public Map<String, VariableType> getInferredVariableTypes(Boolean value) {
     @Override
     public Collection<Method> getImplementation(String serviceCall) {
         javaExtensions.reloadIfNeeded();
-        Set<org.eclipse.acceleo.query.runtime.IService> registeredServices = queryEnvironment.getLookupEngine().getRegisteredServices();
+        Set<IService<?>> registeredServices = queryEnvironment.getLookupEngine().getRegisteredServices();
         List<Method> results = new ArrayList<Method>();
         registeredServices.iterator().forEachRemaining(s -> {
             if (s instanceof JavaMethodService) {
-                results.add(((JavaMethodService) s).getMethod());
+                results.add(((JavaMethodService) s).getOrigin());
             }
         });
 

diff --git a/plugins/org.eclipse.sirius.common.interpreter.aql/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.interpreter.aql/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Export-Package: org.eclipse.sirius.common.interpreter.aql;version="5.0.0"
-Require-Bundle: org.eclipse.acceleo.query;bundle-version="[7.0.0,8.0.0)",
+Require-Bundle: org.eclipse.acceleo.query;bundle-version="8.0.2",
  org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.sirius.common.interpreter;bundle-version="[5.0.0,8.0.0)",

diff --git a/....common.interpreter.aql/src/org/eclipse/sirius/common/interpreter/aql/AQLInterpreter.java b/....common.interpreter.aql/src/org/eclipse/sirius/common/interpreter/aql/AQLInterpreter.java
@@ -15,9 +15,9 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
+import org.eclipse.acceleo.query.parser.AstResult;
 import org.eclipse.acceleo.query.runtime.EvaluationResult;
 import org.eclipse.acceleo.query.runtime.IQueryBuilderEngine;
-import org.eclipse.acceleo.query.runtime.IQueryBuilderEngine.AstResult;
 import org.eclipse.acceleo.query.runtime.IQueryEnvironment;
 import org.eclipse.acceleo.query.runtime.IQueryEvaluationEngine;
 import org.eclipse.acceleo.query.runtime.Query;

diff --git a/...ties/src/org/eclipse/sirius/tests/ui/properties/internal/preprocessor/AQLInterpreter.java b/...ties/src/org/eclipse/sirius/tests/ui/properties/internal/preprocessor/AQLInterpreter.java
@@ -15,9 +15,9 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
+import org.eclipse.acceleo.query.parser.AstResult;
 import org.eclipse.acceleo.query.runtime.EvaluationResult;
 import org.eclipse.acceleo.query.runtime.IQueryBuilderEngine;
-import org.eclipse.acceleo.query.runtime.IQueryBuilderEngine.AstResult;
 import org.eclipse.acceleo.query.runtime.IQueryEnvironment;
 import org.eclipse.acceleo.query.runtime.IQueryEvaluationEngine;
 import org.eclipse.acceleo.query.runtime.Query;

diff --git a/releng/org.eclipse.sirius.targets/sirius_canary.target b/releng/org.eclipse.sirius.targets/sirius_canary.target
@@ -15,7 +15,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
-      <repository id="Sirius-7.2.1" location="https://download.eclipse.org/sirius/updates/releases/7.2.1/2023-03/"/>
+      <repository id="Sirius-7.3.0" location="https://download.eclipse.org/sirius/updates/releases/7.3.0/2023-03/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -99,10 +99,13 @@
       <unit id="org.eclipse.acceleo.ide.ui" version="0.0.0"/>
       <unit id="org.eclipse.acceleo.ui.interpreter.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.acceleo.ui.interpreter.source.feature.group" version="0.0.0"/>
+      <repository id="Acceleo-3.7" location="https://download.eclipse.org/acceleo/updates/releases/3.7/R202211151354/"/>
+   </location>
+   <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.acceleo.query.source.feature.group" version="0.0.0"/>
       <unit id="org.antlr.runtime" version="0.0.0"/>
-      <repository id="Acceleo-3.7" location="https://download.eclipse.org/acceleo/updates/releases/3.7/R202211151354/"/>
+      <repository id="Acceleo-master" location="https://download.eclipse.org/acceleo/updates/nightly/latest"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>