honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Grahame Grieve 2023-01-18 12:33:59 +11:00
parent c9833f94d3 4367813a2c
commit 4f2fd817a3
14 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RELEASE_NOTES.md
View File

@ -1,15 +1,7 @@
## Validator Changes
* Fixed validation of URNs
* Check profiles don't have slicing on roof
* no changes
## Other code changes
* Fix significant performance issue with profile xls generation
* Fix issue with setProperty dropping extensions in R3 - R5
* Debug logging improvements generating snapshots
* Fix issues with types missing in CDA IGs
* Fix problem converting ActivityDefinition R4(B)/R5
* More work on FTP Client
* no changes

2
org.hl7.fhir.convertors/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu2/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu2016may/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu3/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.r4/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

25
org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java
View File

@ -1,21 +1,11 @@
package org.hl7.fhir.r4.test;
import org.fhir.ucum.UcumException;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.formats.IParser;
import org.hl7.fhir.r4.formats.IParser.OutputStyle;
import org.hl7.fhir.r4.formats.JsonParser;
import org.hl7.fhir.r4.formats.XmlParser;
import org.hl7.fhir.r4.model.*;
import org.hl7.fhir.r4.test.utils.TestingUtilities;
import org.hl7.fhir.r4.utils.EOperationOutcome;
import org.hl7.fhir.r4.utils.NarrativeGenerator;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.io.*;
import java.io.IOException;
public class ResourceCopyTests {
@ -53,4 +43,17 @@ public class ResourceCopyTests {
Assertions.assertEquals(obs.equalsDeep(copyObs),true,"DeepEquals fails");
}
@Test
void missingExtension()
{
Patient patient1 = new Patient().setGender(Enumerations.AdministrativeGender.FEMALE);
Enumeration genderElement = patient1.getGenderElement();
genderElement.addExtension(new Extension(("1"),new StringType("2")));
genderElement.addExtension(new Extension(("3"),new StringType("4")));
Patient patient2 = new Patient();
patient2.setProperty("gender", genderElement);
Assertions.assertEquals(2, patient2.getGenderElement().getExtension().size());
}
}

2
org.hl7.fhir.r4b/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.r5/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.report/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.utilities/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.validation.cli/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.validation/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

4
pom.xml
View File

@ -14,12 +14,12 @@
HAPI FHIR
-->
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.6.91-SNAPSHOT</version>
<version>5.6.92-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<hapi_fhir_version>6.2.1</hapi_fhir_version>
<validator_test_case_version>1.2.8-SNAPSHOT</validator_test_case_version>
<validator_test_case_version>1.2.8</validator_test_case_version>
<junit_jupiter_version>5.7.1</junit_jupiter_version>
<junit_platform_launcher_version>1.8.2</junit_platform_launcher_version>
<maven_surefire_version>3.0.0-M5</maven_surefire_version>