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

Bump to current org.hl7.fhir.core

This commit is contained in:
jamesagnew 2019-09-19 08:11:30 -04:00
parent 30dfde645b
commit 170698562a
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java
View File

@ -1770,7 +1770,9 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
public void storeNewCodeSystemVersionIfNeeded(CodeSystem theCodeSystem, ResourceTable theResourceEntity) {
if (theCodeSystem != null && isNotBlank(theCodeSystem.getUrl())) {
String codeSystemUrl = theCodeSystem.getUrl();
if (theCodeSystem.getContent() == CodeSystem.CodeSystemContentMode.COMPLETE || theCodeSystem.getContent() == null || theCodeSystem.getContent() == CodeSystem.CodeSystemContentMode.NOTPRESENT) {
if (theCodeSystem.getContent() == CodeSystem.CodeSystemContentMode.COMPLETE || theCodeSystem.getContent() == null
// || theCodeSystem.getContent() == CodeSystem.CodeSystemContentMode.NOTPRESENT
) {
ourLog.info("CodeSystem {} has a status of {}, going to store concepts in terminology tables", theResourceEntity.getIdDt().getValue(), theCodeSystem.getContentElement().getValueAsString());
Long codeSystemResourcePid = getCodeSystemResourcePid(theCodeSystem.getIdElement());

2
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyTest.java
View File

@ -600,7 +600,7 @@ public class FhirResourceDaoR4TerminologyTest extends BaseJpaR4Test {
myValueSetDao.expand(vs, null);
fail();
} catch (InvalidRequestException e) {
assertEquals("unable to find code system http://example.com/my_code_systemAA", e.getMessage());
assertEquals("Unable to find code system http://example.com/my_code_systemAA", e.getMessage());
}
}

1
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchParameterR4Test.java
View File

@ -28,6 +28,7 @@ public class FhirResourceDaoSearchParameterR4Test {
myDao = new FhirResourceDaoSearchParameterR4();
myDao.setContext(myCtx);
myDao.setConfig(new DaoConfig());
myDao.start();
}
@Test

13
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/BaseJpaR5Test.java
View File

@ -47,7 +47,6 @@ import org.hl7.fhir.r5.model.*;
import org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent;
import org.hl7.fhir.r5.model.ConceptMap.SourceElementComponent;
import org.hl7.fhir.r5.model.ConceptMap.TargetElementComponent;
import org.hl7.fhir.r5.model.Enumerations.ConceptMapEquivalence;
import org.hl7.fhir.r5.utils.IResourceValidator;
import org.junit.After;
import org.junit.AfterClass;
@ -484,7 +483,7 @@ public abstract class BaseJpaR5Test extends BaseJpaTest {
TargetElementComponent target = element.addTarget();
target.setCode("34567");
target.setDisplay("Target Code 34567");
target.setEquivalence(ConceptMapEquivalence.EQUAL);
target.setRelationship(Enumerations.ConceptMapRelationship.EQUIVALENT);
element = group.addElement();
element.setCode("23456");
@ -493,13 +492,13 @@ public abstract class BaseJpaR5Test extends BaseJpaTest {
target = element.addTarget();
target.setCode("45678");
target.setDisplay("Target Code 45678");
target.setEquivalence(ConceptMapEquivalence.WIDER);
target.setRelationship(Enumerations.ConceptMapRelationship.BROADER);
// Add a duplicate
target = element.addTarget();
target.setCode("45678");
target.setDisplay("Target Code 45678");
target.setEquivalence(ConceptMapEquivalence.WIDER);
target.setRelationship(Enumerations.ConceptMapRelationship.BROADER);
group = conceptMap.addGroup();
group.setSource(CS_URL);
@ -514,12 +513,12 @@ public abstract class BaseJpaR5Test extends BaseJpaTest {
target = element.addTarget();
target.setCode("56789");
target.setDisplay("Target Code 56789");
target.setEquivalence(ConceptMapEquivalence.EQUAL);
target.setRelationship(Enumerations.ConceptMapRelationship.EQUIVALENT);
target = element.addTarget();
target.setCode("67890");
target.setDisplay("Target Code 67890");
target.setEquivalence(ConceptMapEquivalence.WIDER);
target.setRelationship(Enumerations.ConceptMapRelationship.BROADER);
group = conceptMap.addGroup();
group.setSource(CS_URL_4);
@ -534,7 +533,7 @@ public abstract class BaseJpaR5Test extends BaseJpaTest {
target = element.addTarget();
target.setCode("34567");
target.setDisplay("Target Code 34567");
target.setEquivalence(ConceptMapEquivalence.NARROWER);
target.setRelationship(Enumerations.ConceptMapRelationship.NARROWER);
return conceptMap;
}

2
pom.xml
View File

@ -562,7 +562,7 @@
<properties>
<fhir_core_version>4.0.10-SNAPSHOT</fhir_core_version>
<fhir_core_version>4.0.19-SNAPSHOT</fhir_core_version>
<ucum_version>1.0.2</ucum_version>
<!-- configure timestamp in MANIFEST.MF for maven-war-provider -->