Merge branch 'release/v2.19.0'

ehrbase · Oct 28, 2024 · 9626ff7 · 9626ff7
2 parents 7272e33 + 7396e21
commit 9626ff7
Show file tree

Hide file tree

Showing 32 changed files with 2,280 additions and 156 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## [2.19.0]
+ ### Added 
+- Option to validate compositions for child nodes not defined in template ([631](https://github.com/ehrbase/openEHR_SDK/pull/631))
+ ### Fixed 
+
 ## [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))
@@ -448,3 +453,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 [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
+[2.19.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.18.0...v2.19.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.18.0</version>
+        <version>2.19.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.18.0</version>
+    <version>2.19.0</version>
     <packaging>pom</packaging>
 
     <name>openEHR SDK</name>
@@ -67,7 +67,7 @@
         <mockito.version>4.11.0</mockito.version>
         <slf4j.version>1.7.36</slf4j.version>
         <xmlbeans.version>3.1.0</xmlbeans.version>
-        <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
+        <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
         <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
         <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.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.18.0</version>
+        <version>2.19.0</version>
     </parent>
 
     <artifactId>client</artifactId>
@@ -158,7 +158,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>6.1.6</version>
+            <version>6.1.14</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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.18.0</version>
+        <version>2.19.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.18.0</version>
+        <version>2.19.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.18.0</version>
+    <version>2.19.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -26,13 +26,13 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.13.1</version>
+      <version>3.15.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.7</version>
+      <version>3.9.9</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

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.18.0</version>
+        <version>2.19.0</version>
     </parent>
 
     <artifactId>generator</artifactId>
@@ -39,7 +39,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.8.0</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>

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.18.0</version>
+        <version>2.19.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.18.0</version>
+        <version>2.19.0</version>
         <relativePath>./bom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>2.18.0</version>
+    <version>2.19.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.18.0</version>
+    <version>2.19.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.18.0</version>
+        <version>2.19.0</version>
     </parent>
 
     <artifactId>serialisation</artifactId>

diff --git a/serialisation/src/main/java/org/ehrbase/openehr/sdk/serialisation/walker/Walker.java b/serialisation/src/main/java/org/ehrbase/openehr/sdk/serialisation/walker/Walker.java
@@ -19,12 +19,12 @@
 
 import static org.ehrbase.openehr.sdk.util.rmconstants.RmConstants.*;
 
-import com.nedap.archie.openehrtestrm.Element;
 import com.nedap.archie.rm.RMObject;
 import com.nedap.archie.rm.archetyped.Locatable;
 import com.nedap.archie.rm.composition.Composition;
 import com.nedap.archie.rm.composition.EventContext;
 import com.nedap.archie.rm.composition.IsmTransition;
+import com.nedap.archie.rm.datastructures.Element;
 import com.nedap.archie.rm.datavalues.quantity.DvInterval;
 import com.nedap.archie.rminfo.ArchieRMInfoLookup;
 import com.nedap.archie.rminfo.RMTypeInfo;
@@ -143,14 +143,21 @@ private void handle(Context<T> context) {
                     handle(context);
                 });
             }
+
+            postVisitChildren(context, currentNode);
         }
+
         postHandle(context);
         insertDefaults(context);
         context.getRmObjectDeque().remove();
         context.getNodeDeque().remove();
         context.getObjectDeque().remove();
     }
 
+    protected void postVisitChildren(Context<T> context, WebTemplateNode currentNode) {
+        // NOOP
+    }
+
     private Stream<NodeConstellation> streamChildConstellations(
             Context<T> context,
             WebTemplateNode currentNode,

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.18.0</version>
+        <version>2.19.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.18.0</version>
+        <version>2.19.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.18.0</version>
+        <version>2.19.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.18.0</version>
+        <version>2.19.0</version>
     </parent>
 
     <artifactId>test-data</artifactId>

diff --git a/test-data/src/main/resources/composition/canonical_json/dvquantity_choice.json b/test-data/src/main/resources/composition/canonical_json/dvquantity_choice.json
@@ -93,7 +93,7 @@
           "archetype_node_id": "at0005"
         }
       ],
-      "archetype_node_id": "[at0001]"
+      "archetype_node_id": "at0001"
     }
   },
   "content": [

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.18.0</version>
+        <version>2.19.0</version>
     </parent>
 
     <artifactId>util</artifactId>

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.18.0</version>
+        <version>2.19.0</version>
     </parent>
 
     <artifactId>validation</artifactId>

diff --git a/...dation/ConfigurableRMObjectValidator.java → ...ArchetypeNeglectingRMObjectValidator.java b/...dation/ConfigurableRMObjectValidator.java → ...ArchetypeNeglectingRMObjectValidator.java
@@ -20,59 +20,34 @@
 import com.nedap.archie.aom.CObject;
 import com.nedap.archie.flattener.OperationalTemplateProvider;
 import com.nedap.archie.rminfo.ModelInfoLookup;
-import com.nedap.archie.rmobjectvalidator.RMObjectValidatingProcessor;
 import com.nedap.archie.rmobjectvalidator.RMObjectValidationMessage;
 import com.nedap.archie.rmobjectvalidator.RMObjectValidationMessageType;
 import com.nedap.archie.rmobjectvalidator.RMObjectValidator;
 import com.nedap.archie.rmobjectvalidator.ValidationConfiguration;
 import java.util.Collection;
 
-public class ConfigurableRMObjectValidator extends RMObjectValidator {
+public class ArchetypeNeglectingRMObjectValidator extends RMObjectValidator {
 
-    private final boolean archetypeValidation;
-
-    public ConfigurableRMObjectValidator(
+    public ArchetypeNeglectingRMObjectValidator(
             ModelInfoLookup lookup,
             OperationalTemplateProvider provider,
             ValidationConfiguration validationConfiguration) {
-        this(lookup, provider, validationConfiguration, true);
-    }
-
-    public ConfigurableRMObjectValidator(
-            ModelInfoLookup lookup,
-            OperationalTemplateProvider provider,
-            ValidationConfiguration validationConfiguration,
-            boolean archetypeValidation) {
         super(lookup, provider, validationConfiguration);
-        this.archetypeValidation = archetypeValidation;
-    }
-
-    public ConfigurableRMObjectValidator(ModelInfoLookup lookup, OperationalTemplateProvider provider) {
-        this(lookup, provider, null);
-    }
-
-    public boolean isArchetypeValidation() {
-        return archetypeValidation;
     }
 
     protected void addMessage(RMObjectValidationMessage message) {
-        if (!archetypeValidation && message.getType() == RMObjectValidationMessageType.ARCHETYPE_NOT_FOUND) return;
-        super.addMessage(message);
-    }
-
-    protected void addMessage(CObject cobject, String actualPath, String message) {
-        addMessage(new RMObjectValidationMessage(cobject, actualPath, message));
+        if (message.getType() != RMObjectValidationMessageType.ARCHETYPE_NOT_FOUND) {
+            super.addMessage(message);
+        }
     }
 
     protected void addMessage(CObject cobject, String actualPath, String message, RMObjectValidationMessageType type) {
-        addMessage(new RMObjectValidationMessage(cobject, actualPath, message, type));
+        if (type != RMObjectValidationMessageType.ARCHETYPE_NOT_FOUND) {
+            super.addMessage(cobject, actualPath, message, type);
+        }
     }
 
     protected void addAllMessages(Collection<RMObjectValidationMessage> messages) {
-        messages.forEach(msg -> addMessage(msg));
-    }
-
-    protected void addAllMessagesFrom(RMObjectValidatingProcessor other) {
-        addAllMessages(other.getMessages());
+        messages.forEach(this::addMessage);
     }
 }