diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml
index fff72d253..b9050f34e 100644
--- a/org.hl7.fhir.convertors/pom.xml
+++ b/org.hl7.fhir.convertors/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
org.hl7.fhir.core
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
../pom.xml
diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml
index 024ea2905..92aba3fa3 100644
--- a/org.hl7.fhir.dstu2/pom.xml
+++ b/org.hl7.fhir.dstu2/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
org.hl7.fhir.core
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
../pom.xml
diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml
index 5243650bf..4de12fd27 100644
--- a/org.hl7.fhir.dstu2016may/pom.xml
+++ b/org.hl7.fhir.dstu2016may/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
org.hl7.fhir.core
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
../pom.xml
diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml
index 0ab219bb7..f61a2b85c 100644
--- a/org.hl7.fhir.dstu3/pom.xml
+++ b/org.hl7.fhir.dstu3/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
org.hl7.fhir.core
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
../pom.xml
diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml
index 0868c7e63..99fa1e11f 100644
--- a/org.hl7.fhir.r4/pom.xml
+++ b/org.hl7.fhir.r4/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
org.hl7.fhir.core
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
../pom.xml
diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml
index d4695eae0..3ec293811 100644
--- a/org.hl7.fhir.r5/pom.xml
+++ b/org.hl7.fhir.r5/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
org.hl7.fhir.core
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
../pom.xml
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/IResourceValidator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/IResourceValidator.java
index e18e5dba2..7efafa644 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/IResourceValidator.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/IResourceValidator.java
@@ -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
*
diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml
index 6338735b1..875db4d39 100644
--- a/org.hl7.fhir.utilities/pom.xml
+++ b/org.hl7.fhir.utilities/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
org.hl7.fhir.core
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
../pom.xml
diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml
index 56925a969..411faed06 100644
--- a/org.hl7.fhir.validation.cli/pom.xml
+++ b/org.hl7.fhir.validation.cli/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
org.hl7.fhir.core
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
../pom.xml
diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml
index e3eb5165d..473b3db55 100644
--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
org.hl7.fhir.core
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
../pom.xml
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
index f6518179f..d8863b0b9 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
@@ -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))";
}
diff --git a/pom.xml b/pom.xml
index b35af1ccb..96e7f2841 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
each other. It is fine to bump the point version of this POM without affecting
HAPI FHIR.
-->
- 4.1.49-SNAPSHOT
+ 4.1.50-SNAPSHOT
4.1.0
diff --git a/release.bat b/release.bat
index 62cfde6ba..26f4b47e5 100644
--- a/release.bat
+++ b/release.bat
@@ -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 =====================================================================