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

fix import error for old extension context path

This commit is contained in:
Grahame Grieve 2020-01-21 11:35:13 +11:00
parent 240e412cf6
commit 21768851f9
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
View File

@ -10328,7 +10328,7 @@ public class VersionConvertor_10_40 {
for (org.hl7.fhir.dstu2.model.StringType t : src.getContext()) {
org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
ec.setType(convertExtensionContext(src.getContextType()));
ec.setExpression(t.getValue());
ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
}
if (src.hasConstrainedType())
tgt.setType(src.getConstrainedType());
@ -10407,7 +10407,7 @@ public class VersionConvertor_10_40 {
for (org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent t : src.getContext()) {
if (!tgt.hasContextType())
tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
tgt.addContext(t.getExpression());
tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
}
tgt.setConstrainedType(src.getType());
tgt.setBase(src.getBaseDefinition());

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
View File

@ -10387,7 +10387,7 @@ public class VersionConvertor_10_50 {
for (org.hl7.fhir.dstu2.model.StringType t : src.getContext()) {
org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
ec.setType(convertExtensionContext(src.getContextType()));
ec.setExpression(t.getValue());
ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
}
if (src.hasConstrainedType())
tgt.setType(src.getConstrainedType());
@ -10466,7 +10466,7 @@ public class VersionConvertor_10_50 {
for (org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent t : src.getContext()) {
if (!tgt.hasContextType())
tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
tgt.addContext(t.getExpression());
tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
}
tgt.setConstrainedType(src.getType());
tgt.setBase(src.getBaseDefinition());

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
View File

@ -5677,7 +5677,7 @@ public class VersionConvertor_14_40 {
for (org.hl7.fhir.dstu2016may.model.StringType t : src.getContext()) {
org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
ec.setType(convertExtensionContext(src.getContextType()));
ec.setExpression(convertToR4Expression(t.getValue()));
ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
}
if (src.getDerivation() == org.hl7.fhir.dstu2016may.model.StructureDefinition.TypeDerivationRule.CONSTRAINT)
tgt.setType(src.getBaseType());
@ -5749,7 +5749,7 @@ public class VersionConvertor_14_40 {
for (org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent t : src.getContext()) {
if (!tgt.hasContextType())
tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
tgt.addContext(convertTo2016MayExpression(t.getExpression()));
tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
}
if (src.hasBaseDefinition())
tgt.setBaseDefinition(src.getBaseDefinition());

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java
View File

@ -5701,7 +5701,7 @@ public class VersionConvertor_14_50 {
for (org.hl7.fhir.dstu2016may.model.StringType t : src.getContext()) {
org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
ec.setType(convertExtensionContext(src.getContextType()));
ec.setExpression(convertToR4Expression(t.getValue()));
ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
}
if (src.getDerivation() == org.hl7.fhir.dstu2016may.model.StructureDefinition.TypeDerivationRule.CONSTRAINT)
tgt.setType(src.getBaseType());
@ -5773,7 +5773,7 @@ public class VersionConvertor_14_50 {
for (org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent t : src.getContext()) {
if (!tgt.hasContextType())
tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
tgt.addContext(convertTo2016MayExpression(t.getExpression()));
tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
}
if (src.hasBaseDefinition())
tgt.setBaseDefinition(src.getBaseDefinition());

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
View File

@ -19216,7 +19216,7 @@ public class VersionConvertor_30_40 {
for (org.hl7.fhir.dstu3.model.StringType t : src.getContext()) {
org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
ec.setType(convertExtensionContext(src.getContextType()));
ec.setExpression(t.getValue());
ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
}
for (org.hl7.fhir.dstu3.model.StringType t : src.getContextInvariant())
tgt.addContextInvariant(t.getValue());
@ -19288,7 +19288,7 @@ public class VersionConvertor_30_40 {
for (org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent t : src.getContext()) {
if (!tgt.hasContextType())
tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
tgt.addContext(t.getExpression());
tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
}
for (org.hl7.fhir.r4.model.StringType t : src.getContextInvariant())
tgt.addContextInvariant(t.getValue());

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java
View File

@ -18587,7 +18587,7 @@ public class VersionConvertor_30_50 {
for (org.hl7.fhir.dstu3.model.StringType t : src.getContext()) {
org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
ec.setType(convertExtensionContext(src.getContextType()));
ec.setExpression(t.getValue());
ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
}
for (org.hl7.fhir.dstu3.model.StringType t : src.getContextInvariant())
tgt.addContextInvariant(t.getValue());
@ -18659,7 +18659,7 @@ public class VersionConvertor_30_50 {
for (org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent t : src.getContext()) {
if (!tgt.hasContextType())
tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
tgt.addContext(t.getExpression());
tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
}
for (org.hl7.fhir.r5.model.StringType t : src.getContextInvariant())
tgt.addContextInvariant(t.getValue());