Merge branch 'release/1.4.1' into master

InseeFr · Jun 25, 2024 · a01a7ef · a01a7ef
2 parents 0dec974 + 0b25b97
commit a01a7ef
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 55 deletions.
diff --git a/coverage/pom.xml b/coverage/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>fr.insee.trevas</groupId>
         <artifactId>trevas-parent</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1</version>
     </parent>
 
     <artifactId>coverage</artifactId>
@@ -22,32 +22,32 @@
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-engine</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>1.4.1</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-jackson</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>1.4.1</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-jdbc</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>1.4.1</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-model</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>1.4.1</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-parser</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>1.4.1</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-spark</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>1.4.1</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/docs/yarn.lock b/docs/yarn.lock
@@ -1561,7 +1561,7 @@
     "@docusaurus/theme-search-algolia" "2.4.1"
     "@docusaurus/types" "2.4.1"
 
-"@docusaurus/[email protected]", "react-loadable@npm:@docusaurus/[email protected]":
+"@docusaurus/[email protected]":
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz#81aae0db81ecafbdaee3651f12804580868fa6ce"
   integrity sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==
@@ -3151,11 +3151,11 @@ brace-expansion@^2.0.1:
     balanced-match "^1.0.0"
 
 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
@@ -4833,10 +4833,10 @@ filesize@^8.0.6:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
   integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -7753,6 +7753,14 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1:
   dependencies:
     "@babel/runtime" "^7.10.3"
 
+"react-loadable@npm:@docusaurus/[email protected]":
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz#81aae0db81ecafbdaee3651f12804580868fa6ce"
+  integrity sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==
+  dependencies:
+    "@types/react" "*"
+    prop-types "^15.6.2"
+
 react-player@^2.16.0:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/react-player/-/react-player-2.16.0.tgz#89070700b03f5a5ded9f0b3165d4717390796481"
@@ -9614,14 +9622,14 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@^7.3.1:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 ws@^8.4.2:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
-  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>fr.insee.trevas</groupId>
     <artifactId>trevas-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
     <modules>
         <module>vtl-parser</module>
         <module>vtl-model</module>
@@ -15,6 +15,7 @@
         <module>vtl-jdbc</module>
         <module>vtl-sdmx</module>
         <module>vtl-csv</module>
+        <module>coverage</module>
     </modules>
 
     <name>Trevas</name>

diff --git a/vtl-csv/pom.xml b/vtl-csv/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>fr.insee.trevas</groupId>
         <artifactId>trevas-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <artifactId>vtl-csv</artifactId>
     <name>VTL CSV</name>
     <description>CSV module for the VTL model</description>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <properties>
         <sonar.coverage.jacoco.xmlReportPaths>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-model</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
         </dependency>
         <dependency>
             <groupId>net.sf.supercsv</groupId>

diff --git a/vtl-engine/pom.xml b/vtl-engine/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>fr.insee.trevas</groupId>
         <artifactId>trevas-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <artifactId>vtl-engine</artifactId>
     <name>VTL Engine</name>
     <description>VTL engine framework for Trevas</description>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <properties>
         <sonar.coverage.jacoco.xmlReportPaths>
@@ -25,13 +25,13 @@
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-parser</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-model</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/vtl-jackson/pom.xml b/vtl-jackson/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>fr.insee.trevas</groupId>
         <artifactId>trevas-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <artifactId>vtl-jackson</artifactId>
     <name>VTL Jackson</name>
     <description>Jackson module for the VTL model</description>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <properties>
         <sonar.coverage.jacoco.xmlReportPaths>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-model</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/vtl-jdbc/pom.xml b/vtl-jdbc/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>fr.insee.trevas</groupId>
         <artifactId>trevas-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <artifactId>vtl-jdbc</artifactId>
     <name>VTL JDBC</name>
     <description>Dataset wrapper around JDBC result set. Useful to expose SQL tables as VTL datasets</description>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <properties>
         <sonar.coverage.jacoco.xmlReportPaths>
@@ -25,14 +25,14 @@
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-model</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-engine</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/vtl-model/pom.xml b/vtl-model/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>fr.insee.trevas</groupId>
         <artifactId>trevas-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <dependencies>
@@ -21,7 +21,7 @@
     <artifactId>vtl-model</artifactId>
     <name>VTL Model</name>
     <description>Model describing VTL expressions and bindings</description>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <properties>
         <sonar.coverage.jacoco.xmlReportPaths>

diff --git a/vtl-parser/pom.xml b/vtl-parser/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>fr.insee.trevas</groupId>
         <artifactId>trevas-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <artifactId>vtl-parser</artifactId>
     <name>VTL Parser</name>
     <description>Artifacts generated by Antlr from the VTL grammar files</description>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <!--    Warning: not lastest, align with version embedded by Spark-->
     <properties>

diff --git a/vtl-sdmx/pom.xml b/vtl-sdmx/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>fr.insee.trevas</groupId>
         <artifactId>trevas-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <artifactId>vtl-sdmx</artifactId>
     <name>VTL SDMX</name>
     <description>Dataset wrapper around SDMX</description>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <repositories>
         <repository>
@@ -40,24 +40,24 @@
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-model</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-engine</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-csv</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-spark</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/vtl-sdmx/src/main/java/fr/insee/vtl/sdmx/TrevasSDMXUtils.java b/vtl-sdmx/src/main/java/fr/insee/vtl/sdmx/TrevasSDMXUtils.java
@@ -23,7 +23,7 @@
 
 import static fr.insee.vtl.model.Structured.Component;
 
-class TrevasSDMXUtils {
+public class TrevasSDMXUtils {
 
     private static final StaxStructureReaderEngine structureReaderSDMX3 = StaxStructureReaderEngineV3.getInstance();
 

diff --git a/vtl-sdmx/src/main/java/module-info.java b/vtl-sdmx/src/main/java/module-info.java
@@ -0,0 +1,13 @@
+/**
+ * This module exposes SDMX tools for VTL.
+ */
+
+module fr.insee.vtl.sdmx {
+    requires fr.insee.vtl.model;
+    requires fusion.api.sdmx;
+    requires fusion.api;
+    requires java.scripting;
+    requires fusion.sdmx.ml;
+    requires fusion.utils;
+    exports fr.insee.vtl.sdmx;
+}
diff --git a/.../test/java/fr/insee/vtl/sdmx/BPETest.java → ...x/src/test/java/fr/insee/vtl/BPETest.java b/.../test/java/fr/insee/vtl/sdmx/BPETest.java → ...x/src/test/java/fr/insee/vtl/BPETest.java
@@ -1,9 +1,11 @@
-package fr.insee.vtl.sdmx;
+package fr.insee.vtl;
 
 import fr.insee.vtl.engine.VtlScriptEngine;
 import fr.insee.vtl.model.Dataset;
 import fr.insee.vtl.model.PersistentDataset;
 import fr.insee.vtl.model.Structured;
+import fr.insee.vtl.sdmx.SDMXVTLWorkflow;
+import fr.insee.vtl.sdmx.TrevasSDMXUtils;
 import fr.insee.vtl.spark.SparkDataset;
 import io.sdmx.api.io.ReadableDataLocation;
 import io.sdmx.utils.core.io.ReadableDataLocationTmp;

diff --git a/.../fr/insee/vtl/sdmx/DataStructureTest.java → .../java/fr/insee/vtl/DataStructureTest.java b/.../fr/insee/vtl/sdmx/DataStructureTest.java → .../java/fr/insee/vtl/DataStructureTest.java
@@ -1,6 +1,7 @@
-package fr.insee.vtl.sdmx;
+package fr.insee.vtl;
 
 import fr.insee.vtl.csv.CSVDataset;
+import fr.insee.vtl.sdmx.TrevasSDMXUtils;
 import org.junit.jupiter.api.Test;
 
 import java.io.FileReader;

diff --git a/...r/insee/vtl/sdmx/SDMXVTLWorkflowTest.java → ...ava/fr/insee/vtl/SDMXVTLWorkflowTest.java b/...r/insee/vtl/sdmx/SDMXVTLWorkflowTest.java → ...ava/fr/insee/vtl/SDMXVTLWorkflowTest.java
@@ -1,9 +1,10 @@
-package fr.insee.vtl.sdmx;
+package fr.insee.vtl;
 
 import fr.insee.vtl.engine.VtlScriptEngine;
 import fr.insee.vtl.model.Dataset;
 import fr.insee.vtl.model.PersistentDataset;
 import fr.insee.vtl.model.Structured;
+import fr.insee.vtl.sdmx.SDMXVTLWorkflow;
 import io.sdmx.api.io.ReadableDataLocation;
 import io.sdmx.utils.core.io.ReadableDataLocationTmp;
 import org.apache.spark.sql.SparkSession;