honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIx build

This commit is contained in:
jamesagnew 2015-09-08 08:32:33 -04:00
parent 4dfecbdc74
commit 403fe28bd8
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java
View File

@ -86,16 +86,17 @@ public class RuntimeChildChoiceDefinition extends BaseRuntimeDeclaredChildDefini
String elementName; String elementName;
BaseRuntimeElementDefinition<?> nextDef; BaseRuntimeElementDefinition<?> nextDef;
boolean nonPreferred = false;
if (IBaseResource.class.isAssignableFrom(next)) { if (IBaseResource.class.isAssignableFrom(next)) {
elementName = getElementName() + StringUtils.capitalize(next.getSimpleName()); elementName = getElementName() + StringUtils.capitalize(next.getSimpleName());
List<Class<? extends IBaseResource>> types = new ArrayList<Class<? extends IBaseResource>>(); List<Class<? extends IBaseResource>> types = new ArrayList<Class<? extends IBaseResource>>();
types.add((Class<? extends IBaseResource>) next); types.add((Class<? extends IBaseResource>) next);
nextDef = new RuntimeResourceReferenceDefinition(elementName, types, false); nextDef = new RuntimeResourceReferenceDefinition(elementName, types, false);
nextDef.sealAndInitialize(theContext, theClassToElementDefinitions); nextDef.sealAndInitialize(theContext, theClassToElementDefinitions);
myNameToChildDefinition.put(getElementName() + "Reference", nextDef); myNameToChildDefinition.put(getElementName() + "Reference", nextDef);
myNameToChildDefinition.put(getElementName() + "Resource", nextDef); myNameToChildDefinition.put(getElementName() + "Resource", nextDef);
} else { } else {
nextDef = theClassToElementDefinitions.get(next); nextDef = theClassToElementDefinitions.get(next);
BaseRuntimeElementDefinition<?> nextDefForChoice = nextDef; BaseRuntimeElementDefinition<?> nextDefForChoice = nextDef;
@ -103,23 +104,26 @@ public class RuntimeChildChoiceDefinition extends BaseRuntimeDeclaredChildDefini
IRuntimeDatatypeDefinition nextDefDatatype = (IRuntimeDatatypeDefinition) nextDef; IRuntimeDatatypeDefinition nextDefDatatype = (IRuntimeDatatypeDefinition) nextDef;
if (nextDefDatatype.getProfileOf() != null) { if (nextDefDatatype.getProfileOf() != null) {
/* /*
* Elements which are called foo[x] and have a choice which is a profiled datatype * Elements which are called foo[x] and have a choice which is a profiled datatype must use the
* must use the unprofiled datatype as the element name. E.g. if foo[x] allows * unprofiled datatype as the element name. E.g. if foo[x] allows markdown as a datatype, it calls the
* markdown as a datatype, it calls the element fooString when encoded, because * element fooString when encoded, because markdown is a profile of string. This is according to the
* markdown is a profile of string. This is according to the FHIR spec * FHIR spec
*/ */
nextDefForChoice = nextDefDatatype.getProfileOf(); nextDefForChoice = nextDefDatatype.getProfileOf();
nonPreferred = true;
} }
} }
elementName = getElementName() + StringUtils.capitalize(nextDefForChoice.getName()); elementName = getElementName() + StringUtils.capitalize(nextDefForChoice.getName());
} }
myNameToChildDefinition.put(elementName, nextDef); if (myNameToChildDefinition.containsKey(elementName) == false || !nonPreferred) {
myNameToChildDefinition.put(elementName, nextDef);
}
if (IBaseResource.class.isAssignableFrom(next)) { if (IBaseResource.class.isAssignableFrom(next)) {
Class<? extends IBase> refType = theContext.getVersion().getResourceReferenceType(); Class<? extends IBase> refType = theContext.getVersion().getResourceReferenceType();
myDatatypeToElementDefinition.put(refType, nextDef); myDatatypeToElementDefinition.put(refType, nextDef);
String alternateElementName; String alternateElementName;
if (theContext.getVersion().getVersion().equals(FhirVersionEnum.DSTU1)) { if (theContext.getVersion().getVersion().equals(FhirVersionEnum.DSTU1)) {
alternateElementName = getElementName() + "Resource"; alternateElementName = getElementName() + "Resource";
@ -128,7 +132,7 @@ public class RuntimeChildChoiceDefinition extends BaseRuntimeDeclaredChildDefini
} }
myDatatypeToElementName.put(refType, alternateElementName); myDatatypeToElementName.put(refType, alternateElementName);
} }
myDatatypeToElementDefinition.put(next, nextDef); myDatatypeToElementDefinition.put(next, nextDef);
myDatatypeToElementName.put(next, elementName); myDatatypeToElementName.put(next, elementName);
} }