diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1da4e303..7802daa35 100644
--- 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
index 0f9c49682..bb646c4be 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -153,5 +153,9 @@
cglib
test
+
+ org.apache.commons
+ commons-text
+
diff --git a/pom.xml b/pom.xml
index e8e0a0031..64a942b31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
UTF-8
4.9.3
- 1.0.4
+ 2.0.1
3.19.0
3.3.0
4.8.138
@@ -100,7 +100,7 @@
31.0.1-jre
2.9.0
4.5.13
- 2.12.6
+ 2.13.2
0.8.7
1.13.0
1.3.2
@@ -442,6 +442,7 @@
cglib
${cglib.version}
+
com.fasterxml.jackson
jackson-bom
@@ -504,6 +505,11 @@
commons-io
${commons-io.version}
+
+ org.apache.commons
+ commons-text
+ 1.9
+
io.github.classgraph
classgraph
diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/jsonencoding/JacksonUtil.java b/serialisation/src/main/java/org/ehrbase/serialisation/jsonencoding/JacksonUtil.java
index c18a6350f..74365cd00 100644
--- 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
index 9a10136ef..1c462bc85 100644
--- 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
index b4d663610..ae8e72ccb 100644
--- 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);