Merge branch 'release/v1.22.0'

ehrbase · Sep 9, 2022 · 94ba0d1 · 94ba0d1
2 parents 1fa4112 + 4061037
commit 94ba0d1
Show file tree

Hide file tree

Showing 24 changed files with 271 additions and 515 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,20 @@
 
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## [1.22.0]
+ ### Added 
+ ### Fixed 
+- Folder creation
+- fix not unique rows in matrix formate ([#390](https://github.com/ehrbase/openEHR_SDK/pull/390))
+
 ## [1.21.0]
  ### Added
 - Get items from current folder ([#385](https://github.com/ehrbase/openEHR_SDK/pull/385))
  ### Fixed 
 - Removed caching of root folders to prevent false conflicts and memory leaks ([#385](https://github.com/ehrbase/openEHR_SDK/pull/385))
 -  new Matrix serialisation use rm-model for index and fix section handling ([#386](https://github.com/ehrbase/openEHR_SDK/pull/386))
 
+
 ## [1.20.0]
  ### Added 
 - Add spotless plugin, Add codestyle check to workflows ([#368](https://github.com/ehrbase/openEHR_SDK/pull/368))
@@ -196,3 +203,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 
 [1.20.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.19.0...v1.20.0
 [1.21.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.20.0...v1.21.0
+[1.22.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.21.0...v1.22.0
diff --git a/aql/pom.xml b/aql/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.21.0</version>
+        <version>1.22.0</version>
     </parent>
 
     <artifactId>aql</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -8,7 +8,7 @@
 
     <artifactId>bom</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>1.21.0</version>
+    <version>1.22.0</version>
     <packaging>pom</packaging>
 
     <name>openEHR SDK</name>

diff --git a/building/pom.xml b/building/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.21.0</version>
+        <version>1.22.0</version>
     </parent>
 
     <artifactId>building</artifactId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.21.0</version>
+        <version>1.22.0</version>
     </parent>
 
     <artifactId>client</artifactId>

diff --git a/...java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestDirectoryEndpoint.java b/...java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestDirectoryEndpoint.java
@@ -54,12 +54,10 @@ public FolderDAO getFolder(String path) {
     }
 
     synchronized void syncFromDb() {
-        if (root == null) {
-            try {
-                retrieveRootFolder();
-            } catch (WrongStatusCodeException e) {
-                createRootFolder();
-            }
+        try {
+            retrieveRootFolder();
+        } catch (WrongStatusCodeException e) {
+            createRootFolder();
         }
     }
 
@@ -119,7 +117,9 @@ private void copyToFolder(Folder folder, DirectoryResponseData responseData) {
     private void retrieveRootFolder() throws WrongStatusCodeException {
         Optional<DirectoryResponseData> directoryResponseData =
                 defaultRestClient.httpGet(resolve(StringUtils.EMPTY), DirectoryResponseData.class);
-        root = initRootFolder();
+        if (root == null) {
+            root = initRootFolder();
+        }
         copyToFolder(
                 root, directoryResponseData.orElseThrow(() -> new WrongStatusCodeException("Not Found", 404, 200)));
         rootVersion = new VersionUid(root.getUid().toString());

diff --git a/example-generator/pom.xml b/example-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>root</artifactId>
         <groupId>org.ehrbase.openehr.sdk</groupId>
-        <version>1.21.0</version>
+        <version>1.22.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>root</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>1.21.0</version>
+    <version>1.22.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/generator/pom.xml b/generator/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.21.0</version>
+        <version>1.22.0</version>
     </parent>
 
     <artifactId>generator</artifactId>

diff --git a/opt-1.4/pom.xml b/opt-1.4/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.21.0</version>
+        <version>1.22.0</version>
     </parent>
 
     <artifactId>opt-1.4</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>bom</artifactId>
-        <version>1.21.0</version>
+        <version>1.22.0</version>
         <relativePath>./bom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>root</artifactId>
-    <version>1.21.0</version>
+    <version>1.22.0</version>
     <packaging>pom</packaging>
 
 

diff --git a/response-dto/pom.xml b/response-dto/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.21.0</version>
+        <version>1.22.0</version>
     </parent>
 
     <artifactId>response-dto</artifactId>

diff --git a/serialisation/pom.xml b/serialisation/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.21.0</version>
+        <version>1.22.0</version>
     </parent>
 
     <artifactId>serialisation</artifactId>

diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/matrixencoding/MatrixFormat.java b/serialisation/src/main/java/org/ehrbase/serialisation/matrixencoding/MatrixFormat.java
@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import org.apache.commons.csv.CSVFormat;
@@ -140,7 +141,29 @@ private List<Row> flatten(Map<Entity, Map<Index, Map<AqlPath, Object>>> map) {
 
     private List<Row> toRows(Entity entity, Map<Index, Map<AqlPath, Object>> map) {
 
-        return map.entrySet().stream().map(e -> toRow(entity, e)).collect(Collectors.toList());
+        // Make the row unique on archetype + entity_path + entity_index + field_idx
+        Map<String, Map<AqlPath, Map<List<Integer>, Map<List<Integer>, Optional<Row>>>>> collect =
+                map.entrySet().stream()
+                        .map(e -> toRow(entity, e))
+                        .collect(Collectors.groupingBy(
+                                Row::getArchetypeId,
+                                Collectors.groupingBy(
+                                        Row::getEntityPath,
+                                        Collectors.groupingBy(
+                                                r -> Arrays.asList(r.getEntityIdx()),
+                                                Collectors.groupingBy(
+                                                        r -> Arrays.asList(r.getFieldIdx()),
+                                                        Collectors.reducing((r1, r2) -> {
+                                                            r1.getFields().putAll(r2.getFields());
+                                                            return r1;
+                                                        }))))));
+
+        return collect.values().stream()
+                .flatMap(m -> m.values().stream())
+                .flatMap(m -> m.values().stream())
+                .flatMap(m -> m.values().stream())
+                .flatMap(Optional::stream)
+                .collect(Collectors.toList());
     }
 
     private Row toRow(Entity entity, Map.Entry<Index, Map<AqlPath, Object>> e) {
@@ -291,7 +314,6 @@ public <T extends RMObject> T unmarshal(String value, Class<T> clazz) {
 
     private void encode(Row row) {
 
-        row.setEntityPath(encoder.encode(row.getEntityPath()));
         row.setFields(row.getFields().entrySet().stream()
                 .collect(Collectors.toMap(
                         e -> encoder.encode(e.getKey()),
@@ -304,7 +326,6 @@ private void encode(Row row) {
 
     private void decode(Row row) {
 
-        row.setEntityPath(encoder.decode(row.getEntityPath()));
         row.setFields(row.getFields().entrySet().stream()
                 .collect(Collectors.toMap(
                         e -> encoder.decode(e.getKey()),