[463226] Adapt AQL integration to API changes regarding EvaluationResult

Make the bridge collect the actual result value from the evaluation
engine. This commit does not bring proper runtime error reporting based
on the list of Diagnostics returned by AQL, this needs more testing and
will come in a future commit.

Bug: 463226
Change-Id: I02bd7d9a435f01c63bd29cb63df6652321af2197
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>

1 files changed, 3 insertions, 1 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
index fc5142a136..a8ca0631f7 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
@@ -27,6 +27,7 @@ import java.util.concurrent.ExecutionException;
 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;
@@ -183,7 +184,8 @@ public class AQLSiriusInterpreter extends AcceleoAbstractInterpreter {
         try {
             build = parsedExpressions.get(expression);
             IQueryEvaluationEngine evaluationEngine = QueryEvaluation.newEngine(queryEnvironment);
-            return evaluationEngine.eval(build, variables);
+            EvaluationResult evalResult = evaluationEngine.eval(build, variables);
+            return evalResult.getResult();
         } catch (ExecutionException e) {
             throw new EvaluationException(e.getCause());
         }