Skip to content

Tedefo 4805 efx rules translator #129

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

Merged
bertrand-lorentz merged 12 commits into from
Feb 2, 2026
Merged

Tedefo 4805 efx rules translator #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7209b30
Add EFX Rules to Schematron transpiler foundation
rousso Nov 12, 2025
e20dacf
Fix license text in multiple interface files
rousso Dec 9, 2025
2095b7d
Added notice subtype handling to SdkSymbolResolver.
rousso Dec 9, 2025
d51c7c9
Add EFX Rules to Schematron translator
rousso Dec 25, 2025
694a7bc
Refactor: Rename ValidatorMarkupGenerator to ValidatorGenerator and S…
rousso Dec 26, 2025
673b2b1
EfxRulesTranslatorV2Test: Fix unit tests on Windows
bertrand-lorentz Jan 9, 2026
b95a7f4
Remove IOException from ValidatorGenerator interface
rousso Feb 2, 2026
fc93cf7
Upgrade Freemarker from 2.3.31 to 2.3.34
rousso Feb 2, 2026
99de188
Use uppercase for Schematron role attribute
rousso Feb 2, 2026
7aea918
Fix testDiagnostics_NoDuplicateEntries to actually generate diagnostics
rousso Feb 2, 2026
95c1176
Swap test expression order in WHEN clauses - put assertion before con…
rousso Feb 2, 2026
f6f2bb8
Fix build with JDK 11
bertrand-lorentz Feb 2, 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
12 changes: 11 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@
<!-- Versions - eForms -->
<version.eforms-sdk-1>1.13.0</version.eforms-sdk-1>
<version.eforms-sdk-2>2.0.0-SNAPSHOT</version.eforms-sdk-2>
<version.eforms-core>1.5.0</version.eforms-core>
<version.eforms-core>1.6.0-SNAPSHOT</version.eforms-core>

<!-- Versions - Third-party libraries -->
<version.antlr4>4.13.1</version.antlr4>
<version.commons-lang3>3.18.0</version.commons-lang3>
<version.freemarker>2.3.34</version.freemarker>
<version.logback>1.5.18</version.logback>
<version.jackson>2.18.3</version.jackson>
<version.jackson-databind>2.18.3</version.jackson-databind>
Expand Down Expand Up @@ -121,6 +122,11 @@
<artifactId>antlr4-runtime</artifactId>
<version>${version.antlr4}</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>${version.freemarker}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -146,6 +152,10 @@
<artifactId>antlr4-runtime</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/eu/europa/ted/eforms/sdk/ComponentFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import eu.europa.ted.efx.interfaces.ScriptGenerator;
import eu.europa.ted.efx.interfaces.SymbolResolver;
import eu.europa.ted.efx.interfaces.TranslatorOptions;
import eu.europa.ted.efx.interfaces.ValidatorGenerator;

public class ComponentFactory extends SdkComponentFactory {
public static final ComponentFactory INSTANCE = new ComponentFactory();
Expand Down Expand Up @@ -96,7 +97,7 @@ public static synchronized SymbolResolver getSymbolResolver(final String sdkVers
// Create new instance (this can throw InstantiationException)
SymbolResolver newInstance = ComponentFactory.INSTANCE.getComponentImpl(sdkVersion,
SdkComponentType.SYMBOL_RESOLVER, qualifier, SymbolResolver.class, sdkVersion, sdkRootPath);

// Store and return
instances.put(key, newInstance);
return newInstance;
Expand All @@ -113,6 +114,18 @@ public static MarkupGenerator getMarkupGenerator(final String sdkVersion, final
SdkComponentType.MARKUP_GENERATOR, qualifier, MarkupGenerator.class, options);
}

public static ValidatorGenerator getValidatorGenerator(final String sdkVersion,
TranslatorOptions options) throws InstantiationException {
return getValidatorGenerator(sdkVersion, "", options);
}

public static ValidatorGenerator getValidatorGenerator(final String sdkVersion,
final String qualifier, TranslatorOptions options) throws InstantiationException {
return ComponentFactory.INSTANCE.getComponentImpl(sdkVersion,
SdkComponentType.VALIDATOR_GENERATOR, qualifier, ValidatorGenerator.class,
options);
}

public static ScriptGenerator getScriptGenerator(final String sdkVersion, TranslatorOptions options)
throws InstantiationException {
return getScriptGenerator(sdkVersion, "", options);
Expand Down
16 changes: 14 additions & 2 deletions src/main/java/eu/europa/ted/eforms/sdk/SdkSymbolResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
import eu.europa.ted.eforms.sdk.entity.SdkCodelist;
import eu.europa.ted.eforms.sdk.entity.SdkField;
import eu.europa.ted.eforms.sdk.entity.SdkNode;
import eu.europa.ted.eforms.sdk.entity.SdkNoticeSubtype;
import eu.europa.ted.eforms.sdk.repository.SdkCodelistRepository;
import eu.europa.ted.eforms.sdk.repository.SdkFieldRepository;
import eu.europa.ted.eforms.sdk.repository.SdkNodeRepository;
import eu.europa.ted.eforms.sdk.repository.SdkNoticeTypeRepository;
import eu.europa.ted.eforms.sdk.resource.SdkResourceLoader;
import eu.europa.ted.eforms.xpath.XPathInfo;
import eu.europa.ted.eforms.xpath.XPathProcessor;
Expand All @@ -41,6 +43,8 @@ public class SdkSymbolResolver implements SymbolResolver {

protected Map<String, SdkCodelist> codelistById;

protected Map<String, SdkNoticeSubtype> noticeTypesById;

/**
* Builds EFX list from the passed codelist reference. This will lazily compute
* and cache the
Expand Down Expand Up @@ -77,12 +81,15 @@ protected void loadMapData(final String sdkVersion, final Path sdkRootPath)
SdkConstants.SdkResource.FIELDS_JSON, sdkRootPath);
Path codelistsPath = SdkResourceLoader.getResourceAsPath(sdkVersion,
SdkConstants.SdkResource.CODELISTS, sdkRootPath);
Path noticeTypesPath = SdkResourceLoader.getResourceAsPath(sdkVersion,
SdkConstants.SdkResource.NOTICE_TYPES_JSON, sdkRootPath);

this.fieldById = new SdkFieldRepository(sdkVersion, jsonPath);
this.fieldByAlias = indexFieldsByAlias();
this.nodeById = new SdkNodeRepository(sdkVersion, jsonPath);
this.nodeByAlias = indexNodesByAlias();
this.codelistById = new SdkCodelistRepository(sdkVersion, codelistsPath);
this.noticeTypesById = new SdkNoticeTypeRepository(sdkVersion, noticeTypesPath);
}

/**
Expand Down Expand Up @@ -227,6 +234,11 @@ public String getNodeIdFromAlias(String alias) {
return null;
}

@Override
public List<String> getAllNoticeSubtypeIds() {
return noticeTypesById.keySet().stream().map(String::toUpperCase).sorted()
.collect(Collectors.toList());
}

private HashMap<String, SdkField> indexFieldsByAlias() {
return this.fieldById.values().stream()
Expand Down Expand Up @@ -268,8 +280,8 @@ private void cacheAdditionalFieldInfo(final String fieldId) {
}
XPathInfo xpathInfo = XPathProcessor.parse(this.getAbsolutePathOfField(fieldId).getScript());
additionalFieldInfoMap.put(fieldId, xpathInfo);
}
}

// #endregion Temporary helpers ------------------------------------------------

}
33 changes: 33 additions & 0 deletions src/main/java/eu/europa/ted/eforms/sdk/schematron/SchematronAssert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright 2022 European Union
*
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European
* Commission – subsequent versions of the EUPL (the "Licence"); You may not use this work except in
* compliance with the Licence. You may obtain a copy of the Licence at:
* https://joinup.ec.europa.eu/software/page/eupl
*
* Unless required by applicable law or agreed to in writing, software distributed under the Licence
* is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the Licence for the specific language governing permissions and limitations under
* the Licence.
*/
package eu.europa.ted.eforms.sdk.schematron;

import eu.europa.ted.efx.model.Context;
import eu.europa.ted.efx.model.rules.ValidationRule;

/**
* Represents a Schematron &lt;assert&gt; element.
* Fires when the test expression evaluates to false.
*/
public class SchematronAssert extends SchematronTest {

public SchematronAssert(ValidationRule rule, Context ruleContext) {
super(rule, ruleContext);
}

@Override
public String getElementName() {
return "assert";
}
}
56 changes: 56 additions & 0 deletions src/main/java/eu/europa/ted/eforms/sdk/schematron/SchematronDiagnostic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* Copyright 2022 European Union
*
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European
* Commission – subsequent versions of the EUPL (the "Licence"); You may not use this work except in
* compliance with the Licence. You may obtain a copy of the Licence at:
* https://joinup.ec.europa.eu/software/page/eupl
*
* Unless required by applicable law or agreed to in writing, software distributed under the Licence
* is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the Licence for the specific language governing permissions and limitations under
* the Licence.
*/
package eu.europa.ted.eforms.sdk.schematron;

import eu.europa.ted.eforms.xpath.XPathProcessor;
import eu.europa.ted.efx.model.Context;

/**
* Represents a Schematron &lt;diagnostic&gt; element.
* Used in the &lt;diagnostics&gt; section of complete-validation.sch.
* Format: &lt;diagnostic id="..." see="field:..."&gt;xpath&lt;/diagnostic&gt;
*/
public class SchematronDiagnostic {

private final String id;
private final String seeAttribute;
private final String xpath;

private static String sanitize(String identifier) {
return identifier.replace("(", "_").replace(")", "_");
}

public SchematronDiagnostic(Context subject, Context ruleContext) {
this.xpath = XPathProcessor.contextualize(
ruleContext.absolutePath().getScript(), subject.absolutePath().getScript());
this.id = sanitize(ruleContext.symbol()) + "_" + sanitize(subject.symbol());
String prefix = subject.isFieldContext() ? "field:" : "node:";
this.seeAttribute = prefix + subject.symbol();
}

/** Used by pattern.ftl and complete-validation.ftl */
public String getId() {
return this.id;
}

/** Used by complete-validation.ftl */
public String getSeeAttribute() {
return this.seeAttribute;
}

/** Used by complete-validation.ftl */
public String getXpath() {
return this.xpath;
}
}
Loading