Release 2.0.0-alpha.7

CHANGELOG.md

@@ -1,12 +1,19 @@
-# EFX Toolkit 2.0.0-alpha.6 Release Notes
+# EFX Toolkit 2.0.0-alpha.7 Release Notes
 
 _The EFX Toolkit for Java developers is a library that enables the transpilation of [EFX](https://docs.ted.europa.eu/eforms/latest/efx) expressions and templates to different target languages. It also includes an implementation of an EFX-to-XPath transpiler._
 
 ---
 
 ## In this release
 
-This is a major update that brings the toolkit in line with the complete EFX-2 grammar as released with SDK 2.0.0-alpha.2.
+This is an incremental update over 2.0.0-alpha.6. It refines SDK data-type resolution and updates the eForms Core dependency, while retaining full support for the EFX-2 grammar released with SDK 2.0.0-alpha.2.
+
+### Changes since 2.0.0-alpha.6
+
+- Field data types are now taken directly from the SDK field definitions, removing a temporary `SdkSymbolResolver` heuristic that inferred the `duration` type from `measure` fields using the `duration-unit` codelist. Added regression tests covering measure and duration fields.
+- Upgraded the eForms Core Java dependency to 1.7.0.
+
+The following sections describe the features of the 2.0.0 line, unchanged since 2.0.0-alpha.6.
 
 ### EFX-2 language support
 
@@ -52,16 +59,7 @@ NOTE: Transpilation of EFX-1 to XPath and XSL in this version of the EFX Toolkit
 
 ## Breaking changes
 
-For users of the Toolkit that have implemented custom transpilers, this release contains breaking changes from 2.0.0-alpha.5:
-
-- The expression model has been refactored to separate scalar and sequence types. The `path` subpackage has been removed and path expression types have been moved and renamed (e.g. `BooleanPathExpression` → `BooleanPath` under `scalar`).
-- `MarkupGenerator.composeOutputFile` signature changed from 2 parameters to 5 (globals, main section, summary section, navigation section, fragments). The old signature is deprecated with a default implementation.
-- Several new methods have been added to the `SymbolResolver`, `ScriptGenerator`, and `MarkupGenerator` interfaces.
-- `TranslatorOptions` has three new methods without defaults: `getUserDefinedFunctionNamespace()`, `isProfilerEnabled()`, `getProfilerOutputPath()`.
-- New typed exception classes replace previously generic exceptions.
-- Axis support and cross-notice references have been removed from the V2 translator.
-
-Users of the Toolkit that only use the included EFX-to-XPath transpiler will not be affected by the above changes.
+No new breaking changes are introduced in 2.0.0-alpha.7. For the breaking changes introduced earlier in the 2.0.0 line, see the [2.0.0-alpha.6 release notes](https://github.com/OP-TED/efx-toolkit-java/releases/tag/2.0.0-alpha.6).
 
 ## Future development
 
@@ -81,6 +79,4 @@ This version of the EFX Toolkit has a compile-time dependency on the following e
 - eForms SDK 1.x.x (SDK 1.13.0 grammar)
 - eForms SDK 2.0.0-alpha.2
 
-It also depends on the [eForms Core Java library](https://github.com/OP-TED/eforms-core-java) version 1.6.0.
-
-NOTE: The POM currently references SNAPSHOT versions for the SDK 2 and Core dependencies. These will be updated to released versions before publication.
+It also depends on the [eForms Core Java library](https://github.com/OP-TED/eforms-core-java) version 1.7.0.

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>efx-toolkit-java</artifactId>
-  <version>2.0.0-alpha.6</version>
+  <version>2.0.0-alpha.7</version>
   <packaging>jar</packaging>
 
   <name>EFX Toolkit for Java</name>
@@ -48,7 +48,7 @@
     <!-- Versions - eForms -->
     <version.eforms-sdk-1>1.13.0</version.eforms-sdk-1>
     <version.eforms-sdk-2>2.0.0-alpha.2</version.eforms-sdk-2>
-    <version.eforms-core>1.6.0</version.eforms-core>
+    <version.eforms-core>1.7.0</version.eforms-core>
 
     <!-- Versions - Third-party libraries -->
     <version.antlr4>4.13.1</version.antlr4>

src/main/java/eu/europa/ted/eforms/sdk/SdkSymbolResolver.java

@@ -305,16 +305,6 @@ public String getTypeOfField(String fieldId) {
       throw SymbolResolutionException.unknownSymbol(fieldId);
     }
 
-    // Temporary: the SDK does not yet distinguish duration from measure.
-    // Both are "measure" in the SDK, but durations use the "duration-unit" codelist.
-    // Remove this when the SDK adds "duration" as a proper data type.
-    if (FieldTypes.MEASURE.getName().equals(sdkField.getType())) {
-      SdkField unitCodeField = sdkField.getAttributeField("unitCode");
-      if (unitCodeField != null && "duration-unit".equals(unitCodeField.getCodelistId())) {
-        return FieldTypes.DURATION.getName();
-      }
-    }
-
     return sdkField.getType();
   }
 

src/test/java/eu/europa/ted/efx/sdk1/EfxExpressionTranslatorV1Test.java

@@ -161,6 +161,13 @@ void testFieldValueComparison_TypeMismatch() {
         () -> translateExpressionWithContext("ND-Root", "00:01:00 > BT-00-StartDate"));
   }
 
+  // TEDEFO-5013: In SDK 1.x "measure" is the duration type (SDK 2.x introduced "duration").
+  // A measure field compared with a duration literal should translate successfully.
+  @Test
+  void testDurationComparison_WithMeasureField_TEDEFO5013() {
+    translateExpressionWithContext("ND-Root", "BT-00-Measure > P7Y");
+  }
+
 
   @Test
   void testBooleanComparison_UsingLiterals() {

src/test/resources/json/sdk1-fields.json

@@ -121,6 +121,13 @@
       "xpathAbsolute": "/*/PathNode/DurationField",
       "xpathRelative": "PathNode/DurationField"
     },
+    {
+      "id": "BT-00-Measure",
+      "type": "measure",
+      "parentNodeId": "ND-Root",
+      "xpathAbsolute": "/*/PathNode/MeasureField",
+      "xpathRelative": "PathNode/MeasureField"
+    },
     {
       "id": "BT-00-Integer",
       "type": "integer",