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 branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core

This commit is contained in:
Grahame Grieve 2019-04-14 07:59:47 +10:00
parent 87b191fc5d 0d8b6d18a9
commit cf6a4bb51f
2 changed files with 8 additions and 8 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);
} else if (s.getType() == DiscriminatorType.PROFILE) {
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)
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();
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)
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()+"')");
} else if (s.getType() == DiscriminatorType.EXISTS) {
if (criteriaElement.hasMin() && criteriaElement.getMin()>=1)

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

@ -2577,14 +2577,14 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
expression.append(" and " + discriminator + " is " + type);
} else if (s.getType() == DiscriminatorType.PROFILE) {
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)
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();
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)
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()+"')");
} else if (s.getType() == DiscriminatorType.EXISTS) {
if (criteriaElement.hasMin() && criteriaElement.getMin()>=1)