Merge branch 'release/1.2.0' into master

Making-Sense-Info · Nov 22, 2023 · 7800c34 · 7800c34
2 parents caacef3 + 6597634
commit 7800c34
Show file tree

Hide file tree

Showing 51 changed files with 2,036 additions and 1,812 deletions.
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -2,7 +2,7 @@ name: Trevas Tests
 
 on:
   pull_request:
-    types: [ opened, synchronize, reopened ]
+    types: [opened, synchronize, reopened]
     branches:
       - "!master"
       - "!develop"
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: 11
-          distribution: 'adopt'
+          java-version: 17
+          distribution: "adopt"
       - name: Test
         run: mvn test
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,10 +9,10 @@ on:
     paths-ignore:
       - "docs/**"
   pull_request:
-    types: [ opened, synchronize, reopened ]
+    types: [opened, synchronize, reopened]
     branches:
-      - 'master'
-      - 'develop'
+      - "master"
+      - "develop"
 
 jobs:
   build:
@@ -24,8 +24,8 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: 11
-          distribution: 'adopt'
+          java-version: 17
+          distribution: "adopt"
       - name: Test, package and analyze with maven & SonarCloud
         run: mvn verify sonar:sonar -Dsonar.projectKey=InseeFr_Trevas -Dsonar.organization=inseefr -Dsonar.host.url=https://sonarcloud.io
         env:

diff --git a/.github/workflows/publish-maven.yml b/.github/workflows/publish-maven.yml
@@ -13,8 +13,8 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: 11
-          distribution: "adopt"
+          java-version: "17"
+          distribution: "temurin"
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -28,8 +28,8 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: 11
-          distribution: 'adopt'
+          java-version: 17
+          distribution: "adopt"
       - name: Publish package
         run: mvn --batch-mode deploy
         env:

diff --git a/docs/docs/developer-guide/index-developer-guide.mdx b/docs/docs/developer-guide/index-developer-guide.mdx
@@ -27,18 +27,31 @@ ScriptEngine engine = new ScriptEngineManager().getEngineByName("vtl");
 
 // Add input bindings to engine
 Bindings bindings = new SimpleBindings();
+InMemoryDataset dataset = new InMemoryDataset(
+                List.of(
+                        Map.of("var1", "x", "var2", "y", "var3", 5),
+                        Map.of("var1", "xx", "var2", "yy", "var3", 10)
+                ),
+                Map.of("var1", String.class, "var2", String.class, "var3", Long.class),
+                Map.of("var1", Role.IDENTIFIER, "var2", Role.ATTRIBUTE, "var3", Role.MEASURE)
+);
 bindings.put("a", 1);
+bindings.put("ds", dataset);
 engine.setBindings(b, ScriptContext.ENGINE_SCOPE);
 
 // Execute script
 try {
-        engine.eval("b := a + 1;");
+        engine.eval("b := a + 1; " +
+					"ds1 := ds;" +
+					"ds2 <- ds;");
 } catch (VtlScriptException e) {
 		logger.warn("Eval failed: ", e);
 }
 
 // Get result
 Long result = (Long) engine.getBindings(ScriptContext.ENGINE_SCOPE).get("b");
+Dataset ds1 = (Dataset) engine.getBindings(ScriptContext.ENGINE_SCOPE).get("ds1");
+PersistentDataset result = (PersistentDataset) engine.getBindings(ScriptContext.ENGINE_SCOPE).get("ds2");
 ```
 
 ### Execution mode

diff --git a/docs/docs/user-guide/coverage/general-operators.mdx b/docs/docs/user-guide/coverage/general-operators.mdx
@@ -9,7 +9,7 @@ custom_edit_url: null
 | Name                                               | Symbol |     Supported      |
 | -------------------------------------------------- | :----- | :----------------: |
 | Parentheses                                        | ( )    | :heavy_check_mark: |
-| Persistent assignment                              | <-     |        :x:         |
+| Persistent assignment                              | <-     | :heavy_check_mark: |
 | Temporary assignment                               | :=     | :heavy_check_mark: |
 | Membership                                         | #      | :heavy_check_mark: |
 | User-defined operator call                         |        | :heavy_check_mark: |