update archie to 2.0.1 (#345)

* update archie to 2.0.1 * update jackson * dummy * dummy
ehrbase · Mar 28, 2022 · 93e3545 · 93e3545
1 parent 28f7974
commit 93e3545
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,10 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 ## [unreleased]
 
 ### Added
+- Update archie to version 2.0.1 ([#345](https://github.com/ehrbase/openEHR_SDK/pull/345))
 - AQL: support `ORDER BY` and `LIMIT [OFFSET]` clauses in any order ([#344](https://github.com/ehrbase/openEHR_SDK/pull/344))
 
+
 ### Fixed
 
 - Flat : corrected handling of PARTY_PROXY ( see https://github.com/ehrbase/openEHR_SDK/pull/320)

diff --git a/client/pom.xml b/client/pom.xml
@@ -153,5 +153,9 @@
             <artifactId>cglib</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -87,7 +87,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <antlr4.version>4.9.3</antlr4.version>
-        <archie.version>1.0.4</archie.version>
+        <archie.version>2.0.1</archie.version>
         <assertj.version>3.19.0</assertj.version>
         <cglib.version>3.3.0</cglib.version>
         <classgraph.version>4.8.138</classgraph.version>
@@ -100,7 +100,7 @@
         <guava.version>31.0.1-jre</guava.version>
         <gson.version>2.9.0</gson.version>
         <httpclient.version>4.5.13</httpclient.version>
-        <jackson-bom.version>2.12.6</jackson-bom.version>
+        <jackson-bom.version>2.13.2</jackson-bom.version>
         <jacoco.version>0.8.7</jacoco.version>
         <javapoet.version>1.13.0</javapoet.version>
         <javax-annotation.version>1.3.2</javax-annotation.version>
@@ -442,6 +442,7 @@
                 <artifactId>cglib</artifactId>
                 <version>${cglib.version}</version>
             </dependency>
+              <!--             include bom-->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
@@ -504,6 +505,11 @@
                 <artifactId>commons-io</artifactId>
                 <version>${commons-io.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>1.9</version>
+            </dependency>
             <dependency>
                 <groupId>io.github.classgraph</groupId>
                 <artifactId>classgraph</artifactId>

diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/jsonencoding/JacksonUtil.java b/serialisation/src/main/java/org/ehrbase/serialisation/jsonencoding/JacksonUtil.java
@@ -21,7 +21,8 @@
 package org.ehrbase.serialisation.jsonencoding;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.nedap.archie.json.RMJacksonConfiguration;
+import com.nedap.archie.json.ArchieJacksonConfiguration;
+
 
 public class JacksonUtil {
 
@@ -36,7 +37,7 @@ private JacksonUtil() {
      * @return
      */
     public static ObjectMapper getObjectMapper() {
-        RMJacksonConfiguration configuration = new RMJacksonConfiguration();
+        ArchieJacksonConfiguration configuration = ArchieJacksonConfiguration.createStandardsCompliant();
         configuration.setAddExtraFieldsInArchetypeId(false);
         configuration.setTypePropertyName("_type");
         configuration.setSerializeEmptyCollections(true);

diff --git a/validation/src/main/java/org/ehrbase/validation/webtemplate/PrimitiveConstraintMapper.java b/validation/src/main/java/org/ehrbase/validation/webtemplate/PrimitiveConstraintMapper.java
@@ -144,7 +144,8 @@ public CDate mapDateInput(WebTemplateInput input) {
     }
 
     if (WebTemplateValidationUtils.hasValidationPattern(input)) {
-      cDate.setPatternedConstraint(input.getValidation().getPattern());
+
+      cDate.setPatternConstraint (input.getValidation().getPattern());
     }
 
     return cDate;
@@ -162,7 +163,7 @@ public CDateTime mapDateTimeInput(WebTemplateInput input) {
     }
 
     if (WebTemplateValidationUtils.hasValidationPattern(input)) {
-      cDateTime.setPatternedConstraint(input.getValidation().getPattern());
+      cDateTime.setPatternConstraint(input.getValidation().getPattern());
     }
 
     return cDateTime;
@@ -180,7 +181,7 @@ public CTime mapTimeInput(WebTemplateInput input) {
     }
 
     if (WebTemplateValidationUtils.hasValidationPattern(input)) {
-      cTime.setPatternedConstraint(input.getValidation().getPattern());
+      cTime.setPatternConstraint(input.getValidation().getPattern());
     }
 
     return cTime;

diff --git a/validation/src/test/java/org/ehrbase/validation/ItemStructureVisitorTest.java b/validation/src/test/java/org/ehrbase/validation/ItemStructureVisitorTest.java
@@ -19,8 +19,9 @@
 package org.ehrbase.validation;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.nedap.archie.json.ArchieJacksonConfiguration;
 import com.nedap.archie.json.JacksonUtil;
-import com.nedap.archie.json.RMJacksonConfiguration;
+
 import com.nedap.archie.rm.composition.Composition;
 import com.nedap.archie.rm.datastructures.ItemTree;
 import com.nedap.archie.rm.datavalues.DvText;
@@ -117,7 +118,7 @@ public void elementVisitorTest3() throws Throwable {
     public void ehrVisitorTest() throws Throwable {
         String value = IOUtils.toString(ItemStruktureTestDataCanonicalJson.SIMPLE_EHR_OTHER_Details.getStream(), UTF_8);
 
-        RMJacksonConfiguration configuration = new RMJacksonConfiguration();
+        ArchieJacksonConfiguration configuration = ArchieJacksonConfiguration.createStandardsCompliant();
         configuration.setTypePropertyName("_type");
         ObjectMapper objectMapper = JacksonUtil.getObjectMapper(configuration);