More template fixes

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/resource/Patient.java

@@ -62,10 +62,10 @@ public class Patient extends BaseResource {
 	private List<CodeableConceptDt> myCommunication;
 	
 	@Child(name="careProvider", order=13, min=0, max=Child.MAX_UNLIMITED)	
-	private List<IDatatype> myCareProvider;
+	private List<ResourceReference> myCareProvider;
 	
 	@Child(name="managingOrganization", order=14, min=0, max=1)	
-	private OrganizationDt myManagingOrganization;
+	private ResourceReference myManagingOrganization;
 	
 	@Child(name="link", order=15, min=0, max=Child.MAX_UNLIMITED)	
 	private List<IDatatype> myLink;
@@ -394,7 +394,7 @@ public class Patient extends BaseResource {
      * Patient's nominated care provider
      * </p> 
 	 */
-	public List<IDatatype> getCareProvider() {
+	public List<ResourceReference> getCareProvider() {
 		return myCareProvider;
 	}
 
@@ -406,7 +406,7 @@ public class Patient extends BaseResource {
      * Patient's nominated care provider
      * </p> 
 	 */
-	public void setCareProvider(List<IDatatype> theValue) {
+	public void setCareProvider(List<ResourceReference> theValue) {
 		myCareProvider = theValue;
 	}
 	
@@ -418,7 +418,7 @@ public class Patient extends BaseResource {
      * Organization that is the custodian of the patient record
      * </p> 
 	 */
-	public OrganizationDt getManagingOrganization() {
+	public ResourceReference getManagingOrganization() {
 		return myManagingOrganization;
 	}
 
@@ -430,7 +430,7 @@ public class Patient extends BaseResource {
      * Organization that is the custodian of the patient record
      * </p> 
 	 */
-	public void setManagingOrganization(OrganizationDt theValue) {
+	public void setManagingOrganization(ResourceReference theValue) {
 		myManagingOrganization = theValue;
 	}
 	
@@ -483,16 +483,337 @@ public class Patient extends BaseResource {
 	}
 	
 
+	/**
+	 * Block class for child element: <b>Patient.contact</b> (A contact party (e.g. guardian, partner, friend) for the patient)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact party (e.g. guardian, partner, friend) for the patient
+     * </p> 
+	 */
 	@Block(name="Patient.contact")	
 	public static class Contact {
+		@Child(name="relationship", order=0, min=0, max=Child.MAX_UNLIMITED)	
+		private List<CodeableConceptDt> myRelationship;
+
+		@Child(name="name", order=1, min=0, max=1)	
+		private HumanNameDt myName;
+
+		@Child(name="telecom", order=2, min=0, max=Child.MAX_UNLIMITED)	
+		private List<ContactDt> myTelecom;
+
+		@Child(name="address", order=3, min=0, max=1)	
+		private AddressDt myAddress;
+
+		@Child(name="gender", order=4, min=0, max=1)	
+		private CodeableConceptDt myGender;
+
+		@Child(name="organization", order=5, min=0, max=1)	
+		private ResourceReference myOrganization;
+
+		/**
+		 * Gets the value(s) for relationship (The kind of relationship)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * The nature of the relationship between the patient and the contact person
+	     * </p> 
+		 */
+		public List<CodeableConceptDt> getRelationship() {
+			return myRelationship;
+		}
+	
+		/**
+		 * Sets the value(s) for relationship (The kind of relationship)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * The nature of the relationship between the patient and the contact person
+	     * </p> 
+		 */
+		public void setRelationship(List<CodeableConceptDt> theValue) {
+			myRelationship = theValue;
+		}
+	
+		/**
+		 * Gets the value(s) for name (A name associated with the person)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * A name associated with the person
+	     * </p> 
+		 */
+		public HumanNameDt getName() {
+			return myName;
+		}
+	
+		/**
+		 * Sets the value(s) for name (A name associated with the person)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * A name associated with the person
+	     * </p> 
+		 */
+		public void setName(HumanNameDt theValue) {
+			myName = theValue;
+		}
+	
+		/**
+		 * Gets the value(s) for telecom (A contact detail for the person)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * A contact detail for the person, e.g. a telephone number or an email address.
+	     * </p> 
+		 */
+		public List<ContactDt> getTelecom() {
+			return myTelecom;
+		}
+	
+		/**
+		 * Sets the value(s) for telecom (A contact detail for the person)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * A contact detail for the person, e.g. a telephone number or an email address.
+	     * </p> 
+		 */
+		public void setTelecom(List<ContactDt> theValue) {
+			myTelecom = theValue;
+		}
+	
+		/**
+		 * Gets the value(s) for address (Address for the contact person)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Address for the contact person
+	     * </p> 
+		 */
+		public AddressDt getAddress() {
+			return myAddress;
+		}
+	
+		/**
+		 * Sets the value(s) for address (Address for the contact person)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Address for the contact person
+	     * </p> 
+		 */
+		public void setAddress(AddressDt theValue) {
+			myAddress = theValue;
+		}
+	
+		/**
+		 * Gets the value(s) for gender (Gender for administrative purposes)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Administrative Gender - the gender that the person is considered to have for administration and record keeping purposes. 
+	     * </p> 
+		 */
+		public CodeableConceptDt getGender() {
+			return myGender;
+		}
+	
+		/**
+		 * Sets the value(s) for gender (Gender for administrative purposes)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Administrative Gender - the gender that the person is considered to have for administration and record keeping purposes. 
+	     * </p> 
+		 */
+		public void setGender(CodeableConceptDt theValue) {
+			myGender = theValue;
+		}
+	
+		/**
+		 * Gets the value(s) for organization (Organization that is associated with the contact)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Organization on behalf of which the contact is acting or for which the contact is working.
+	     * </p> 
+		 */
+		public ResourceReference getOrganization() {
+			return myOrganization;
+		}
+	
+		/**
+		 * Sets the value(s) for organization (Organization that is associated with the contact)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Organization on behalf of which the contact is acting or for which the contact is working.
+	     * </p> 
+		 */
+		public void setOrganization(ResourceReference theValue) {
+			myOrganization = theValue;
+		}
+	
 	}
 
+	/**
+	 * Block class for child element: <b>Patient.animal</b> (If this patient is an animal (non-human))
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * This element has a value if the patient is an animal
+     * </p> 
+	 */
 	@Block(name="Patient.animal")	
 	public static class Animal {
+		@Child(name="species", order=0, min=1, max=1)	
+		private CodeableConceptDt mySpecies;
+
+		@Child(name="breed", order=1, min=0, max=1)	
+		private CodeableConceptDt myBreed;
+
+		@Child(name="genderStatus", order=2, min=0, max=1)	
+		private CodeableConceptDt myGenderStatus;
+
+		/**
+		 * Gets the value(s) for species (E.g. Dog, Cow)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Identifies the high level categorization of the kind of animal
+	     * </p> 
+		 */
+		public CodeableConceptDt getSpecies() {
+			return mySpecies;
+		}
+	
+		/**
+		 * Sets the value(s) for species (E.g. Dog, Cow)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Identifies the high level categorization of the kind of animal
+	     * </p> 
+		 */
+		public void setSpecies(CodeableConceptDt theValue) {
+			mySpecies = theValue;
+		}
+	
+		/**
+		 * Gets the value(s) for breed (E.g. Poodle, Angus)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Identifies the detailed categorization of the kind of animal.
+	     * </p> 
+		 */
+		public CodeableConceptDt getBreed() {
+			return myBreed;
+		}
+	
+		/**
+		 * Sets the value(s) for breed (E.g. Poodle, Angus)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Identifies the detailed categorization of the kind of animal.
+	     * </p> 
+		 */
+		public void setBreed(CodeableConceptDt theValue) {
+			myBreed = theValue;
+		}
+	
+		/**
+		 * Gets the value(s) for genderStatus (E.g. Neutered, Intact)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Indicates the current state of the animal's reproductive organs
+	     * </p> 
+		 */
+		public CodeableConceptDt getGenderStatus() {
+			return myGenderStatus;
+		}
+	
+		/**
+		 * Sets the value(s) for genderStatus (E.g. Neutered, Intact)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * Indicates the current state of the animal's reproductive organs
+	     * </p> 
+		 */
+		public void setGenderStatus(CodeableConceptDt theValue) {
+			myGenderStatus = theValue;
+		}
+	
 	}
 
+	/**
+	 * Block class for child element: <b>Patient.link</b> (Link to another patient resource that concerns the same actual person)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Link to another patient resource that concerns the same actual person
+     * </p> 
+	 */
 	@Block(name="Patient.link")	
 	public static class Link {
+		@Child(name="other", order=0, min=1, max=1)	
+		private ResourceReference myOther;
+
+		@Child(name="type", order=1, min=1, max=1)	
+		private CodeDt myType;
+
+		/**
+		 * Gets the value(s) for other (The other patient resource that the link refers to)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * The other patient resource that the link refers to
+	     * </p> 
+		 */
+		public ResourceReference getOther() {
+			return myOther;
+		}
+	
+		/**
+		 * Sets the value(s) for other (The other patient resource that the link refers to)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * The other patient resource that the link refers to
+	     * </p> 
+		 */
+		public void setOther(ResourceReference theValue) {
+			myOther = theValue;
+		}
+	
+		/**
+		 * Gets the value(s) for type (replace | refer | seealso - type of link)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * The type of link between this patient resource and another patient resource.
+	     * </p> 
+		 */
+		public CodeDt getType() {
+			return myType;
+		}
+	
+		/**
+		 * Sets the value(s) for type (replace | refer | seealso - type of link)
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * The type of link between this patient resource and another patient resource.
+	     * </p> 
+		 */
+		public void setType(CodeDt theValue) {
+			myType = theValue;
+		}
+	
 	}
 
 

hapi-fhir-starter/.classpath

@@ -254,5 +254,6 @@
 	</classpathentry>
 	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/hapi-fhir-base"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

hapi-fhir-starter/src/main/java/ca/uhn/fhir/starter/BaseParser.java

@@ -18,6 +18,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import ca.uhn.fhir.model.api.IDatatype;
+import ca.uhn.fhir.model.api.ResourceReference;
 import ca.uhn.fhir.starter.model.BaseElement;
 import ca.uhn.fhir.starter.model.Child;
 import ca.uhn.fhir.starter.model.Resource;
@@ -72,7 +74,9 @@ public abstract class BaseParser {
 
 			parseBasicElements(nextRow, elem);
 
-			if (elem.getType().size() == 1) {
+			if (elem.isResourceRef()) {
+				elem.setReferenceType(ResourceReference.class.getSimpleName());
+			} else if (elem.getType().size() == 1) {
 				String elemName = elem.getType().get(0);
 				elemName = elemName.substring(0, 1).toUpperCase() + elemName.substring(1);
 				if (elem instanceof ResourceBlock) {
@@ -81,7 +85,7 @@ public abstract class BaseParser {
 					elem.setReferenceType(elemName + "Dt");
 				}
 			} else {
-				elem.setReferenceType("IDatatype");
+				elem.setReferenceType(IDatatype.class.getSimpleName());
 			}
 
 			if (elem.isRepeatable()) {

hapi-fhir-starter/src/main/java/ca/uhn/fhir/starter/ResourceParser.java

@@ -1,8 +1,5 @@
 package ca.uhn.fhir.starter;
 
-import java.util.Arrays;
-
-import org.apache.commons.lang3.StringUtils;
 import org.w3c.dom.Element;
 
 import ca.uhn.fhir.starter.model.BaseElement;
@@ -26,7 +23,7 @@ public class ResourceParser extends BaseParser {
 
 	public static void main(String[] args) throws Exception {
 		ResourceParser p = new ResourceParser();
-		p.setDirectory("src/test/resources");
+		p.setDirectory("src/test/resources/res");
 		p.setResourceName("patient");
 		p.setOutputFile("../hapi-fhir-base/src/main/java/ca/uhn/fhir/model/resource/Patient.java");
 		p.parse();

hapi-fhir-starter/src/main/java/ca/uhn/fhir/starter/model/BaseElement.java

@@ -138,6 +138,7 @@ public abstract class BaseElement {
 		String typeString = theType;
 		if (typeString.startsWith("Resource(")) {
 			typeString = typeString.substring("Resource(".length(), typeString.length() - 1);
+			myResourceRef=true;
 		}
 		if (StringUtils.isNotBlank(typeString)) {
 			String[] types = typeString.replace("=", "").split("\\|");

hapi-fhir-starter/src/main/resources/resource.vm

@@ -56,8 +56,47 @@ public class ${className} extends BaseResource {
 #end
 
 #foreach ( $child in $resourceBlockChildren )
+	/**
+	 * Block class for child element: <b>${child.name}</b> (${child.shortName})
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * ${child.definition}
+     * </p> 
+	 */
 	@Block(name="${child.name}")	
 	public static class ${child.className} {
+#foreach ( $subChild in $child.children )
+		@Child(name="${subChild.elementName}", order=${foreach.index}, min=${subChild.cardMin}, max=${subChild.cardMaxForChildAnnotation})	
+		private ${subChild.referenceType} ${subChild.variableName};
+
+#end
+#foreach ( $subChild in $child.children )
+		/**
+		 * Gets the value(s) for ${subChild.elementName} (${subChild.shortName})
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * ${subChild.definition}
+	     * </p> 
+		 */
+		public ${subChild.referenceType} get${subChild.methodName}() {
+			return ${subChild.variableName};
+		}
+	
+		/**
+		 * Sets the value(s) for ${subChild.elementName} (${subChild.shortName})
+		 *
+	     * <p>
+	     * <b>Definition:</b>
+	     * ${subChild.definition}
+	     * </p> 
+		 */
+		public void set${subChild.methodName}(${subChild.referenceType} theValue) {
+			${subChild.variableName} = theValue;
+		}
+	
+#end
 	}
 
 #end