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

Release new version

This commit is contained in:
Grahame Grieve 2020-01-20 21:56:07 +11:00
parent 975abb32f1
commit 240e412cf6
13 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>4.1.49-SNAPSHOT</version>
<version>4.1.50-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>4.1.49-SNAPSHOT</version>
<version>4.1.50-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>4.1.49-SNAPSHOT</version>
<version>4.1.50-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>4.1.49-SNAPSHOT</version>
<version>4.1.50-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>4.1.49-SNAPSHOT</version>
<version>4.1.50-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>4.1.49-SNAPSHOT</version>
<version>4.1.50-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

10
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/IResourceValidator.java
View File

@ -147,6 +147,16 @@ public interface IResourceValidator {
public String getValidationLanguage();
public void setValidationLanguage(String value);
/**
* It's common to see references such as Patient/234234 - these usually mean a reference to a Patient resource.
* But there's no actual technical rule that it does, so the validator doesn't enforce that unless this setting is
* set to true
*
* @return
*/
public boolean isAssumeValidRestReferences();
public void setAssumeValidRestReferences(boolean value);
/**
* Validate suite
*

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>4.1.49-SNAPSHOT</version>
<version>4.1.50-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>4.1.49-SNAPSHOT</version>
<version>4.1.50-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>4.1.49-SNAPSHOT</version>
<version>4.1.50-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

14
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
View File

@ -510,6 +510,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
private XVerExtensionManager xverManager;
private IValidationProfileUsageTracker tracker;
private ValidatorHostServices validatorServices;
private boolean assumeValidRestReferences;
public InstanceValidator(IWorkerContext theContext, IEvaluationContext hostServices) {
super();
@ -582,6 +583,15 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
this.hintAboutNonMustSupport = hintAboutNonMustSupport;
}
public boolean isAssumeValidRestReferences() {
return this.assumeValidRestReferences;
}
public void setAssumeValidRestReferences(boolean value) {
this.assumeValidRestReferences = value;
}
private boolean allowUnknownExtension(String url) {
if (url.contains("example.org") || url.contains("acme.com") || url.contains("nema.org") || url.startsWith("http://hl7.org/fhir/tools/StructureDefinition/") || url.equals("http://hl7.org/fhir/StructureDefinition/structuredefinition-expression"))
// Added structuredefinition-expression explicitly because it wasn't defined in the version of the spec it needs to be used with
@ -2235,7 +2245,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
else
ft = tryParse(ref);
if (reference.hasType()) {
if (reference.hasType()) { // R4 onwards...
// the type has to match the specified
String tu = isAbsolute(reference.getType()) ? reference.getType() : "http://hl7.org/fhir/StructureDefinition/"+reference.getType();
TypeRefComponent containerType = container.getType("Reference");
@ -5538,7 +5548,7 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L
// this is a hack work around for past publication of wrong FHIRPath expressions
// R4
// waiting for 4.0.2
if ("(probability is decimal) implies ((probability as decimal) <= 100)".equals(expr)) {
if ("probability is decimal implies (probability as decimal) <= 100".equals(expr)) {
return "probablility.empty() or ((probability is decimal) implies ((probability as decimal) <= 100))";
}

2
pom.xml
View File

@ -13,7 +13,7 @@
each other. It is fine to bump the point version of this POM without affecting
HAPI FHIR.
-->
<version>4.1.49-SNAPSHOT</version>
<version>4.1.50-SNAPSHOT</version>
<properties>
<hapi_fhir_version>4.1.0</hapi_fhir_version>

4
release.bat
View File

@ -1,7 +1,7 @@
@echo off
set oldver=4.1.48
set newver=4.1.49
set oldver=4.1.49
set newver=4.1.50
echo ..
echo =====================================================================