Skip to content

refactor: migrate from org.eclipse.xtend to local type system #1277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
joaodinissf wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

refactor: migrate from org.eclipse.xtend to local type system #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3af2bbc
refactor: migrate from org.eclipse.xtend to local type system
claude Mar 2, 2026
2e1ba24
fix: resolve CI failures in xtend migration
claude Mar 2, 2026
58a63e9
fix: resolve checkstyle and PMD violations in xtend migration
claude Mar 2, 2026
246890a
fix: simplify boolean return in EClassXtendType (PMD SimplifyBooleanR…
joaodinissf Mar 2, 2026
ed28512
fix: resolve Java type names in local type system (e.g. java::lang::S…
joaodinissf Mar 2, 2026
9f030c3
fix: remove org.eclipse.xtend from test project required bundles
joaodinissf Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Bundle-Vendor: Avaloq Group AG
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtend,
org.eclipse.xtend.typesystem.emf,
org.eclipse.xtext.xtext.generator,
org.apache.commons.logging;resolution:=optional,
org.eclipse.emf.codegen.ecore;resolution:=optional,
Expand Down
111 changes: 19 additions & 92 deletions ....xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportGeneratorSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,21 @@
*******************************************************************************/
package com.avaloq.tools.ddk.xtext.export.generator;

import java.util.HashMap;
import java.util.List;

import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.internal.xtend.expression.parser.SyntaxConstants;
import org.eclipse.xtend.expression.ExecutionContextImpl;
import org.eclipse.xtend.expression.ResourceManagerDefaultImpl;
import org.eclipse.xtend.expression.TypeSystemImpl;
import org.eclipse.xtend.expression.Variable;
import org.eclipse.xtend.typesystem.Type;
import org.eclipse.xtend.typesystem.emf.EmfRegistryMetaModel;
import org.eclipse.xtext.resource.IEObjectDescription;

import com.avaloq.tools.ddk.xtext.export.export.ExportModel;
import com.avaloq.tools.ddk.xtext.export.export.ExportPackage;
import com.avaloq.tools.ddk.xtext.export.export.Extension;
import com.avaloq.tools.ddk.xtext.export.export.Import;
import com.avaloq.tools.ddk.xtext.expression.generator.CompilationContext;
import com.avaloq.tools.ddk.xtext.expression.generator.GenModelUtilX;
import com.avaloq.tools.ddk.xtext.expression.generator.GeneratorSupport;
import com.avaloq.tools.ddk.xtext.expression.generator.type.DefaultXtendExecutionContext;
import com.avaloq.tools.ddk.xtext.expression.generator.type.EmfRegistryMetaModel;
import com.avaloq.tools.ddk.xtext.expression.generator.type.XtendType;
import com.avaloq.tools.ddk.xtext.util.EObjectUtil;
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;

Expand All @@ -44,7 +35,7 @@
public final class ExportGeneratorSupport extends GeneratorSupport {

/**
* Return a compilation context for Xtend executions during the generator run.
* Return a compilation context for executions during the generator run.
*
* @param model
* the BuildDescription for which we generate
Expand All @@ -57,13 +48,18 @@ public CompilationContext getCompilationContext(final ExportModel model, final G
}

/**
* Helper class defining the execution context for an Xtend compilation during build generation.
* Helper class defining the execution context for a compilation during build generation.
* Sets up the metamodels as needed.
*/
private static class ExportExecutionContext extends ExecutionContextImpl {
private static class ExportExecutionContext extends DefaultXtendExecutionContext {

/**
* Creates a new execution context for the given export model.
*
* @param model
* the export model
*/
ExportExecutionContext(final ExportModel model) {
super(new ResourceManagerDefaultImpl(), new ExportResource(model), new TypeSystemImpl(), new HashMap<String, Variable>(), null, null, null, null, null, null, null, null, null);
registerMetaModels(model);
}

Expand All @@ -82,94 +78,25 @@ public EPackage apply(final IEObjectDescription from) {
return (EPackage) EcoreUtil.resolve(from.getEObjectOrProxy(), model);
}
})).toArray(new EPackage[0]);
registerMetaModel(new EmfRegistryMetaModel() {
@Override
public EPackage[] allPackages() {
return ePackages;
}

registerMetaModel(new EmfRegistryMetaModel(ePackages) {
@Override
public Type getTypeForName(final String name) {
final String[] frags = name.split(SyntaxConstants.NS_DELIM);
public XtendType getTypeForName(final String name) {
if (name == null) {
return null;
}
final String[] frags = name.split(NS_DELIM);
if (frags.length == 2) {
// convert references which use import alias
for (Import imp : model.getImports()) {
if (frags[0].equals(imp.getName()) && imp.getPackage() != null) {
return super.getTypeForName(imp.getPackage().getName() + SyntaxConstants.NS_DELIM + frags[1]);
return super.getTypeForName(imp.getPackage().getName() + NS_DELIM + frags[1]);
}
}
}
return super.getTypeForName(name);
}
});
// Finally, add the default meta models
// registerMetaModel(new EmfRegistryMetaModel());
// registerMetaModel(new JavaBeansMetaModel());
}
}

/**
* "Fake" resource for Xtend compilation that gives correct extensions and package imports depending on whether
* we're running Xtend inside the export section or the scoping section.
*/
private static class ExportResource implements org.eclipse.xtend.expression.Resource {

private final ExportModel model;
private String qualifiedName;
private List<String> importedExtensions;
private Iterable<String> importedNamespaces;

ExportResource(final ExportModel model) {
this.model = model;
}

@Override
public String getFullyQualifiedName() {
if (qualifiedName == null) {
this.setFullyQualifiedName(model.eResource().getURI().path());
}
return qualifiedName;
}

@Override
public String[] getImportedExtensions() {
if (importedExtensions == null) {
importedExtensions = Lists.transform(model.getExtensions(), new Function<Extension, String>() {
@Override
public String apply(final Extension from) {
return from.getExtension();
}
});
}
// Hmmm... do we have to care about re-exported extensions? Or does Xtend do that by itself?
return importedExtensions.toArray(new String[importedExtensions.size()]);
}

@Override
public String[] getImportedNamespaces() {
if (importedNamespaces == null) {
importedNamespaces = Iterables.filter(Iterables.transform(model.getImports(), new Function<Import, String>() {
@Override
public String apply(final Import from) {
if (from.getPackage() == null) {
return null;
}
final String name = from.getPackage().getName();
if (name == null || name.length() == 0) {
return null;
}
return name;
}
}), Predicates.<String> notNull());
}
return Lists.newArrayList(importedNamespaces).toArray(new String[0]);
}

@Override
public void setFullyQualifiedName(final String fqn) {
qualifiedName = fqn;
}

}

}
31 changes: 0 additions & 31 deletions ...ls.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,10 @@
import java.util.Collection;
import java.util.List;

import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.internal.xtend.xtend.XtendFile;
import org.eclipse.osgi.util.NLS;
import org.eclipse.xtend.expression.Resource;
import org.eclipse.xtend.expression.ResourceManager;
import org.eclipse.xtend.expression.ResourceManagerDefaultImpl;
import org.eclipse.xtext.EcoreUtil2;
import org.eclipse.xtext.naming.QualifiedName;
import org.eclipse.xtext.validation.Check;
Expand All @@ -32,7 +26,6 @@
import com.avaloq.tools.ddk.xtext.export.export.Export;
import com.avaloq.tools.ddk.xtext.export.export.ExportModel;
import com.avaloq.tools.ddk.xtext.export.export.ExportPackage;
import com.avaloq.tools.ddk.xtext.export.export.Extension;
import com.avaloq.tools.ddk.xtext.export.export.Interface;
import com.avaloq.tools.ddk.xtext.export.export.InterfaceField;
import com.avaloq.tools.ddk.xtext.export.export.InterfaceNavigation;
Expand All @@ -50,30 +43,6 @@
@SuppressWarnings("nls")
public class ExportValidator extends AbstractExportValidator {

/**
* Verifies that all referenced extensions can be found.
*
* @param model
* export model to check
*/
@Check
public void checkExtensions(final ExportModel model) {
ResourceManager resourceManager = null;
if (!Platform.isRunning()) {
resourceManager = new ResourceManagerDefaultImpl();
}

if (resourceManager == null) {
return;
}
for (Extension ext : model.getExtensions()) {
final Resource res = resourceManager.loadResource(ext.getExtension(), XtendFile.FILE_EXTENSION);
if (res == null) {
error(NLS.bind("Extension ''{0}'' not found", ext.getExtension()), ext, ExportPackage.Literals.EXTENSION__EXTENSION, null);
}
}
}

/**
* Checks that the interfaces and exports in an export section all are declared for a unique type.
*
Expand Down
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ Bundle-Version: 17.2.0.qualifier
Bundle-Vendor: Avaloq Group AG
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtend,
org.eclipse.xtend.typesystem.emf,
org.eclipse.xtext.xtext.generator,
org.apache.commons.logging;resolution:=optional,
org.eclipse.emf.codegen.ecore;resolution:=optional,
Expand All @@ -32,6 +30,7 @@ Export-Package: com.avaloq.tools.ddk.xtext.expression,
com.avaloq.tools.ddk.xtext.expression.expression.util,
com.avaloq.tools.ddk.xtext.expression.formatting,
com.avaloq.tools.ddk.xtext.expression.generator,
com.avaloq.tools.ddk.xtext.expression.generator.type,
com.avaloq.tools.ddk.xtext.expression.parser.antlr,
com.avaloq.tools.ddk.xtext.expression.parser.antlr.internal,
com.avaloq.tools.ddk.xtext.expression.scoping,
Expand Down
Loading
Loading