Merge branch 'release/v2.18.0'

ehrbase · Sep 30, 2024 · 7272e33 · 7272e33
2 parents d5cc26c + f8d0dbc
commit 7272e33
Show file tree

Hide file tree

Showing 23 changed files with 184 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,21 +2,27 @@
 
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## [2.18.0]
+ ### Changed
+- Updated archie to 3.11.0 and antlr to 4.13.1 ([#640](https://github.com/ehrbase/openEHR_SDK/pull/640))
+ ### Added 
+ ### Fixed 
+
 ## [2.17.0]
  ### Changed
-- Deprecated `response-dto` `EHR_(STATUS)` related classes that are only used by EHRbase ([621](https://github.com/ehrbase/openEHR_SDK/pull/621))
+- Deprecated `response-dto` `EHR_(STATUS)` related classes that are only used by EHRbase ([#621](https://github.com/ehrbase/openEHR_SDK/pull/621))
  ### Added 
  ### Fixed 
 
 ## [2.16.0]
  ### Added 
  ### Fixed 
-- Fix missing Base64 encoding og ´DV_MULTIMEDIA` `data` ([624](https://github.com/ehrbase/openEHR_SDK/pull/624))
+- Fix missing Base64 encoding og ´DV_MULTIMEDIA` `data` ([#624](https://github.com/ehrbase/openEHR_SDK/pull/624))
 
 ## [2.15.0]
  ### Added 
  ### Fixed 
-- Fix flat format parsing of `ObjectVersionId` ([622](https://github.com/ehrbase/openEHR_SDK/pull/622))
+- Fix flat format parsing of `ObjectVersionId` ([#622](https://github.com/ehrbase/openEHR_SDK/pull/622))
 
 ## [2.14.0]
  ### Changed 
@@ -32,11 +38,11 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 
 ## [2.11.0]
  ### Added 
-- Make AqlObjectPath serializable ([606](https://github.com/ehrbase/openEHR_SDK/pull/606))
+- Make AqlObjectPath serializable ([#606](https://github.com/ehrbase/openEHR_SDK/pull/606))
 
 ## [2.10.0]
  ### Added
-- Added EHRbase AQL `MetaData` debug execution data ([594](https://github.com/ehrbase/openEHR_SDK/pull/594))
+- Added EHRbase AQL `MetaData` debug execution data ([#594](https://github.com/ehrbase/openEHR_SDK/pull/594))
  ### Changed
 - OptParser now ignores node_id tags for all RM types that are not subtypes of LOCATABLE ([#596](https://github.com/ehrbase/openEHR_SDK/pull/596))
 - Removed OpenEhrClient::getFolder (use directoryCrudEndpoint()::getFolder instead) ([#588](https://github.com/ehrbase/openEHR_SDK/pull/588))
@@ -441,3 +447,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 [2.15.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.14.0...v2.15.0
 [2.16.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.15.0...v2.16.0
 [2.17.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.16.0...v2.17.0
+[2.18.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.17.0...v2.18.0
diff --git a/aql/pom.xml b/aql/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.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>2.17.0</version>
+    <version>2.18.0</version>
     <packaging>pom</packaging>
 
     <name>openEHR SDK</name>
@@ -38,8 +38,8 @@
     </developers>
 
     <properties>
-        <antlr4.version>4.11.1</antlr4.version>
-        <archie.version>3.3.0</archie.version>
+        <antlr4.version>4.13.1</antlr4.version>
+        <archie.version>3.11.0</archie.version>
         <assertj.version>3.26.0</assertj.version>
         <cglib.version>3.3.0</cglib.version>
         <classgraph.version>4.8.175</classgraph.version>

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

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

diff --git a/generator-commons/pom.xml b/generator-commons/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.0</version>
     </parent>
 
     <artifactId>generator-commons</artifactId>

diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>sdk-parent</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>2.17.0</version>
+    <version>2.18.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>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.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>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.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>2.17.0</version>
+        <version>2.18.0</version>
         <relativePath>./bom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>2.17.0</version>
+    <version>2.18.0</version>
     <packaging>pom</packaging>
     <name>openEHR SDK</name>
 

diff --git a/response-dto/pom.xml b/response-dto/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>2.17.0</version>
+    <version>2.18.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>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.0</version>
     </parent>
 
     <artifactId>serialisation</artifactId>

diff --git a/...sation/src/test/java/org/ehrbase/openehr/sdk/serialisation/flatencoding/FlatJsonTest.java b/...sation/src/test/java/org/ehrbase/openehr/sdk/serialisation/flatencoding/FlatJsonTest.java
@@ -19,7 +19,9 @@
 
 import com.nedap.archie.rm.composition.Composition;
 import com.nedap.archie.rminfo.ArchieRMInfoLookup;
+import com.nedap.archie.rmobjectvalidator.RMObjectValidationMessageType;
 import com.nedap.archie.rmobjectvalidator.RMObjectValidator;
+import com.nedap.archie.rmobjectvalidator.ValidationConfiguration;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -77,11 +79,16 @@ void roundTripFeederAuditRaw() throws IOException {
 
         softAssertions.assertThat(unmarshal).isNotNull();
 
-        RMObjectValidator rmObjectValidator = new RMObjectValidator(ArchieRMInfoLookup.getInstance(), s -> null);
+        ValidationConfiguration cfg = new ValidationConfiguration.Builder()
+                .validateInvariants(true)
+                .failOnUnknownTerminologyId(!true)
+                .build();
+
+        RMObjectValidator rmObjectValidator = new RMObjectValidator(ArchieRMInfoLookup.getInstance(), s -> null, cfg);
 
         softAssertions
                 .assertThat(rmObjectValidator.validate(unmarshal))
-                .filteredOn(m -> !m.getMessage().contains("Inv_null_flavour_indicated"))
+                .filteredOn(m -> m.getType() != RMObjectValidationMessageType.ARCHETYPE_NOT_FOUND)
                 .containsExactlyInAnyOrder();
 
         softAssertions.assertAll();
@@ -110,11 +117,16 @@ void roundTripRaw() throws IOException {
 
         softAssertions.assertThat(unmarshal).isNotNull();
 
-        RMObjectValidator rmObjectValidator = new RMObjectValidator(ArchieRMInfoLookup.getInstance(), s -> null);
+        ValidationConfiguration cfg = new ValidationConfiguration.Builder()
+                .validateInvariants(true)
+                .failOnUnknownTerminologyId(!true)
+                .build();
+
+        RMObjectValidator rmObjectValidator = new RMObjectValidator(ArchieRMInfoLookup.getInstance(), s -> null, cfg);
 
         softAssertions
                 .assertThat(rmObjectValidator.validate(unmarshal))
-                .filteredOn(m -> !m.getMessage().contains("Inv_null_flavour_indicated"))
+                .filteredOn(m -> m.getType() != RMObjectValidationMessageType.ARCHETYPE_NOT_FOUND)
                 .containsExactlyInAnyOrder();
 
         softAssertions.assertAll();
@@ -352,11 +364,16 @@ private void check(
 
         softAssertions.assertThat(unmarshal).isNotNull();
 
-        RMObjectValidator rmObjectValidator = new RMObjectValidator(ArchieRMInfoLookup.getInstance(), s -> null);
+        ValidationConfiguration cfg = new ValidationConfiguration.Builder()
+                .validateInvariants(true)
+                .failOnUnknownTerminologyId(!true)
+                .build();
+
+        RMObjectValidator rmObjectValidator = new RMObjectValidator(ArchieRMInfoLookup.getInstance(), s -> null, cfg);
 
         softAssertions
                 .assertThat(rmObjectValidator.validate(unmarshal))
-                .filteredOn(m -> !m.getMessage().contains("Inv_null_flavour_indicated"))
+                .filteredOn(m -> m.getType() != RMObjectValidationMessageType.ARCHETYPE_NOT_FOUND)
                 .containsExactlyInAnyOrder();
 
         softAssertions.assertAll();

diff --git a/serialisation_conformance_test/pom.xml b/serialisation_conformance_test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.0</version>
     </parent>
 
     <artifactId>serialisation_conformance_test</artifactId>

diff --git a/terminology/pom.xml b/terminology/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.0</version>
     </parent>
 
     <artifactId>terminology</artifactId>

diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.0</version>
     </parent>
 
     <artifactId>test-coverage</artifactId>

diff --git a/test-data/pom.xml b/test-data/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.0</version>
     </parent>
 
     <artifactId>test-data</artifactId>

diff --git a/util/pom.xml b/util/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.0</version>
     </parent>
 
     <artifactId>util</artifactId>

diff --git a/util/src/main/java/org/ehrbase/openehr/sdk/util/rmconstants/RmConstants.java b/util/src/main/java/org/ehrbase/openehr/sdk/util/rmconstants/RmConstants.java
@@ -41,6 +41,7 @@ private RmConstants() {}
 
     public static final String EHR = "EHR";
     public static final String EHR_STATUS = "EHR_STATUS";
+    public static final String FOLDER = "FOLDER";
     public static final String COMPOSITION = "COMPOSITION";
     public static final String SECTION = "SECTION";
     public static final String OBSERVATION = "OBSERVATION";

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.0</version>
     </parent>
 
     <artifactId>validation</artifactId>

diff --git a/validation/src/main/java/org/ehrbase/openehr/sdk/validation/CompositionValidator.java b/validation/src/main/java/org/ehrbase/openehr/sdk/validation/CompositionValidator.java
@@ -20,9 +20,11 @@
 import com.nedap.archie.rm.composition.Composition;
 import com.nedap.archie.rminfo.ArchieRMInfoLookup;
 import com.nedap.archie.rmobjectvalidator.RMObjectValidationMessage;
-import com.nedap.archie.rmobjectvalidator.RMObjectValidator;
+import com.nedap.archie.rmobjectvalidator.ValidationConfiguration;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
 import org.ehrbase.openehr.sdk.validation.terminology.ExternalTerminologyValidation;
 import org.ehrbase.openehr.sdk.validation.webtemplate.ValidationWalker;
@@ -36,12 +38,45 @@
  * This class is NOT thread-safe!
  */
 public class CompositionValidator {
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
 
-    private final RMObjectValidator rmObjectValidator =
-            new RMObjectValidator(ArchieRMInfoLookup.getInstance(), archetypeId -> null);
+    private ValidationConfiguration validationCfg = new ValidationConfiguration.Builder()
+            .validateInvariants(true)
+            .failOnUnknownTerminologyId(false)
+            .build();
+
+    private ConfigurableRMObjectValidator rmObjectValidator;
+
+    {
+        initObjectValidator(false);
+    }
 
     private ExternalTerminologyValidation externalTerminologyValidation;
 
+    public void setArchetypeValidation(boolean archetypeValidation) {
+        initObjectValidator(archetypeValidation);
+    }
+
+    private void initObjectValidator(boolean archetypeValidation) {
+        try {
+            lock.writeLock().lock();
+            rmObjectValidator = new ConfigurableRMObjectValidator(
+                    ArchieRMInfoLookup.getInstance(), archetypeId -> null, validationCfg, archetypeValidation);
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    public ConfigurableRMObjectValidator getRmObjectValidator() {
+        try {
+            lock.readLock().lock();
+            return rmObjectValidator;
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    //////////////////////////////
     public CompositionValidator() {}
 
     public CompositionValidator(ExternalTerminologyValidation externalTerminologyValidation) {
@@ -67,7 +102,7 @@ public List<ConstraintViolation> validate(Composition composition, OPERATIONALTE
      * @return the list of constraint violations
      */
     public List<ConstraintViolation> validate(Composition composition, WebTemplate template) {
-        List<RMObjectValidationMessage> messages = rmObjectValidator.validate(composition);
+        List<RMObjectValidationMessage> messages = getRmObjectValidator().validate(composition);
         if (messages.isEmpty()) {
             List<ConstraintViolation> result = new ArrayList<>();
             new ValidationWalker(externalTerminologyValidation)
@@ -87,7 +122,16 @@ public List<ConstraintViolation> validate(Composition composition, WebTemplate t
      * @param validateInvariants the boolean value
      */
     public void setRunInvariantChecks(boolean validateInvariants) {
-        rmObjectValidator.setRunInvariantChecks(validateInvariants);
+        try {
+            lock.writeLock().lock();
+            validationCfg = new ValidationConfiguration.Builder()
+                    .validateInvariants(validateInvariants)
+                    .failOnUnknownTerminologyId(false)
+                    .build();
+            initObjectValidator(rmObjectValidator.isArchetypeValidation());
+        } finally {
+            lock.writeLock().unlock();
+        }
     }
 
     /**
@@ -98,8 +142,4 @@ public void setRunInvariantChecks(boolean validateInvariants) {
     public void setExternalTerminologyValidation(ExternalTerminologyValidation externalTerminologyValidation) {
         this.externalTerminologyValidation = externalTerminologyValidation;
     }
-
-    public RMObjectValidator getRmObjectValidator() {
-        return rmObjectValidator;
-    }
 }