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 pull request #15 from jkiddo/patch-1 

Update InstanceValidator.java
This commit is contained in:
Grahame Grieve 2019-04-11 07:27:11 +10:00 committed by GitHub
parent ce482f5b4c 991dcb656c
commit 0d8b6d18a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r4/validation/InstanceValidator.java
View File

@ -2564,14 +2564,14 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
expression.append(" and " + discriminator + " is " + type); expression.append(" and " + discriminator + " is " + type);
} else if (s.getType() == DiscriminatorType.PROFILE) { } else if (s.getType() == DiscriminatorType.PROFILE) {
if (criteriaElement.getType().size() == 0) if (criteriaElement.getType().size() == 0)
throw new DefinitionException("Profile based discriminators nust have a type ("+criteriaElement.getId()+")"); throw new DefinitionException("Profile based discriminators must have a type ("+criteriaElement.getId()+")");
if (criteriaElement.getType().size() != 1) if (criteriaElement.getType().size() != 1)
throw new DefinitionException("Profile based discriminators nust have only one type ("+criteriaElement.getId()+")"); throw new DefinitionException("Profile based discriminators must have only one type ("+criteriaElement.getId()+")");
List<CanonicalType> list = discriminator.endsWith(".resolve()") || discriminator.equals("resolve()") ? criteriaElement.getType().get(0).getTargetProfile() : criteriaElement.getType().get(0).getProfile(); List<CanonicalType> list = discriminator.endsWith(".resolve()") || discriminator.equals("resolve()") ? criteriaElement.getType().get(0).getTargetProfile() : criteriaElement.getType().get(0).getProfile();
if (list.size() == 0) if (list.size() == 0)
throw new DefinitionException("Profile based discriminators nust have a type with a profile ("+criteriaElement.getId()+")"); throw new DefinitionException("Profile based discriminators must have a type with a profile ("+criteriaElement.getId()+")");
if (list.size() > 1) if (list.size() > 1)
throw new DefinitionException("Profile based discriminators nust have a type with only one profile ("+criteriaElement.getId()+")"); throw new DefinitionException("Profile based discriminators must have a type with only one profile ("+criteriaElement.getId()+")");
expression.append(" and "+discriminator+".conformsTo('"+list.get(0).getValue()+"')"); expression.append(" and "+discriminator+".conformsTo('"+list.get(0).getValue()+"')");
} else if (s.getType() == DiscriminatorType.EXISTS) { } else if (s.getType() == DiscriminatorType.EXISTS) {
if (criteriaElement.hasMin() && criteriaElement.getMin()>=1) if (criteriaElement.hasMin() && criteriaElement.getMin()>=1)