Merge branch 'master' of github.com:jamesagnew/hapi-fhir

hapi-fhir-base/src/changes/changes.xml

@@ -18,6 +18,14 @@
 				been added to this datatype which provide just the numeric portion. See the JavaDoc
 				for more information. 
 			</action>
+			<action type="add">
+				<![CDATA[<b>API CHANGE:</b>]]>: Most elements in the HAPI FHIR model contain
+				a getId() and setId() method. This method is confusing because it is only actually used
+				for IDREF elements (which are rare) but its name makes it easy to confuse with more
+				important identifiers. For this reason, these methods have been deprocated and replaced with
+				get/setElementSpecificId() methods. The old methods will be removed at some point. Resource
+				types are unchanged and retain their get/setId methods.
+			</action>
 			<action type="add">
 				Allow use of QuantityDt as a service parameter to support the "quantity" type. Previously
 				QuantityDt did not implement IQueryParameterType so it was not valid, and there was no way to

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java

@@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.*;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java

@@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.*;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -49,6 +49,7 @@ import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.ICompositeElement;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.IExtension;
 import ca.uhn.fhir.model.api.IPrimitiveDatatype;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.IResourceBlock;
@@ -91,7 +92,7 @@ class ModelScanner {
 	ModelScanner(Class<? extends IResource> theResourceTypes) throws ConfigurationException {
 		Set<Class<? extends IElement>> singleton = new HashSet<Class<? extends IElement>>();
 		singleton.add(theResourceTypes);
-		init(null,singleton);
+		init(null, singleton);
 	}
 
 	ModelScanner(Collection<Class<? extends IResource>> theResourceTypes) throws ConfigurationException {
@@ -153,10 +154,10 @@ class ModelScanner {
 	}
 
 	private void init(Map<Class<? extends IElement>, BaseRuntimeElementDefinition<?>> theExistingDefinitions, Set<Class<? extends IElement>> toScan) {
-		if (theExistingDefinitions!=null) {
+		if (theExistingDefinitions != null) {
 			myClassToElementDefinitions.putAll(theExistingDefinitions);
 		}
-		
+
 		int startSize = myClassToElementDefinitions.size();
 		long start = System.currentTimeMillis();
 
@@ -210,7 +211,7 @@ class ModelScanner {
 		} while (!toScan.isEmpty());
 
 		for (Entry<Class<? extends IElement>, BaseRuntimeElementDefinition<?>> nextEntry : myClassToElementDefinitions.entrySet()) {
-			if (theExistingDefinitions!=null&&theExistingDefinitions.containsKey(nextEntry.getKey())) {
+			if (theExistingDefinitions != null && theExistingDefinitions.containsKey(nextEntry.getKey())) {
 				continue;
 			}
 			BaseRuntimeElementDefinition<?> next = nextEntry.getValue();
@@ -221,7 +222,7 @@ class ModelScanner {
 		myRuntimeChildUndeclaredExtensionDefinition.sealAndInitialize(myClassToElementDefinitions);
 
 		long time = System.currentTimeMillis() - start;
-		int size = myClassToElementDefinitions.size()- startSize;
+		int size = myClassToElementDefinitions.size() - startSize;
 		ourLog.info("Done scanning FHIR library, found {} model entries in {}ms", size, time);
 	}
 
@@ -298,6 +299,8 @@ class ModelScanner {
 		scanCompositeElementForChildren(theClass, resourceDef);
 	}
 
+
+
 	private String scanCodeTable(Class<? extends ICodeEnum> theCodeType, CodeTableDef theCodeTableDefinition) {
 		return null; // TODO: implement
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java

@@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.*;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java

@@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.*;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java

@@ -20,7 +20,7 @@ package ca.uhn.fhir.context;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.*;
 
 import java.util.Map;
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java

@@ -20,8 +20,7 @@ package ca.uhn.fhir.context;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.join;
+import static org.apache.commons.lang3.StringUtils.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -48,6 +47,7 @@ import ca.uhn.fhir.model.dstu.resource.Profile.StructureElement;
 import ca.uhn.fhir.model.dstu.resource.Profile.StructureElementDefinitionType;
 import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
 import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
+import ca.uhn.fhir.model.primitive.IdDt;
 
 public class RuntimeResourceDefinition extends BaseRuntimeElementCompositeDefinition<IResource> {
 
@@ -319,7 +319,7 @@ public class RuntimeResourceDefinition extends BaseRuntimeElementCompositeDefini
 		RuntimeResourceDefinition def = this;
 
 		if (StringUtils.isNotBlank(myId)) {
-			retVal.setId(myId);
+			retVal.setId(new IdDt(myId));
 		}else {
 			throw new ConfigurationException("Resource class " + getImplementingClass().getCanonicalName() + " has no ID specified");
 		}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseBundle.java

@@ -20,13 +20,15 @@ package ca.uhn.fhir.model.api;
  * #L%
  */
 
+import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.util.ElementUtil;
 
-public class BaseBundle  extends BaseElement implements IElement {
+public class BaseBundle extends BaseElement implements IElement {
 
 	private StringDt myAuthorName;
 	private StringDt myAuthorUri;
+	private IdDt myId;
 
 	public StringDt getAuthorName() {
 		if (myAuthorName == null) {
@@ -42,11 +44,20 @@ public class BaseBundle  extends BaseElement implements IElement {
 		return myAuthorUri;
 	}
 
+	public IdDt getId() {
+		if (myId==null) {
+			myId=new IdDt();
+		}
+		return myId;
+	}
+
 	@Override
 	public boolean isEmpty() {
 		return ElementUtil.isEmpty(myAuthorName, myAuthorUri);
 	}
-	
-	
+
+	public void setId(IdDt theId) {
+		myId = theId;
+	}
 
 }

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

@@ -26,11 +26,8 @@ import java.util.List;
 
 import org.apache.commons.lang3.Validate;
 
-import ca.uhn.fhir.model.primitive.IdDt;
+public abstract class BaseElement implements IElement, ISupportsUndeclaredExtensions {
 
-public abstract class BaseElement implements IIdentifiableElement, ISupportsUndeclaredExtensions {
-
-	private IdDt myId;
 	private List<ExtensionDt> myUndeclaredExtensions;
 	private List<ExtensionDt> myUndeclaredModifierExtensions;
 
@@ -52,7 +49,6 @@ public abstract class BaseElement implements IIdentifiableElement, ISupportsUnde
 		return retVal;
 	}
 
-	
 	@Override
 	public void addUndeclaredExtension(ExtensionDt theExtension) {
 		Validate.notNull(theExtension, "Extension can not be null");
@@ -75,14 +71,6 @@ public abstract class BaseElement implements IIdentifiableElement, ISupportsUnde
 		return Collections.unmodifiableList(retVal);
 	}
 
-	@Override
-	public IdDt getId() {
-		if (myId == null) {
-			myId = new IdDt();
-		}
-		return myId;
-	}
-
 	@Override
 	public List<ExtensionDt> getUndeclaredExtensions() {
 		if (myUndeclaredExtensions == null) {
@@ -111,20 +99,9 @@ public abstract class BaseElement implements IIdentifiableElement, ISupportsUnde
 		return myUndeclaredModifierExtensions;
 	}
 
-	@Override
-	public void setId(IdDt theId) {
-		myId = theId;
-	}
-
-	@Override
-	public void setId(String theId) {
-		myId = new IdDt(theId);
-	}
-
 	/**
-	 * Intended to be called by extending classes {@link #isEmpty()}
-	 * implementations, returns <code>true</code> if all content in this
-	 * superclass instance is empty per the semantics of {@link #isEmpty()}.
+	 * Intended to be called by extending classes {@link #isEmpty()} implementations, returns <code>true</code> if all
+	 * content in this superclass instance is empty per the semantics of {@link #isEmpty()}.
 	 */
 	protected boolean isBaseEmpty() {
 		if (myUndeclaredExtensions != null) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java

@@ -0,0 +1,84 @@
+package ca.uhn.fhir.model.api;
+
+/*
+ * #%L
+ * HAPI FHIR Library
+ * %%
+ * Copyright (C) 2014 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import ca.uhn.fhir.model.primitive.IdDt;
+import ca.uhn.fhir.parser.DataFormatException;
+
+public abstract class BaseIdentifiableElement extends BaseElement implements IIdentifiableElement {
+
+	private String myElementSpecificId;
+
+	@Override
+	public String getElementSpecificId() {
+		return myElementSpecificId;
+	}
+
+	@Override
+	public IdDt getId() {
+		if (myElementSpecificId == null) {
+			return new LockedId();
+		} else {
+			return new LockedId(myElementSpecificId);
+		}
+	}
+
+	@Override
+	public void setElementSpecificId(String theElementSpecificId) {
+		myElementSpecificId = theElementSpecificId;
+	}
+
+	@Override
+	public void setId(IdDt theId) {
+		if (theId == null) {
+			myElementSpecificId = null;
+		} else {
+			myElementSpecificId = theId.getValue();
+		}
+	}
+
+	@Override
+	public void setId(String theId) {
+		myElementSpecificId = theId;
+	}
+
+	private static class LockedId extends IdDt {
+
+		public LockedId() {
+		}
+
+		public LockedId(String theElementSpecificId) {
+			super(theElementSpecificId);
+		}
+
+		@Override
+		public void setValue(String theValue) throws DataFormatException {
+			throw new UnsupportedOperationException("Use IElement#setElementSpecificId(String) to set the element ID for an element");
+		}
+
+		@Override
+		public void setValueAsString(String theValue) throws DataFormatException {
+			throw new UnsupportedOperationException("Use IElement#setElementSpecificId(String) to set the element ID for an element");
+		}
+
+	}
+
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BasePrimitive.java

@@ -23,7 +23,7 @@ package ca.uhn.fhir.model.api;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-public abstract class BasePrimitive<T> extends BaseElement implements IPrimitiveDatatype<T> {
+public abstract class BasePrimitive<T> extends BaseIdentifiableElement implements IPrimitiveDatatype<T> {
 
 	@Override
 	public boolean isEmpty() {

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseResource.java

@@ -29,6 +29,7 @@ import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.dstu.composite.ContainedDt;
 import ca.uhn.fhir.model.dstu.composite.NarrativeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
+import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.util.ElementUtil;
 
 public abstract class BaseResource extends BaseElement implements IResource {
@@ -36,6 +37,8 @@ public abstract class BaseResource extends BaseElement implements IResource {
 	@Child(name = "contained", order = 2, min = 0, max = 1)
 	private ContainedDt myContained;
 
+	private IdDt myId;
+
 	@Child(name = "language", order = 0, min = 0, max = Child.MAX_UNLIMITED)
 	private CodeDt myLanguage;
 
@@ -52,6 +55,13 @@ public abstract class BaseResource extends BaseElement implements IResource {
 		return myContained;
 	}
 
+	public IdDt getId() {
+		if (myId == null) {
+			myId = new IdDt();
+		}
+		return myId;
+	}
+
 	public CodeDt getLanguage() {
 		return myLanguage;
 	}
@@ -76,6 +86,18 @@ public abstract class BaseResource extends BaseElement implements IResource {
 		myContained = theContained;
 	}
 
+	public void setId(IdDt theId) {
+		myId = theId;
+	}
+
+	public void setId(String theId) {
+		if (theId == null) {
+			myId = null;
+		} else {
+			myId = new IdDt(theId);
+		}
+	}
+
 	public void setLanguage(CodeDt theLanguage) {
 		myLanguage = theLanguage;
 	}
@@ -91,9 +113,8 @@ public abstract class BaseResource extends BaseElement implements IResource {
 	}
 
 	/**
-	 * Intended to be called by extending classes {@link #isEmpty()}
-	 * implementations, returns <code>true</code> if all content in this
-	 * superclass instance is empty per the semantics of {@link #isEmpty()}.
+	 * Intended to be called by extending classes {@link #isEmpty()} implementations, returns <code>true</code> if all
+	 * content in this superclass instance is empty per the semantics of {@link #isEmpty()}.
 	 */
 	@Override
 	protected boolean isBaseEmpty() {

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseResourceReference.java

@@ -34,7 +34,7 @@ import ca.uhn.fhir.parser.IParser;
 import ca.uhn.fhir.rest.client.BaseClient;
 import ca.uhn.fhir.rest.client.api.IRestfulClient;
 
-public abstract class BaseResourceReference extends BaseElement {
+public abstract class BaseResourceReference extends BaseIdentifiableElement {
 
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(BaseResourceReference.class);
 	private IResource myResource;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java

@@ -20,14 +20,14 @@ package ca.uhn.fhir.model.api;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.commons.lang3.StringUtils;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BundleEntry.java

@@ -20,9 +20,9 @@ package ca.uhn.fhir.model.api;
  * #L%
  */
 
+import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.commons.lang3.Validate;
 
 import ca.uhn.fhir.model.primitive.InstantDt;
 import ca.uhn.fhir.model.primitive.StringDt;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ExtensionDt.java

@@ -30,7 +30,7 @@ import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.primitive.StringDt;
 
 @DatatypeDef(name="Extension") 
-public class ExtensionDt extends BaseElement implements ICompositeDatatype {
+public class ExtensionDt extends BaseIdentifiableElement implements ICompositeDatatype {
 
 	private boolean myModifier;
 	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java

@@ -22,7 +22,7 @@ package ca.uhn.fhir.model.api;
 
 import java.util.List;
 
-public interface ICompositeElement extends IIdentifiableElement {
+public interface ICompositeElement extends IElement {
 
 	/**
 	 * Returns a list containing all child elements matching a given type

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IDatatype.java

@@ -20,6 +20,6 @@ package ca.uhn.fhir.model.api;
  * #L%
  */
 
-public interface IDatatype extends IIdentifiableElement {
+public interface IDatatype extends IElement {
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java

@@ -24,15 +24,33 @@ import ca.uhn.fhir.model.primitive.IdDt;
 
 public interface IIdentifiableElement extends IElement {
 
-	void setId(IdDt theId);
+	/**
+	 * Used to retrieve an ID for this specific element within a resource. These are used for IDREF referenced between
+	 * elements within a single resource, and do not have any other purpose.
+	 */
+	String getElementSpecificId();
 
+	/**
+	 * @deprecated Use {@link #getElementSpecificId()} instead. This method will be removed because it is easily
+	 *             confused with other ID methods (such as patient#getIdentifier)
+	 */
 	IdDt getId();
 
 	/**
-	 * Convenience method for {@link #setId(IdDt)} which creates a new IdDt and provides the
-	 * given string as the ID.
-	 *   
-	 * @param theId The ID string. Can be a complete URL, a partial URL or even a simple identifier.
+	 * Used to set an ID for this specific element within a resource. These are used for IDREF referenced between
+	 * elements within a single resource, and do not have any other purpose.
+	 */
+	void setElementSpecificId(String theElementSpecificId);
+
+	/**
+	 * @deprecated Use {@link #setElementSpecificId(String)} instead. This method will be removed because it is easily
+	 *             confused with other ID methods (such as patient#getIdentifier)
+	 */
+	void setId(IdDt theId);
+
+	/**
+	 * @deprecated Use {@link #setElementSpecificId(String)} instead. This method will be removed because it is easily
+	 *             confused with other ID methods (such as patient#getIdentifier)
 	 */
 	void setId(String theId);
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java

@@ -25,6 +25,7 @@ import java.util.Map;
 import ca.uhn.fhir.model.dstu.composite.ContainedDt;
 import ca.uhn.fhir.model.dstu.composite.NarrativeDt;
 import ca.uhn.fhir.model.dstu.resource.Patient;
+import ca.uhn.fhir.model.primitive.IdDt;
 
 public interface IResource extends ICompositeElement {
 
@@ -73,4 +74,20 @@ public interface IResource extends ICompositeElement {
 	 */
 	void setResourceMetadata(Map<ResourceMetadataKeyEnum<?>, Object> theMap);
 
+	/**
+	 * Returns the ID of this resource. Note that this identifier is the URL (or a portion
+	 * of the URL) used to access this resource, and is not the same thing as any business
+	 * identifiers stored within the resource. For example, a Patient resource might
+	 * have any number of medical record numbers but these are not stored here.
+	 */
+	IdDt getId();
+	
+	/**
+	 * Sets the ID of this resource. Note that this identifier is the URL (or a portion
+	 * of the URL) used to access this resource, and is not the same thing as any business
+	 * identifiers stored within the resource. For example, a Patient resource might
+	 * have any number of medical record numbers but these are not stored here.
+	 */
+	void setId(IdDt theId);
+	
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResourceBlock.java

@@ -20,6 +20,6 @@ package ca.uhn.fhir.model.api;
  * #L%
  */
 
-public interface IResourceBlock extends ICompositeElement {
+public interface IResourceBlock extends ICompositeElement, IIdentifiableElement {
 	// nothing yet
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java

@@ -20,7 +20,7 @@ package ca.uhn.fhir.model.api;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.*;
 
 import java.net.URI;
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -65,7 +45,7 @@ import ca.uhn.fhir.model.primitive.StringDt;
  */
 @DatatypeDef(name="AddressDt") 
 public class AddressDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -517,5 +497,4 @@ public class AddressDt
   
 
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -66,7 +46,7 @@ import ca.uhn.fhir.model.primitive.UriDt;
  */
 @DatatypeDef(name="AttachmentDt") 
 public class AttachmentDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -446,5 +426,4 @@ public class AttachmentDt
  
 
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -62,7 +42,7 @@ import ca.uhn.fhir.model.primitive.StringDt;
  */
 @DatatypeDef(name="CodeableConceptDt") 
 public class CodeableConceptDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -210,5 +190,4 @@ public class CodeableConceptDt
  
 
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IQueryParameterType;
@@ -66,7 +46,7 @@ import ca.uhn.fhir.model.primitive.UriDt;
  */
 @DatatypeDef(name="CodingDt") 
 public class CodingDt
-        extends  BaseElement         implements ICompositeDatatype  , IQueryParameterType {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  , IQueryParameterType {
 
 	/**
 	 * Constructor
@@ -407,11 +387,9 @@ public class CodingDt
 	@Override
 	public String getValueAsQueryToken() {
 		if (org.apache.commons.lang3.StringUtils.isNotBlank(getSystem().getValueAsString())) {
-			return getSystem().getValueAsString() + '|' + getCode().getValueAsString();
-		} else if (getSystem().getValue()==null) {
-			return getCode().getValueAsString();
+			return getSystem().getValueAsString() + '|' + getCode().getValueAsString(); 
 		} else {
-			return '|' + getCode().getValueAsString();
+			return getCode().getValueAsString();
 		}
 	}
 
@@ -419,20 +397,19 @@ public class CodingDt
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void setValueAsQueryToken(String theQualifier, String theValue) {
-		int barIndex = theValue.indexOf('|');
+	public void setValueAsQueryToken(String theQualifier, String theParameter) {
+		int barIndex = theParameter.indexOf('|');
 		if (barIndex != -1) {
-			setSystem(new UriDt(theValue.substring(0, barIndex)));
-			setCode(theValue.substring(barIndex + 1));
+			setSystem(new UriDt(theParameter.substring(0, barIndex)));
+			setCode(theParameter.substring(barIndex + 1));
 		} else {
-			setCode(theValue);
+			setCode(theParameter);
 		}
-	}
+	}	
 
 	@Override
 	public String getQueryParameterQualifier() {
 		return null;
 	}	
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -67,7 +47,7 @@ import ca.uhn.fhir.model.primitive.StringDt;
  */
 @DatatypeDef(name="ContactDt") 
 public class ContactDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -297,5 +277,4 @@ public class ContactDt
   
 
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContainedDt.java

@@ -27,7 +27,6 @@ import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.primitive.IdDt;
 
 @DatatypeDef(name = "duration")
 public class ContainedDt implements IDatatype {
@@ -51,18 +50,4 @@ public class ContainedDt implements IDatatype {
 		return myContainedResources == null || myContainedResources.size() == 0;
 	}
 
-	@Override
-	public void setId(IdDt theId) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public IdDt getId() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public void setId(String theId) {
-		throw new UnsupportedOperationException();
-	}
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -66,7 +46,7 @@ import ca.uhn.fhir.util.DatatypeUtil;
  */
 @DatatypeDef(name="HumanNameDt") 
 public class HumanNameDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -604,5 +584,4 @@ public class HumanNameDt
 		return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getSuffix());
 	}
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IQueryParameterType;
@@ -68,7 +48,7 @@ import ca.uhn.fhir.model.primitive.UriDt;
  */
 @DatatypeDef(name="IdentifierDt") 
 public class IdentifierDt
-        extends  BaseElement         implements ICompositeDatatype  , IQueryParameterType {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  , IQueryParameterType {
 
 	/**
 	 * Constructor
@@ -413,11 +393,9 @@ public class IdentifierDt
 	@Override
 	public String getValueAsQueryToken() {
 		if (org.apache.commons.lang3.StringUtils.isNotBlank(getSystem().getValueAsString())) {
-			return getSystem().getValueAsString() + '|' + getValue().getValueAsString();
-		} else if (getSystem().getValue() == null) {
-			return getValue().getValueAsString();
+			return getSystem().getValueAsString() + '|' + getValue().getValueAsString(); 
 		} else {
-			return '|' + getValue().getValueAsString();
+			return getValue().getValueAsString();
 		}
 	}
 
@@ -425,20 +403,19 @@ public class IdentifierDt
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void setValueAsQueryToken(String theQualifier, String theValue) {
-		int barIndex = theValue.indexOf('|');
+	public void setValueAsQueryToken(String theQualifier, String theParameter) {
+		int barIndex = theParameter.indexOf('|');
 		if (barIndex != -1) {
-			setSystem(new UriDt(theValue.substring(0, barIndex)));
-			setValue(theValue.substring(barIndex + 1));
+			setSystem(new UriDt(theParameter.substring(0, barIndex)));
+			setValue(theParameter.substring(barIndex + 1));
 		} else {
-			setValue(theValue);
+			setValue(theParameter);
 		}
 	}	
 
-
 	@Override
 	public String getQueryParameterQualifier() {
 		return null;
 	}	
 
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/NarrativeDt.java

@@ -38,7 +38,7 @@ package ca.uhn.fhir.model.dstu.composite;
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -63,7 +63,7 @@ import ca.uhn.fhir.model.primitive.XhtmlDt;
  * </p> 
  */
 @DatatypeDef(name="Narrative") 
-public class NarrativeDt extends BaseElement implements ICompositeDatatype {
+public class NarrativeDt extends BaseIdentifiableElement implements ICompositeDatatype {
 
 	@Child(name="status", type=CodeDt.class, order=0, min=1, max=1)	
 	private BoundCodeDt<NarrativeStatusEnum> myStatus;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
@@ -64,7 +44,7 @@ import ca.uhn.fhir.model.primitive.DateTimeDt;
  */
 @DatatypeDef(name="PeriodDt") 
 public class PeriodDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -137,8 +117,8 @@ public class PeriodDt
      * The start of the period. The boundary is inclusive.
      * </p> 
 	 */
-	public PeriodDt setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myStart = new DateTimeDt(theDate, thePrecision); 
+	public PeriodDt setStartWithSecondsPrecision( Date theDate) {
+		myStart = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -150,8 +130,8 @@ public class PeriodDt
      * The start of the period. The boundary is inclusive.
      * </p> 
 	 */
-	public PeriodDt setStartWithSecondsPrecision( Date theDate) {
-		myStart = new DateTimeDt(theDate); 
+	public PeriodDt setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myStart = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -194,8 +174,8 @@ public class PeriodDt
      * The end of the period. If the end of the period is missing, it means that the period is ongoing
      * </p> 
 	 */
-	public PeriodDt setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myEnd = new DateTimeDt(theDate, thePrecision); 
+	public PeriodDt setEndWithSecondsPrecision( Date theDate) {
+		myEnd = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -207,13 +187,12 @@ public class PeriodDt
      * The end of the period. If the end of the period is missing, it means that the period is ongoing
      * </p> 
 	 */
-	public PeriodDt setEndWithSecondsPrecision( Date theDate) {
-		myEnd = new DateTimeDt(theDate); 
+	public PeriodDt setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myEnd = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
  
 
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java

@@ -1,31 +1,27 @@
-package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+package ca.uhn.fhir.model.dstu.composite;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IQueryParameterType;
@@ -41,20 +37,22 @@ import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
- * HAPI/FHIR <b>QuantityDt</b> Datatype (A measured or measurable amount)
- * 
+ * HAPI/FHIR <b>QuantityDt</b> Datatype
+ * (A measured or measurable amount)
+ *
  * <p>
- * <b>Definition:</b> A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving
- * arbitrary units and floating currencies
- * </p>
- * 
+ * <b>Definition:</b>
+ * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies
+ * </p> 
+ *
  * <p>
- * <b>Requirements:</b> Need to able to capture all sorts of measured values, even if the measured value are not precisely quantified. Values include exact measures such as 3.51g, customary units such
- * as 3 tablets, and currencies such as $100.32USD
- * </p>
+ * <b>Requirements:</b>
+ * Need to able to capture all sorts of measured values, even if the measured value are not precisely quantified. Values include exact measures such as 3.51g, customary units such as 3 tablets, and currencies such as $100.32USD
+ * </p> 
  */
-@DatatypeDef(name = "QuantityDt")
-public class QuantityDt extends BaseElement implements ICompositeDatatype, IQueryParameterType {
+@DatatypeDef(name="QuantityDt") 
+public class QuantityDt
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  , IQueryParameterType {
 
 	/**
 	 * Constructor
@@ -67,7 +65,7 @@ public class QuantityDt extends BaseElement implements ICompositeDatatype, IQuer
 	 * Constructor
 	 */
 	@SimpleSetter
-	public QuantityDt(@SimpleSetter.Parameter(name = "theValue") double theValue) {
+	public QuantityDt(@SimpleSetter.Parameter(name="theValue") double theValue) {
 		setValue(theValue);
 	}
 
@@ -75,33 +73,9 @@ public class QuantityDt extends BaseElement implements ICompositeDatatype, IQuer
 	 * Constructor
 	 */
 	@SimpleSetter
-	public QuantityDt(@SimpleSetter.Parameter(name = "theValue") long theValue) {
+	public QuantityDt(@SimpleSetter.Parameter(name="theValue") long theValue) {
 		setValue(theValue);
 	}
-
-	/**
-	 * Constructor
-	 */
-	@SimpleSetter
-	public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") double theValue,
-			@SimpleSetter.Parameter(name = "theSystem") String theSystem, @SimpleSetter.Parameter(name = "theUnits") String theUnits) {
-		setValue(theValue);
-		setComparator(theComparator);
-		setSystem(theSystem);
-		setUnits(theUnits);
-	}
-
-	/**
-	 * Constructor
-	 */
-	@SimpleSetter
-	public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") long theValue,
-			@SimpleSetter.Parameter(name = "theSystem") String theSystem, @SimpleSetter.Parameter(name = "theUnits") String theUnits) {
-		setValue(theValue);
-		setComparator(theComparator);
-		setSystem(theSystem);
-		setUnits(theUnits);
-	}
 	
 	/**
 	 * Constructor
@@ -125,251 +99,26 @@ public class QuantityDt extends BaseElement implements ICompositeDatatype, IQuer
 		setUnits(theUnits);
 	}
 
-	@Child(name = "value", type = DecimalDt.class, order = 0, min = 0, max = 1)
-	@Description(shortDefinition = "Numerical value (with implicit precision)", formalDefinition = "The value of the measured amount. The value includes an implicit precision in the presentation of the value")
-	private DecimalDt myValue;
-
-	@Child(name = "comparator", type = CodeDt.class, order = 1, min = 0, max = 1)
-	@Description(shortDefinition = "< | <= | >= | > - how to understand the value", formalDefinition = "How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value")
-	private BoundCodeDt<QuantityCompararatorEnum> myComparator;
-
-	@Child(name = "units", type = StringDt.class, order = 2, min = 0, max = 1)
-	@Description(shortDefinition = "Unit representation", formalDefinition = "A human-readable form of the units")
-	private StringDt myUnits;
-
-	@Child(name = "system", type = UriDt.class, order = 3, min = 0, max = 1)
-	@Description(shortDefinition = "System that defines coded unit form", formalDefinition = "The identification of the system that provides the coded form of the unit")
-	private UriDt mySystem;
-
-	@Child(name = "code", type = CodeDt.class, order = 4, min = 0, max = 1)
-	@Description(shortDefinition = "Coded form of the unit", formalDefinition = "A computer processable form of the units in some unit representation system")
-	private CodeDt myCode;
-
-	@Override
-	public boolean isEmpty() {
-		return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(myValue, myComparator, myUnits, mySystem, myCode);
-	}
-
-	@Override
-	public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
-		return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myValue, myComparator, myUnits, mySystem, myCode);
+	/**
+	 * Constructor
+	 */
+	@SimpleSetter
+	public QuantityDt(@SimpleSetter.Parameter(name="theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name="theValue") double theValue, @SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theUnits") String theUnits) {
+		setValue(theValue);
+		setComparator(theComparator);
+		setSystem(theSystem);
+		setUnits(theUnits);
 	}
 
 	/**
-	 * Gets the value(s) for <b>value</b> (Numerical value (with implicit precision)). creating it if it does not exist. Will not return <code>null</code>.
-	 * 
-	 * <p>
-	 * <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
-	 * </p>
+	 * Constructor
 	 */
-	public DecimalDt getValue() {
-		if (myValue == null) {
-			myValue = new DecimalDt();
-		}
-		return myValue;
-	}
-
-	/**
-	 * Sets the value(s) for <b>value</b> (Numerical value (with implicit precision))
-	 * 
-	 * <p>
-	 * <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
-	 * </p>
-	 */
-	public QuantityDt setValue(DecimalDt theValue) {
-		myValue = theValue;
-		return this;
-	}
-
-	/**
-	 * Sets the value for <b>value</b> (Numerical value (with implicit precision))
-	 * 
-	 * <p>
-	 * <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
-	 * </p>
-	 */
-	public QuantityDt setValue(long theValue) {
-		myValue = new DecimalDt(theValue);
-		return this;
-	}
-
-	/**
-	 * Sets the value for <b>value</b> (Numerical value (with implicit precision))
-	 * 
-	 * <p>
-	 * <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
-	 * </p>
-	 */
-	public QuantityDt setValue(double theValue) {
-		myValue = new DecimalDt(theValue);
-		return this;
-	}
-
-	/**
-	 * Sets the value for <b>value</b> (Numerical value (with implicit precision))
-	 * 
-	 * <p>
-	 * <b>Definition:</b> The value of the measured amount. The value includes an implicit precision in the presentation of the value
-	 * </p>
-	 */
-	public QuantityDt setValue(java.math.BigDecimal theValue) {
-		myValue = new DecimalDt(theValue);
-		return this;
-	}
-
-	/**
-	 * Gets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value). creating it if it does not exist. Will not return <code>null</code>.
-	 * 
-	 * <p>
-	 * <b>Definition:</b> How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is
-	 * \"<\" , then the real value is < stated value
-	 * </p>
-	 */
-	public BoundCodeDt<QuantityCompararatorEnum> getComparator() {
-		if (myComparator == null) {
-			myComparator = new BoundCodeDt<QuantityCompararatorEnum>(QuantityCompararatorEnum.VALUESET_BINDER);
-		}
-		return myComparator;
-	}
-
-	/**
-	 * Sets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value)
-	 * 
-	 * <p>
-	 * <b>Definition:</b> How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is
-	 * \"<\" , then the real value is < stated value
-	 * </p>
-	 */
-	public QuantityDt setComparator(BoundCodeDt<QuantityCompararatorEnum> theValue) {
-		myComparator = theValue;
-		return this;
-	}
-
-	/**
-	 * Sets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value)
-	 * 
-	 * <p>
-	 * <b>Definition:</b> How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is
-	 * \"<\" , then the real value is < stated value
-	 * </p>
-	 */
-	public QuantityDt setComparator(QuantityCompararatorEnum theValue) {
-		getComparator().setValueAsEnum(theValue);
-		return this;
-	}
-
-	/**
-	 * Gets the value(s) for <b>units</b> (Unit representation). creating it if it does not exist. Will not return <code>null</code>.
-	 * 
-	 * <p>
-	 * <b>Definition:</b> A human-readable form of the units
-	 * </p>
-	 */
-	public StringDt getUnits() {
-		if (myUnits == null) {
-			myUnits = new StringDt();
-		}
-		return myUnits;
-	}
-
-	/**
-	 * Sets the value(s) for <b>units</b> (Unit representation)
-	 * 
-	 * <p>
-	 * <b>Definition:</b> A human-readable form of the units
-	 * </p>
-	 */
-	public QuantityDt setUnits(StringDt theValue) {
-		myUnits = theValue;
-		return this;
-	}
-
-	/**
-	 * Sets the value for <b>units</b> (Unit representation)
-	 * 
-	 * <p>
-	 * <b>Definition:</b> A human-readable form of the units
-	 * </p>
-	 */
-	public QuantityDt setUnits(String theString) {
-		myUnits = new StringDt(theString);
-		return this;
-	}
-
-	/**
-	 * Gets the value(s) for <b>system</b> (System that defines coded unit form). creating it if it does not exist. Will not return <code>null</code>.
-	 * 
-	 * <p>
-	 * <b>Definition:</b> The identification of the system that provides the coded form of the unit
-	 * </p>
-	 */
-	public UriDt getSystem() {
-		if (mySystem == null) {
-			mySystem = new UriDt();
-		}
-		return mySystem;
-	}
-
-	/**
-	 * Sets the value(s) for <b>system</b> (System that defines coded unit form)
-	 * 
-	 * <p>
-	 * <b>Definition:</b> The identification of the system that provides the coded form of the unit
-	 * </p>
-	 */
-	public QuantityDt setSystem(UriDt theValue) {
-		mySystem = theValue;
-		return this;
-	}
-
-	/**
-	 * Sets the value for <b>system</b> (System that defines coded unit form)
-	 * 
-	 * <p>
-	 * <b>Definition:</b> The identification of the system that provides the coded form of the unit
-	 * </p>
-	 */
-	public QuantityDt setSystem(String theUri) {
-		mySystem = new UriDt(theUri);
-		return this;
-	}
-
-	/**
-	 * Gets the value(s) for <b>code</b> (Coded form of the unit). creating it if it does not exist. Will not return <code>null</code>.
-	 * 
-	 * <p>
-	 * <b>Definition:</b> A computer processable form of the units in some unit representation system
-	 * </p>
-	 */
-	public CodeDt getCode() {
-		if (myCode == null) {
-			myCode = new CodeDt();
-		}
-		return myCode;
-	}
-
-	/**
-	 * Sets the value(s) for <b>code</b> (Coded form of the unit)
-	 * 
-	 * <p>
-	 * <b>Definition:</b> A computer processable form of the units in some unit representation system
-	 * </p>
-	 */
-	public QuantityDt setCode(CodeDt theValue) {
-		myCode = theValue;
-		return this;
-	}
-
-	/**
-	 * Sets the value for <b>code</b> (Coded form of the unit)
-	 * 
-	 * <p>
-	 * <b>Definition:</b> A computer processable form of the units in some unit representation system
-	 * </p>
-	 */
-	public QuantityDt setCode(String theCode) {
-		myCode = new CodeDt(theCode);
-		return this;
+	@SimpleSetter
+	public QuantityDt(@SimpleSetter.Parameter(name="theComparator") QuantityCompararatorEnum theComparator, @SimpleSetter.Parameter(name="theValue") long theValue, @SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theUnits") String theUnits) {
+		setValue(theValue);
+		setComparator(theComparator);
+		setSystem(theSystem);
+		setUnits(theUnits);
 	}
 
 	@Override
@@ -437,4 +186,298 @@ public class QuantityDt extends BaseElement implements ICompositeDatatype, IQuer
 		return null;
 	}	
 
-}
+	@Child(name="value", type=DecimalDt.class, order=0, min=0, max=1)	
+	@Description(
+		shortDefinition="Numerical value (with implicit precision)",
+		formalDefinition="The value of the measured amount. The value includes an implicit precision in the presentation of the value"
+	)
+	private DecimalDt myValue;
+	
+	@Child(name="comparator", type=CodeDt.class, order=1, min=0, max=1)	
+	@Description(
+		shortDefinition="< | <= | >= | > - how to understand the value",
+		formalDefinition="How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value"
+	)
+	private BoundCodeDt<QuantityCompararatorEnum> myComparator;
+	
+	@Child(name="units", type=StringDt.class, order=2, min=0, max=1)	
+	@Description(
+		shortDefinition="Unit representation",
+		formalDefinition="A human-readable form of the units"
+	)
+	private StringDt myUnits;
+	
+	@Child(name="system", type=UriDt.class, order=3, min=0, max=1)	
+	@Description(
+		shortDefinition="System that defines coded unit form",
+		formalDefinition="The identification of the system that provides the coded form of the unit"
+	)
+	private UriDt mySystem;
+	
+	@Child(name="code", type=CodeDt.class, order=4, min=0, max=1)	
+	@Description(
+		shortDefinition="Coded form of the unit",
+		formalDefinition="A computer processable form of the units in some unit representation system"
+	)
+	private CodeDt myCode;
+	
+
+	@Override
+	public boolean isEmpty() {
+		return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(  myValue,  myComparator,  myUnits,  mySystem,  myCode);
+	}
+	
+	@Override
+	public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
+		return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myValue, myComparator, myUnits, mySystem, myCode);
+	}
+
+	/**
+	 * Gets the value(s) for <b>value</b> (Numerical value (with implicit precision)).
+	 * creating it if it does
+	 * not exist. Will not return <code>null</code>.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the measured amount. The value includes an implicit precision in the presentation of the value
+     * </p> 
+	 */
+	public DecimalDt getValue() {  
+		if (myValue == null) {
+			myValue = new DecimalDt();
+		}
+		return myValue;
+	}
+
+	/**
+	 * Sets the value(s) for <b>value</b> (Numerical value (with implicit precision))
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the measured amount. The value includes an implicit precision in the presentation of the value
+     * </p> 
+	 */
+	public QuantityDt setValue(DecimalDt theValue) {
+		myValue = theValue;
+		return this;
+	}
+
+ 	/**
+	 * Sets the value for <b>value</b> (Numerical value (with implicit precision))
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the measured amount. The value includes an implicit precision in the presentation of the value
+     * </p> 
+	 */
+	public QuantityDt setValue( long theValue) {
+		myValue = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>value</b> (Numerical value (with implicit precision))
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the measured amount. The value includes an implicit precision in the presentation of the value
+     * </p> 
+	 */
+	public QuantityDt setValue( double theValue) {
+		myValue = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>value</b> (Numerical value (with implicit precision))
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the measured amount. The value includes an implicit precision in the presentation of the value
+     * </p> 
+	 */
+	public QuantityDt setValue( java.math.BigDecimal theValue) {
+		myValue = new DecimalDt(theValue); 
+		return this; 
+	}
+
+ 
+	/**
+	 * Gets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value).
+	 * creating it if it does
+	 * not exist. Will not return <code>null</code>.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value
+     * </p> 
+	 */
+	public BoundCodeDt<QuantityCompararatorEnum> getComparator() {  
+		if (myComparator == null) {
+			myComparator = new BoundCodeDt<QuantityCompararatorEnum>(QuantityCompararatorEnum.VALUESET_BINDER);
+		}
+		return myComparator;
+	}
+
+	/**
+	 * Sets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value
+     * </p> 
+	 */
+	public QuantityDt setComparator(BoundCodeDt<QuantityCompararatorEnum> theValue) {
+		myComparator = theValue;
+		return this;
+	}
+
+	/**
+	 * Sets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues. E.g. if the comparator is \"<\" , then the real value is < stated value
+     * </p> 
+	 */
+	public QuantityDt setComparator(QuantityCompararatorEnum theValue) {
+		getComparator().setValueAsEnum(theValue);
+		return this;
+	}
+
+  
+	/**
+	 * Gets the value(s) for <b>units</b> (Unit representation).
+	 * creating it if it does
+	 * not exist. Will not return <code>null</code>.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A human-readable form of the units
+     * </p> 
+	 */
+	public StringDt getUnits() {  
+		if (myUnits == null) {
+			myUnits = new StringDt();
+		}
+		return myUnits;
+	}
+
+	/**
+	 * Sets the value(s) for <b>units</b> (Unit representation)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A human-readable form of the units
+     * </p> 
+	 */
+	public QuantityDt setUnits(StringDt theValue) {
+		myUnits = theValue;
+		return this;
+	}
+
+ 	/**
+	 * Sets the value for <b>units</b> (Unit representation)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A human-readable form of the units
+     * </p> 
+	 */
+	public QuantityDt setUnits( String theString) {
+		myUnits = new StringDt(theString); 
+		return this; 
+	}
+
+ 
+	/**
+	 * Gets the value(s) for <b>system</b> (System that defines coded unit form).
+	 * creating it if it does
+	 * not exist. Will not return <code>null</code>.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The identification of the system that provides the coded form of the unit
+     * </p> 
+	 */
+	public UriDt getSystem() {  
+		if (mySystem == null) {
+			mySystem = new UriDt();
+		}
+		return mySystem;
+	}
+
+	/**
+	 * Sets the value(s) for <b>system</b> (System that defines coded unit form)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The identification of the system that provides the coded form of the unit
+     * </p> 
+	 */
+	public QuantityDt setSystem(UriDt theValue) {
+		mySystem = theValue;
+		return this;
+	}
+
+ 	/**
+	 * Sets the value for <b>system</b> (System that defines coded unit form)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The identification of the system that provides the coded form of the unit
+     * </p> 
+	 */
+	public QuantityDt setSystem( String theUri) {
+		mySystem = new UriDt(theUri); 
+		return this; 
+	}
+
+ 
+	/**
+	 * Gets the value(s) for <b>code</b> (Coded form of the unit).
+	 * creating it if it does
+	 * not exist. Will not return <code>null</code>.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A computer processable form of the units in some unit representation system
+     * </p> 
+	 */
+	public CodeDt getCode() {  
+		if (myCode == null) {
+			myCode = new CodeDt();
+		}
+		return myCode;
+	}
+
+	/**
+	 * Sets the value(s) for <b>code</b> (Coded form of the unit)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A computer processable form of the units in some unit representation system
+     * </p> 
+	 */
+	public QuantityDt setCode(CodeDt theValue) {
+		myCode = theValue;
+		return this;
+	}
+
+ 	/**
+	 * Sets the value for <b>code</b> (Coded form of the unit)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A computer processable form of the units in some unit representation system
+     * </p> 
+	 */
+	public QuantityDt setCode( String theCode) {
+		myCode = new CodeDt(theCode); 
+		return this; 
+	}
+
+ 
+
+
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -62,7 +42,7 @@ import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
  */
 @DatatypeDef(name="RangeDt") 
 public class RangeDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -135,8 +115,21 @@ public class RangeDt
      * The low limit. The boundary is inclusive.
      * </p> 
 	 */
-	public RangeDt setLow( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myLow = new QuantityDt(theComparator, theValue, theUnits); 
+	public RangeDt setLow( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>low</b> (Low limit)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The low limit. The boundary is inclusive.
+     * </p> 
+	 */
+	public RangeDt setLow( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -161,8 +154,8 @@ public class RangeDt
      * The low limit. The boundary is inclusive.
      * </p> 
 	 */
-	public RangeDt setLow( long theValue) {
-		myLow = new QuantityDt(theValue); 
+	public RangeDt setLow( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myLow = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -179,6 +172,19 @@ public class RangeDt
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>low</b> (Low limit)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The low limit. The boundary is inclusive.
+     * </p> 
+	 */
+	public RangeDt setLow( long theValue) {
+		myLow = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>high</b> (High limit).
@@ -218,8 +224,21 @@ public class RangeDt
      * The high limit. The boundary is inclusive.
      * </p> 
 	 */
-	public RangeDt setHigh( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myHigh = new QuantityDt(theComparator, theValue, theUnits); 
+	public RangeDt setHigh( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>high</b> (High limit)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The high limit. The boundary is inclusive.
+     * </p> 
+	 */
+	public RangeDt setHigh( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -244,8 +263,8 @@ public class RangeDt
      * The high limit. The boundary is inclusive.
      * </p> 
 	 */
-	public RangeDt setHigh( long theValue) {
-		myHigh = new QuantityDt(theValue); 
+	public RangeDt setHigh( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myHigh = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -262,8 +281,20 @@ public class RangeDt
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>high</b> (High limit)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The high limit. The boundary is inclusive.
+     * </p> 
+	 */
+	public RangeDt setHigh( long theValue) {
+		myHigh = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -62,7 +42,7 @@ import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
  */
 @DatatypeDef(name="RatioDt") 
 public class RatioDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -135,8 +115,21 @@ public class RatioDt
      * The value of the numerator
      * </p> 
 	 */
-	public RatioDt setNumerator( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myNumerator = new QuantityDt(theComparator, theValue, theUnits); 
+	public RatioDt setNumerator( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myNumerator = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>numerator</b> (Numerator value)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the numerator
+     * </p> 
+	 */
+	public RatioDt setNumerator( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myNumerator = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -161,8 +154,8 @@ public class RatioDt
      * The value of the numerator
      * </p> 
 	 */
-	public RatioDt setNumerator( long theValue) {
-		myNumerator = new QuantityDt(theValue); 
+	public RatioDt setNumerator( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myNumerator = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -179,6 +172,19 @@ public class RatioDt
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>numerator</b> (Numerator value)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the numerator
+     * </p> 
+	 */
+	public RatioDt setNumerator( long theValue) {
+		myNumerator = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>denominator</b> (Denominator value).
@@ -218,8 +224,21 @@ public class RatioDt
      * The value of the denominator
      * </p> 
 	 */
-	public RatioDt setDenominator( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myDenominator = new QuantityDt(theComparator, theValue, theUnits); 
+	public RatioDt setDenominator( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myDenominator = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>denominator</b> (Denominator value)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the denominator
+     * </p> 
+	 */
+	public RatioDt setDenominator( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myDenominator = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -244,8 +263,8 @@ public class RatioDt
      * The value of the denominator
      * </p> 
 	 */
-	public RatioDt setDenominator( long theValue) {
-		myDenominator = new QuantityDt(theValue); 
+	public RatioDt setDenominator( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myDenominator = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -262,8 +281,20 @@ public class RatioDt
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>denominator</b> (Denominator value)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the denominator
+     * </p> 
+	 */
+	public RatioDt setDenominator( long theValue) {
+		myDenominator = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java

@@ -69,14 +69,6 @@ public class ResourceReferenceDt
 		super(theResource);
 	}
 
-	@Override
-	public String toString() {
-		org.apache.commons.lang3.builder.ToStringBuilder b = new org.apache.commons.lang3.builder.ToStringBuilder(this, org.apache.commons.lang3.builder.ToStringStyle.SHORT_PREFIX_STYLE);
-		b.append("reference", getReference().getValueAsString());
-		b.append("loaded", getResource()!=null);
-		return b.toString();
-	}
-
 	/**
 	 * Constructor which accepts a reference directly (this can be an ID, a partial/relative URL or a complete/absolute
 	 * URL)
@@ -213,5 +205,13 @@ public class ResourceReferenceDt
 
  
 
+	@Override
+	public String toString() {
+		org.apache.commons.lang3.builder.ToStringBuilder b = new org.apache.commons.lang3.builder.ToStringBuilder(this, org.apache.commons.lang3.builder.ToStringStyle.SHORT_PREFIX_STYLE);
+		b.append("reference", getReference().getValueAsString());
+		b.append("loaded", getResource()!=null);
+		return b.toString();
+	}
+
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java

@@ -16,29 +16,9 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -65,7 +45,7 @@ import ca.uhn.fhir.model.primitive.StringDt;
  */
 @DatatypeDef(name="SampledDataDt") 
 public class SampledDataDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -173,8 +153,21 @@ public class SampledDataDt
      * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
      * </p> 
 	 */
-	public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myOrigin = new QuantityDt(theComparator, theValue, theUnits); 
+	public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myOrigin = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>origin</b> (Zero value and units)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
+     * </p> 
+	 */
+	public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myOrigin = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -199,8 +192,8 @@ public class SampledDataDt
      * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
      * </p> 
 	 */
-	public SampledDataDt setOrigin( long theValue) {
-		myOrigin = new QuantityDt(theValue); 
+	public SampledDataDt setOrigin( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myOrigin = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -217,6 +210,19 @@ public class SampledDataDt
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>origin</b> (Zero value and units)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The base quantity that a measured value of zero represents. In addition, this provides the units of the entire measurement series
+     * </p> 
+	 */
+	public SampledDataDt setOrigin( long theValue) {
+		myOrigin = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>period</b> (Number of milliseconds between samples).
@@ -588,5 +594,4 @@ public class SampledDataDt
  
 
 
-
-}
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResourceBlock;
@@ -72,7 +52,7 @@ import ca.uhn.fhir.model.primitive.IntegerDt;
  */
 @DatatypeDef(name="ScheduleDt") 
 public class ScheduleDt
-        extends  BaseElement         implements ICompositeDatatype  {
+        extends  BaseIdentifiableElement         implements ICompositeDatatype  {
 
 	/**
 	 * Constructor
@@ -207,7 +187,7 @@ public class ScheduleDt
      * </p> 
 	 */
 	@Block()	
-	public static class Repeat extends BaseElement implements IResourceBlock {
+	public static class Repeat extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="frequency", type=IntegerDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -546,8 +526,8 @@ public class ScheduleDt
      * When to stop repeating the schedule
      * </p> 
 	 */
-	public Repeat setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myEnd = new DateTimeDt(theDate, thePrecision); 
+	public Repeat setEndWithSecondsPrecision( Date theDate) {
+		myEnd = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -559,8 +539,8 @@ public class ScheduleDt
      * When to stop repeating the schedule
      * </p> 
 	 */
-	public Repeat setEndWithSecondsPrecision( Date theDate) {
-		myEnd = new DateTimeDt(theDate); 
+	public Repeat setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myEnd = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -571,5 +551,4 @@ public class ScheduleDt
 
 
 
-
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -384,8 +364,8 @@ public class AdverseReaction extends BaseResource implements IResource {
      * The date (and possibly time) when the reaction began
      * </p> 
 	 */
-	public AdverseReaction setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public AdverseReaction setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -397,8 +377,8 @@ public class AdverseReaction extends BaseResource implements IResource {
      * The date (and possibly time) when the reaction began
      * </p> 
 	 */
-	public AdverseReaction setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public AdverseReaction setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -489,6 +469,9 @@ public class AdverseReaction extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getRecorder() {  
+		if (myRecorder == null) {
+			myRecorder = new ResourceReferenceDt();
+		}
 		return myRecorder;
 	}
 
@@ -635,7 +618,7 @@ public class AdverseReaction extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Symptom extends BaseElement implements IResourceBlock {
+	public static class Symptom extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -750,7 +733,7 @@ public class AdverseReaction extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Exposure extends BaseElement implements IResourceBlock {
+	public static class Exposure extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="date", type=DateTimeDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -830,8 +813,8 @@ public class AdverseReaction extends BaseResource implements IResource {
      * Identifies the initial date of the exposure that is suspected to be related to the reaction
      * </p> 
 	 */
-	public Exposure setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public Exposure setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -843,8 +826,8 @@ public class AdverseReaction extends BaseResource implements IResource {
      * Identifies the initial date of the exposure that is suspected to be related to the reaction
      * </p> 
 	 */
-	public Exposure setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public Exposure setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -974,4 +957,4 @@ public class AdverseReaction extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
@@ -377,6 +357,9 @@ public class Alert extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getAuthor() {  
+		if (myAuthor == null) {
+			myAuthor = new ResourceReferenceDt();
+		}
 		return myAuthor;
 	}
 
@@ -440,4 +423,4 @@ public class Alert extends BaseResource implements IResource {
  
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
@@ -539,8 +519,8 @@ public class AllergyIntolerance extends BaseResource implements IResource {
      * Date when the sensitivity was recorded
      * </p> 
 	 */
-	public AllergyIntolerance setRecordedDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myRecordedDate = new DateTimeDt(theDate, thePrecision); 
+	public AllergyIntolerance setRecordedDateWithSecondsPrecision( Date theDate) {
+		myRecordedDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -552,8 +532,8 @@ public class AllergyIntolerance extends BaseResource implements IResource {
      * Date when the sensitivity was recorded
      * </p> 
 	 */
-	public AllergyIntolerance setRecordedDateWithSecondsPrecision( Date theDate) {
-		myRecordedDate = new DateTimeDt(theDate); 
+	public AllergyIntolerance setRecordedDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myRecordedDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -644,6 +624,9 @@ public class AllergyIntolerance extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getRecorder() {  
+		if (myRecorder == null) {
+			myRecorder = new ResourceReferenceDt();
+		}
 		return myRecorder;
 	}
 
@@ -782,4 +765,4 @@ public class AllergyIntolerance extends BaseResource implements IResource {
   
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -65,7 +45,6 @@ import ca.uhn.fhir.model.primitive.InstantDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.rest.gclient.DateParam;
-import ca.uhn.fhir.rest.gclient.NumberParam;
 import ca.uhn.fhir.rest.gclient.ReferenceParam;
 import ca.uhn.fhir.rest.gclient.StringParam;
 import ca.uhn.fhir.rest.gclient.TokenParam;
@@ -163,27 +142,6 @@ public class Appointment extends BaseResource implements IResource {
 	 */
 	public static final Include INCLUDE_PARTICIPANT_INDIVIDUAL = new Include("Appointment.participant.individual");
 
-	/**
-	 * Search parameter constant for <b>!duration</b>
-	 * <p>
-	 * Description: <b>The number of minutes that the appointment is to go for</b><br/>
-	 * Type: <b>number</b><br/>
-	 * Path: <b>Appointment.minutesDuration</b><br/>
-	 * </p>
-	 */
-	@SearchParamDefinition(name="!duration", path="Appointment.minutesDuration", description="The number of minutes that the appointment is to go for", type="number")
-	public static final String SP_DURATION = "!duration";
-
-	/**
-	 * <b>Fluent Client</b> search parameter constant for <b>!duration</b>
-	 * <p>
-	 * Description: <b>The number of minutes that the appointment is to go for</b><br/>
-	 * Type: <b>number</b><br/>
-	 * Path: <b>Appointment.minutesDuration</b><br/>
-	 * </p>
-	 */
-	public static final NumberParam DURATION = new NumberParam(SP_DURATION);
-
 	/**
 	 * Search parameter constant for <b>partstatus</b>
 	 * <p>
@@ -592,8 +550,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setStartWithMillisPrecision( Date theDate) {
-		myStart = new InstantDt(theDate); 
+	public Appointment setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myStart = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -605,8 +563,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myStart = new InstantDt(theDate, thePrecision); 
+	public Appointment setStartWithMillisPrecision( Date theDate) {
+		myStart = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -649,8 +607,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setEndWithMillisPrecision( Date theDate) {
-		myEnd = new InstantDt(theDate); 
+	public Appointment setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myEnd = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -662,8 +620,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myEnd = new InstantDt(theDate, thePrecision); 
+	public Appointment setEndWithMillisPrecision( Date theDate) {
+		myEnd = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -964,6 +922,9 @@ public class Appointment extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getRecorder() {  
+		if (myRecorder == null) {
+			myRecorder = new ResourceReferenceDt();
+		}
 		return myRecorder;
 	}
 
@@ -1019,8 +980,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setRecordedDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myRecordedDate = new DateTimeDt(theDate, thePrecision); 
+	public Appointment setRecordedDateWithSecondsPrecision( Date theDate) {
+		myRecordedDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1032,8 +993,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setRecordedDateWithSecondsPrecision( Date theDate) {
-		myRecordedDate = new DateTimeDt(theDate); 
+	public Appointment setRecordedDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myRecordedDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1047,7 +1008,7 @@ public class Appointment extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Participant extends BaseElement implements IResourceBlock {
+	public static class Participant extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1127,6 +1088,23 @@ public class Appointment extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>type</b> (Role of participant in the appointment) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public BoundCodeableConceptDt<ParticipantTypeEnum> addType(ParticipantTypeEnum theValue) {
+		BoundCodeableConceptDt<ParticipantTypeEnum> retVal = new BoundCodeableConceptDt<ParticipantTypeEnum>(ParticipantTypeEnum.VALUESET_BINDER, theValue);
+		getType().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>type</b> (Role of participant in the appointment)
 	 *
@@ -1135,8 +1113,10 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void addType(ParticipantTypeEnum theValue) {
-		getType().add(new BoundCodeableConceptDt<ParticipantTypeEnum>(ParticipantTypeEnum.VALUESET_BINDER, theValue));
+	public BoundCodeableConceptDt<ParticipantTypeEnum> addType() {
+		BoundCodeableConceptDt<ParticipantTypeEnum> retVal = new BoundCodeableConceptDt<ParticipantTypeEnum>(ParticipantTypeEnum.VALUESET_BINDER);
+		getType().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -1165,6 +1145,9 @@ public class Appointment extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getIndividual() {  
+		if (myIndividual == null) {
+			myIndividual = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myIndividual;
 	}
 
@@ -1333,4 +1316,4 @@ public class Appointment extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
@@ -418,6 +398,23 @@ public class AppointmentResponse extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>participantType</b> (Role of participant in the appointment) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public BoundCodeableConceptDt<ParticipantTypeEnum> addParticipantType(ParticipantTypeEnum theValue) {
+		BoundCodeableConceptDt<ParticipantTypeEnum> retVal = new BoundCodeableConceptDt<ParticipantTypeEnum>(ParticipantTypeEnum.VALUESET_BINDER, theValue);
+		getParticipantType().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>participantType</b> (Role of participant in the appointment)
 	 *
@@ -426,8 +423,10 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void addParticipantType(ParticipantTypeEnum theValue) {
-		getParticipantType().add(new BoundCodeableConceptDt<ParticipantTypeEnum>(ParticipantTypeEnum.VALUESET_BINDER, theValue));
+	public BoundCodeableConceptDt<ParticipantTypeEnum> addParticipantType() {
+		BoundCodeableConceptDt<ParticipantTypeEnum> retVal = new BoundCodeableConceptDt<ParticipantTypeEnum>(ParticipantTypeEnum.VALUESET_BINDER);
+		getParticipantType().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -456,6 +455,9 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getIndividual() {  
+		if (myIndividual == null) {
+			myIndividual = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myIndividual;
 	}
 
@@ -612,8 +614,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setStartWithMillisPrecision( Date theDate) {
-		myStart = new InstantDt(theDate); 
+	public AppointmentResponse setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myStart = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -625,8 +627,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myStart = new InstantDt(theDate, thePrecision); 
+	public AppointmentResponse setStartWithMillisPrecision( Date theDate) {
+		myStart = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -669,8 +671,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setEndWithMillisPrecision( Date theDate) {
-		myEnd = new InstantDt(theDate); 
+	public AppointmentResponse setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myEnd = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -682,8 +684,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myEnd = new InstantDt(theDate, thePrecision); 
+	public AppointmentResponse setEndWithMillisPrecision( Date theDate) {
+		myEnd = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -774,6 +776,9 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getRecorder() {  
+		if (myRecorder == null) {
+			myRecorder = new ResourceReferenceDt();
+		}
 		return myRecorder;
 	}
 
@@ -829,8 +834,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setRecordedDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myRecordedDate = new DateTimeDt(theDate, thePrecision); 
+	public AppointmentResponse setRecordedDateWithSecondsPrecision( Date theDate) {
+		myRecordedDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -842,12 +847,12 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setRecordedDateWithSecondsPrecision( Date theDate) {
-		myRecordedDate = new DateTimeDt(theDate); 
+	public AppointmentResponse setRecordedDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myRecordedDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
  
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
@@ -56,7 +36,6 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.rest.gclient.DateParam;
 import ca.uhn.fhir.rest.gclient.ReferenceParam;
 import ca.uhn.fhir.rest.gclient.TokenParam;
 
@@ -84,27 +63,6 @@ import ca.uhn.fhir.rest.gclient.TokenParam;
 @ResourceDef(name="Availability", profile="http://hl7.org/fhir/profiles/Availability", id="availability")
 public class Availability extends BaseResource implements IResource {
 
-	/**
-	 * Search parameter constant for <b>!period</b>
-	 * <p>
-	 * Description: <b>Appointment date/time.</b><br/>
-	 * Type: <b>date</b><br/>
-	 * Path: <b>Availability.period</b><br/>
-	 * </p>
-	 */
-	@SearchParamDefinition(name="!period", path="Availability.period", description="Appointment date/time.", type="date")
-	public static final String SP_PERIOD = "!period";
-
-	/**
-	 * <b>Fluent Client</b> search parameter constant for <b>!period</b>
-	 * <p>
-	 * Description: <b>Appointment date/time.</b><br/>
-	 * Type: <b>date</b><br/>
-	 * Path: <b>Availability.period</b><br/>
-	 * </p>
-	 */
-	public static final DateParam PERIOD = new DateParam(SP_PERIOD);
-
 	/**
 	 * Search parameter constant for <b>individual</b>
 	 * <p>
@@ -354,6 +312,9 @@ public class Availability extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getIndividual() {  
+		if (myIndividual == null) {
+			myIndividual = new ResourceReferenceDt();
+		}
 		return myIndividual;
 	}
 
@@ -457,6 +418,9 @@ public class Availability extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getAuthor() {  
+		if (myAuthor == null) {
+			myAuthor = new ResourceReferenceDt();
+		}
 		return myAuthor;
 	}
 
@@ -512,8 +476,8 @@ public class Availability extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Availability setAuthorDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myAuthorDate = new DateTimeDt(theDate, thePrecision); 
+	public Availability setAuthorDateWithSecondsPrecision( Date theDate) {
+		myAuthorDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -525,12 +489,12 @@ public class Availability extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Availability setAuthorDateWithSecondsPrecision( Date theDate) {
-		myAuthorDate = new DateTimeDt(theDate); 
+	public Availability setAuthorDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myAuthorDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
  
 
 
-}
+}

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

@@ -29,7 +29,6 @@ import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.dstu.composite.NarrativeDt;
 import ca.uhn.fhir.model.primitive.Base64BinaryDt;
 
 @ResourceDef(name = "Binary", profile = "http://hl7.org/fhir/profiles/Binary", id = "binary")

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -594,8 +574,8 @@ public class CarePlan extends BaseResource implements IResource {
      * Identifies the most recent date on which the plan has been revised.
      * </p> 
 	 */
-	public CarePlan setModified( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myModified = new DateTimeDt(theDate, thePrecision); 
+	public CarePlan setModifiedWithSecondsPrecision( Date theDate) {
+		myModified = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -607,8 +587,8 @@ public class CarePlan extends BaseResource implements IResource {
      * Identifies the most recent date on which the plan has been revised.
      * </p> 
 	 */
-	public CarePlan setModifiedWithSecondsPrecision( Date theDate) {
-		myModified = new DateTimeDt(theDate); 
+	public CarePlan setModified( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myModified = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -890,7 +870,7 @@ public class CarePlan extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Participant extends BaseElement implements IResourceBlock {
+	public static class Participant extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="role", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -960,6 +940,9 @@ public class CarePlan extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getMember() {  
+		if (myMember == null) {
+			myMember = new ResourceReferenceDt();
+		}
 		return myMember;
 	}
 
@@ -990,7 +973,7 @@ public class CarePlan extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Goal extends BaseElement implements IResourceBlock {
+	public static class Goal extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="description", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1221,7 +1204,7 @@ public class CarePlan extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Activity extends BaseElement implements IResourceBlock {
+	public static class Activity extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="goal", type=IdrefDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1532,6 +1515,9 @@ public class CarePlan extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getDetail() {  
+		if (myDetail == null) {
+			myDetail = new ResourceReferenceDt();
+		}
 		return myDetail;
 	}
 
@@ -1592,7 +1578,7 @@ public class CarePlan extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ActivitySimple extends BaseElement implements IResourceBlock {
+	public static class ActivitySimple extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="category", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1817,6 +1803,9 @@ public class CarePlan extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getPerformer() {  
+		if (myPerformer == null) {
+			myPerformer = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myPerformer;
 	}
 
@@ -1858,6 +1847,9 @@ public class CarePlan extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getProduct() {  
+		if (myProduct == null) {
+			myProduct = new ResourceReferenceDt();
+		}
 		return myProduct;
 	}
 
@@ -1913,8 +1905,21 @@ public class CarePlan extends BaseResource implements IResource {
      * Identifies the quantity expected to be consumed in a given day.
      * </p> 
 	 */
-	public ActivitySimple setDailyAmount( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myDailyAmount = new QuantityDt(theComparator, theValue, theUnits); 
+	public ActivitySimple setDailyAmount( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myDailyAmount = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>dailyAmount</b> (How much consumed/day?)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifies the quantity expected to be consumed in a given day.
+     * </p> 
+	 */
+	public ActivitySimple setDailyAmount( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myDailyAmount = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1939,8 +1944,8 @@ public class CarePlan extends BaseResource implements IResource {
      * Identifies the quantity expected to be consumed in a given day.
      * </p> 
 	 */
-	public ActivitySimple setDailyAmount( long theValue) {
-		myDailyAmount = new QuantityDt(theValue); 
+	public ActivitySimple setDailyAmount( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myDailyAmount = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1957,6 +1962,19 @@ public class CarePlan extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>dailyAmount</b> (How much consumed/day?)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifies the quantity expected to be consumed in a given day.
+     * </p> 
+	 */
+	public ActivitySimple setDailyAmount( long theValue) {
+		myDailyAmount = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>quantity</b> (How much is administered/supplied/consumed).
@@ -1996,8 +2014,21 @@ public class CarePlan extends BaseResource implements IResource {
      * Identifies the quantity expected to be supplied.
      * </p> 
 	 */
-	public ActivitySimple setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public ActivitySimple setQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>quantity</b> (How much is administered/supplied/consumed)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifies the quantity expected to be supplied.
+     * </p> 
+	 */
+	public ActivitySimple setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -2022,8 +2053,8 @@ public class CarePlan extends BaseResource implements IResource {
      * Identifies the quantity expected to be supplied.
      * </p> 
 	 */
-	public ActivitySimple setQuantity( long theValue) {
-		myQuantity = new QuantityDt(theValue); 
+	public ActivitySimple setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -2040,6 +2071,19 @@ public class CarePlan extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>quantity</b> (How much is administered/supplied/consumed)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifies the quantity expected to be supplied.
+     * </p> 
+	 */
+	public ActivitySimple setQuantity( long theValue) {
+		myQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>details</b> (Extra info on activity occurrence).
@@ -2092,4 +2136,4 @@ public class CarePlan extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -304,8 +284,8 @@ public class Claim extends BaseResource implements IResource {
      * The date when the enclosed suite of services were performed or completed
      * </p> 
 	 */
-	public Claim setServicedate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myServicedate = new DateDt(theDate, thePrecision); 
+	public Claim setServicedateWithDayPrecision( Date theDate) {
+		myServicedate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -317,8 +297,8 @@ public class Claim extends BaseResource implements IResource {
      * The date when the enclosed suite of services were performed or completed
      * </p> 
 	 */
-	public Claim setServicedateWithDayPrecision( Date theDate) {
-		myServicedate = new DateDt(theDate); 
+	public Claim setServicedate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myServicedate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -684,7 +664,7 @@ public class Claim extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Patient extends BaseElement implements IResourceBlock {
+	public static class Patient extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=HumanNameDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -825,8 +805,8 @@ public class Claim extends BaseResource implements IResource {
      * The date of birth of the PolicyHolder
      * </p> 
 	 */
-	public Patient setBirthdate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myBirthdate = new DateDt(theDate, thePrecision); 
+	public Patient setBirthdateWithDayPrecision( Date theDate) {
+		myBirthdate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -838,8 +818,8 @@ public class Claim extends BaseResource implements IResource {
      * The date of birth of the PolicyHolder
      * </p> 
 	 */
-	public Patient setBirthdateWithDayPrecision( Date theDate) {
-		myBirthdate = new DateDt(theDate); 
+	public Patient setBirthdate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myBirthdate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -888,7 +868,7 @@ public class Claim extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Coverage extends BaseElement implements IResourceBlock {
+	public static class Coverage extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="issuer", order=0, min=0, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
@@ -1424,7 +1404,7 @@ public class Claim extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class CoverageSubscriber extends BaseElement implements IResourceBlock {
+	public static class CoverageSubscriber extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=HumanNameDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1558,8 +1538,8 @@ public class Claim extends BaseResource implements IResource {
      * The date of birth of the PolicyHolder
      * </p> 
 	 */
-	public CoverageSubscriber setBirthdate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myBirthdate = new DateDt(theDate, thePrecision); 
+	public CoverageSubscriber setBirthdateWithDayPrecision( Date theDate) {
+		myBirthdate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -1571,8 +1551,8 @@ public class Claim extends BaseResource implements IResource {
      * The date of birth of the PolicyHolder
      * </p> 
 	 */
-	public CoverageSubscriber setBirthdateWithDayPrecision( Date theDate) {
-		myBirthdate = new DateDt(theDate); 
+	public CoverageSubscriber setBirthdate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myBirthdate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1591,7 +1571,7 @@ public class Claim extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Service extends BaseElement implements IResourceBlock {
+	public static class Service extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="service", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1896,7 +1876,7 @@ public class Claim extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ServiceLab extends BaseElement implements IResourceBlock {
+	public static class ServiceLab extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="service", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2031,4 +2011,4 @@ public class Claim extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -535,8 +515,8 @@ public class Composition extends BaseResource implements IResource {
      * The composition editing time, when the composition was last logically changed by the author
      * </p> 
 	 */
-	public Composition setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public Composition setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -548,8 +528,8 @@ public class Composition extends BaseResource implements IResource {
      * The composition editing time, when the composition was last logically changed by the author
      * </p> 
 	 */
-	public Composition setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public Composition setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -746,6 +726,9 @@ public class Composition extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -774,6 +757,9 @@ public class Composition extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getAuthor() {  
+		if (myAuthor == null) {
+			myAuthor = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myAuthor;
 	}
 
@@ -1026,7 +1012,7 @@ public class Composition extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Attester extends BaseElement implements IResourceBlock {
+	public static class Attester extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="mode", type=CodeDt.class, order=0, min=1, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1091,6 +1077,23 @@ public class Composition extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>mode</b> (personal | professional | legal | official) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The type of attestation the authenticator offers
+     * </p> 
+	 */
+	public BoundCodeDt<CompositionAttestationModeEnum> addMode(CompositionAttestationModeEnum theValue) {
+		BoundCodeDt<CompositionAttestationModeEnum> retVal = new BoundCodeDt<CompositionAttestationModeEnum>(CompositionAttestationModeEnum.VALUESET_BINDER, theValue);
+		getMode().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>mode</b> (personal | professional | legal | official)
 	 *
@@ -1099,8 +1102,10 @@ public class Composition extends BaseResource implements IResource {
      * The type of attestation the authenticator offers
      * </p> 
 	 */
-	public void addMode(CompositionAttestationModeEnum theValue) {
-		getMode().add(new BoundCodeDt<CompositionAttestationModeEnum>(CompositionAttestationModeEnum.VALUESET_BINDER, theValue));
+	public BoundCodeDt<CompositionAttestationModeEnum> addMode() {
+		BoundCodeDt<CompositionAttestationModeEnum> retVal = new BoundCodeDt<CompositionAttestationModeEnum>(CompositionAttestationModeEnum.VALUESET_BINDER);
+		getMode().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -1156,8 +1161,8 @@ public class Composition extends BaseResource implements IResource {
      * When composition was attested by the party
      * </p> 
 	 */
-	public Attester setTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myTime = new DateTimeDt(theDate, thePrecision); 
+	public Attester setTimeWithSecondsPrecision( Date theDate) {
+		myTime = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1169,8 +1174,8 @@ public class Composition extends BaseResource implements IResource {
      * When composition was attested by the party
      * </p> 
 	 */
-	public Attester setTimeWithSecondsPrecision( Date theDate) {
-		myTime = new DateTimeDt(theDate); 
+	public Attester setTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myTime = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1186,6 +1191,9 @@ public class Composition extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getParty() {  
+		if (myParty == null) {
+			myParty = new ResourceReferenceDt();
+		}
 		return myParty;
 	}
 
@@ -1216,7 +1224,7 @@ public class Composition extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Event extends BaseElement implements IResourceBlock {
+	public static class Event extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1399,7 +1407,7 @@ public class Composition extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Section extends BaseElement implements IResourceBlock {
+	public static class Section extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="title", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1535,6 +1543,9 @@ public class Composition extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -1649,4 +1660,4 @@ public class Composition extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -55,6 +35,7 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
 import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
@@ -695,7 +676,43 @@ public class ConceptMap extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (Contact information of the publisher)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contacts of the publisher to assist a user in finding and communicating with the publisher
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public ConceptMap addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (Contact information of the publisher)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contacts of the publisher to assist a user in finding and communicating with the publisher
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public ConceptMap addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>description</b> (Human language description of the concept map).
 	 * creating it if it does
@@ -910,8 +927,8 @@ public class ConceptMap extends BaseResource implements IResource {
      * The date that the concept map status was last changed
      * </p> 
 	 */
-	public ConceptMap setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public ConceptMap setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -923,8 +940,8 @@ public class ConceptMap extends BaseResource implements IResource {
      * The date that the concept map status was last changed
      * </p> 
 	 */
-	public ConceptMap setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public ConceptMap setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1060,7 +1077,7 @@ public class ConceptMap extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Concept extends BaseElement implements IResourceBlock {
+	public static class Concept extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="system", type=UriDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1321,7 +1338,7 @@ public class ConceptMap extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ConceptDependsOn extends BaseElement implements IResourceBlock {
+	public static class ConceptDependsOn extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="concept", type=UriDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1500,7 +1517,7 @@ public class ConceptMap extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ConceptMap2 extends BaseElement implements IResourceBlock {
+	public static class ConceptMap2 extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="system", type=UriDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1791,4 +1808,4 @@ public class ConceptMap extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -716,6 +696,9 @@ public class Condition extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getAsserter() {  
+		if (myAsserter == null) {
+			myAsserter = new ResourceReferenceDt();
+		}
 		return myAsserter;
 	}
 
@@ -771,8 +754,8 @@ public class Condition extends BaseResource implements IResource {
      * Estimated or actual date the condition/problem/diagnosis was first detected/suspected
      * </p> 
 	 */
-	public Condition setDateAsserted( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDateAsserted = new DateDt(theDate, thePrecision); 
+	public Condition setDateAssertedWithDayPrecision( Date theDate) {
+		myDateAsserted = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -784,8 +767,8 @@ public class Condition extends BaseResource implements IResource {
      * Estimated or actual date the condition/problem/diagnosis was first detected/suspected
      * </p> 
 	 */
-	public Condition setDateAssertedWithDayPrecision( Date theDate) {
-		myDateAsserted = new DateDt(theDate); 
+	public Condition setDateAsserted( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDateAsserted = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1278,7 +1261,7 @@ public class Condition extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Stage extends BaseElement implements IResourceBlock {
+	public static class Stage extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="summary", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1394,7 +1377,7 @@ public class Condition extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Evidence extends BaseElement implements IResourceBlock {
+	public static class Evidence extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1510,7 +1493,7 @@ public class Condition extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Location extends BaseElement implements IResourceBlock {
+	public static class Location extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1625,7 +1608,7 @@ public class Condition extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RelatedItem extends BaseElement implements IResourceBlock {
+	public static class RelatedItem extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1746,6 +1729,9 @@ public class Condition extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getTarget() {  
+		if (myTarget == null) {
+			myTarget = new ResourceReferenceDt();
+		}
 		return myTarget;
 	}
 
@@ -1769,4 +1755,4 @@ public class Condition extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -58,6 +38,7 @@ import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
 import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
 import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
 import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
@@ -827,7 +808,43 @@ public class Conformance extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (Contacts for Organization)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contacts for Organization relevant to this conformance statement.  The contacts may be a website, email, phone numbers, etc.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Conformance addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (Contacts for Organization)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contacts for Organization relevant to this conformance statement.  The contacts may be a website, email, phone numbers, etc.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Conformance addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>description</b> (Human description of the conformance statement).
 	 * creating it if it does
@@ -998,8 +1015,8 @@ public class Conformance extends BaseResource implements IResource {
      * The date when the conformance statement was published
      * </p> 
 	 */
-	public Conformance setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public Conformance setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1011,8 +1028,8 @@ public class Conformance extends BaseResource implements IResource {
      * The date when the conformance statement was published
      * </p> 
 	 */
-	public Conformance setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public Conformance setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1478,7 +1495,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Software extends BaseElement implements IResourceBlock {
+	public static class Software extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1638,8 +1655,8 @@ public class Conformance extends BaseResource implements IResource {
      * Date this version of the software released
      * </p> 
 	 */
-	public Software setReleaseDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myReleaseDate = new DateTimeDt(theDate, thePrecision); 
+	public Software setReleaseDateWithSecondsPrecision( Date theDate) {
+		myReleaseDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1651,8 +1668,8 @@ public class Conformance extends BaseResource implements IResource {
      * Date this version of the software released
      * </p> 
 	 */
-	public Software setReleaseDateWithSecondsPrecision( Date theDate) {
-		myReleaseDate = new DateTimeDt(theDate); 
+	public Software setReleaseDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myReleaseDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1670,7 +1687,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Implementation extends BaseElement implements IResourceBlock {
+	public static class Implementation extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="description", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1798,7 +1815,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Rest extends BaseElement implements IResourceBlock {
+	public static class Rest extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="mode", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2249,7 +2266,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RestSecurity extends BaseElement implements IResourceBlock {
+	public static class RestSecurity extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="cors", type=BooleanDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -2364,6 +2381,23 @@ public class Conformance extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>service</b> (OAuth | OAuth2 | NTLM | Basic | Kerberos) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Types of security services are supported/required by the system
+     * </p> 
+	 */
+	public BoundCodeableConceptDt<RestfulSecurityServiceEnum> addService(RestfulSecurityServiceEnum theValue) {
+		BoundCodeableConceptDt<RestfulSecurityServiceEnum> retVal = new BoundCodeableConceptDt<RestfulSecurityServiceEnum>(RestfulSecurityServiceEnum.VALUESET_BINDER, theValue);
+		getService().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>service</b> (OAuth | OAuth2 | NTLM | Basic | Kerberos)
 	 *
@@ -2372,8 +2406,10 @@ public class Conformance extends BaseResource implements IResource {
      * Types of security services are supported/required by the system
      * </p> 
 	 */
-	public void addService(RestfulSecurityServiceEnum theValue) {
-		getService().add(new BoundCodeableConceptDt<RestfulSecurityServiceEnum>(RestfulSecurityServiceEnum.VALUESET_BINDER, theValue));
+	public BoundCodeableConceptDt<RestfulSecurityServiceEnum> addService() {
+		BoundCodeableConceptDt<RestfulSecurityServiceEnum> retVal = new BoundCodeableConceptDt<RestfulSecurityServiceEnum>(RestfulSecurityServiceEnum.VALUESET_BINDER);
+		getService().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -2507,7 +2543,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RestSecurityCertificate extends BaseElement implements IResourceBlock {
+	public static class RestSecurityCertificate extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -2636,7 +2672,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RestResource extends BaseElement implements IResourceBlock {
+	public static class RestResource extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -3072,7 +3108,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RestResourceOperation extends BaseElement implements IResourceBlock {
+	public static class RestResourceOperation extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -3200,7 +3236,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RestResourceSearchParam extends BaseElement implements IResourceBlock {
+	public static class RestResourceSearchParam extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -3461,6 +3497,23 @@ public class Conformance extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>target</b> (Types of resource (if a resource reference)) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Types of resource (if a resource is referenced)
+     * </p> 
+	 */
+	public BoundCodeDt<ResourceTypeEnum> addTarget(ResourceTypeEnum theValue) {
+		BoundCodeDt<ResourceTypeEnum> retVal = new BoundCodeDt<ResourceTypeEnum>(ResourceTypeEnum.VALUESET_BINDER, theValue);
+		getTarget().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>target</b> (Types of resource (if a resource reference))
 	 *
@@ -3469,8 +3522,10 @@ public class Conformance extends BaseResource implements IResource {
      * Types of resource (if a resource is referenced)
      * </p> 
 	 */
-	public void addTarget(ResourceTypeEnum theValue) {
-		getTarget().add(new BoundCodeDt<ResourceTypeEnum>(ResourceTypeEnum.VALUESET_BINDER, theValue));
+	public BoundCodeDt<ResourceTypeEnum> addTarget() {
+		BoundCodeDt<ResourceTypeEnum> retVal = new BoundCodeDt<ResourceTypeEnum>(ResourceTypeEnum.VALUESET_BINDER);
+		getTarget().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -3580,7 +3635,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RestOperation extends BaseElement implements IResourceBlock {
+	public static class RestOperation extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -3708,7 +3763,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RestQuery extends BaseElement implements IResourceBlock {
+	public static class RestQuery extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -3955,7 +4010,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Messaging extends BaseElement implements IResourceBlock {
+	public static class Messaging extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="endpoint", type=UriDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -4200,7 +4255,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class MessagingEvent extends BaseElement implements IResourceBlock {
+	public static class MessagingEvent extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodingDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -4614,7 +4669,7 @@ public class Conformance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Document extends BaseElement implements IResourceBlock {
+	public static class Document extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="mode", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -4774,4 +4829,4 @@ public class Conformance extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -815,7 +795,7 @@ public class Coverage extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Subscriber extends BaseElement implements IResourceBlock {
+	public static class Subscriber extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=HumanNameDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -949,8 +929,8 @@ public class Coverage extends BaseResource implements IResource {
      * The date of birth of the PolicyHolder
      * </p> 
 	 */
-	public Subscriber setBirthdate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myBirthdate = new DateDt(theDate, thePrecision); 
+	public Subscriber setBirthdateWithDayPrecision( Date theDate) {
+		myBirthdate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -962,8 +942,8 @@ public class Coverage extends BaseResource implements IResource {
      * The date of birth of the PolicyHolder
      * </p> 
 	 */
-	public Subscriber setBirthdateWithDayPrecision( Date theDate) {
-		myBirthdate = new DateDt(theDate); 
+	public Subscriber setBirthdate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myBirthdate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -974,4 +954,4 @@ public class Coverage extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
@@ -53,6 +33,7 @@ import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
 import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.StringDt;
@@ -674,8 +655,8 @@ public class Device extends BaseResource implements IResource {
      * Date of expiry of this device (if applicable)
      * </p> 
 	 */
-	public Device setExpiry( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myExpiry = new DateDt(theDate, thePrecision); 
+	public Device setExpiryWithDayPrecision( Date theDate) {
+		myExpiry = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -687,8 +668,8 @@ public class Device extends BaseResource implements IResource {
      * Date of expiry of this device (if applicable)
      * </p> 
 	 */
-	public Device setExpiryWithDayPrecision( Date theDate) {
-		myExpiry = new DateDt(theDate); 
+	public Device setExpiry( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myExpiry = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -933,7 +914,43 @@ public class Device extends BaseResource implements IResource {
 		}
 		return getContact().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>contact</b> (Details for human/organization for support)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contact details for an organization or a particular human that is responsible for the device
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Device addContact( ContactUseEnum theContactUse,  String theValue) {
+		if (myContact == null) {
+			myContact = new java.util.ArrayList<ContactDt>();
+		}
+		myContact.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>contact</b> (Details for human/organization for support)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contact details for an organization or a particular human that is responsible for the device
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Device addContact( String theValue) {
+		if (myContact == null) {
+			myContact = new java.util.ArrayList<ContactDt>();
+		}
+		myContact.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>url</b> (Network address to contact device).
 	 * creating it if it does
@@ -980,4 +997,4 @@ public class Device extends BaseResource implements IResource {
  
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -294,8 +274,8 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * The point in time that the values are reported
      * </p> 
 	 */
-	public DeviceObservationReport setInstantWithMillisPrecision( Date theDate) {
-		myInstant = new InstantDt(theDate); 
+	public DeviceObservationReport setInstant( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myInstant = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -307,8 +287,8 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * The point in time that the values are reported
      * </p> 
 	 */
-	public DeviceObservationReport setInstant( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myInstant = new InstantDt(theDate, thePrecision); 
+	public DeviceObservationReport setInstantWithMillisPrecision( Date theDate) {
+		myInstant = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -412,6 +392,9 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -498,7 +481,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class VirtualDevice extends BaseElement implements IResourceBlock {
+	public static class VirtualDevice extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -628,7 +611,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class VirtualDeviceChannel extends BaseElement implements IResourceBlock {
+	public static class VirtualDeviceChannel extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -758,7 +741,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class VirtualDeviceChannelMetric extends BaseElement implements IResourceBlock {
+	public static class VirtualDeviceChannelMetric extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="observation", order=0, min=1, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Observation.class	})
@@ -818,4 +801,4 @@ public class DeviceObservationReport extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -566,6 +546,9 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -1046,7 +1029,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Event extends BaseElement implements IResourceBlock {
+	public static class Event extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="status", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1201,8 +1184,8 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * The date/time at which the event occurred
      * </p> 
 	 */
-	public Event setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDateTime = new DateTimeDt(theDate, thePrecision); 
+	public Event setDateTimeWithSecondsPrecision( Date theDate) {
+		myDateTime = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1214,8 +1197,8 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * The date/time at which the event occurred
      * </p> 
 	 */
-	public Event setDateTimeWithSecondsPrecision( Date theDate) {
-		myDateTime = new DateTimeDt(theDate); 
+	public Event setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDateTime = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1231,6 +1214,9 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getActor() {  
+		if (myActor == null) {
+			myActor = new ResourceReferenceDt();
+		}
 		return myActor;
 	}
 
@@ -1261,7 +1247,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Item extends BaseElement implements IResourceBlock {
+	public static class Item extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1526,4 +1512,4 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -645,8 +625,8 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * The date and/or time that this version of the report was released from the source diagnostic service
      * </p> 
 	 */
-	public DiagnosticReport setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myIssued = new DateTimeDt(theDate, thePrecision); 
+	public DiagnosticReport setIssuedWithSecondsPrecision( Date theDate) {
+		myIssued = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -658,8 +638,8 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * The date and/or time that this version of the report was released from the source diagnostic service
      * </p> 
 	 */
-	public DiagnosticReport setIssuedWithSecondsPrecision( Date theDate) {
-		myIssued = new DateTimeDt(theDate); 
+	public DiagnosticReport setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myIssued = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -675,6 +655,9 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -703,6 +686,9 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getPerformer() {  
+		if (myPerformer == null) {
+			myPerformer = new ResourceReferenceDt();
+		}
 		return myPerformer;
 	}
 
@@ -1245,7 +1231,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Image extends BaseElement implements IResourceBlock {
+	public static class Image extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="comment", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1354,4 +1340,4 @@ public class DiagnosticReport extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
@@ -621,6 +601,9 @@ public class DocumentManifest extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getSubject() {  
+		if (mySubject == null) {
+			mySubject = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return mySubject;
 	}
 
@@ -662,6 +645,9 @@ public class DocumentManifest extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getRecipient() {  
+		if (myRecipient == null) {
+			myRecipient = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myRecipient;
 	}
 
@@ -734,6 +720,9 @@ public class DocumentManifest extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getAuthor() {  
+		if (myAuthor == null) {
+			myAuthor = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myAuthor;
 	}
 
@@ -802,8 +791,8 @@ public class DocumentManifest extends BaseResource implements IResource {
      * When the document manifest was created for submission to the server (not necessarily the same thing as the actual resource last modified time, since it may be modified, replicated etc)
      * </p> 
 	 */
-	public DocumentManifest setCreated( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myCreated = new DateTimeDt(theDate, thePrecision); 
+	public DocumentManifest setCreatedWithSecondsPrecision( Date theDate) {
+		myCreated = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -815,8 +804,8 @@ public class DocumentManifest extends BaseResource implements IResource {
      * When the document manifest was created for submission to the server (not necessarily the same thing as the actual resource last modified time, since it may be modified, replicated etc)
      * </p> 
 	 */
-	public DocumentManifest setCreatedWithSecondsPrecision( Date theDate) {
-		myCreated = new DateTimeDt(theDate); 
+	public DocumentManifest setCreated( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myCreated = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1026,6 +1015,9 @@ public class DocumentManifest extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getContent() {  
+		if (myContent == null) {
+			myContent = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myContent;
 	}
 
@@ -1058,4 +1050,4 @@ public class DocumentManifest extends BaseResource implements IResource {
   
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -937,6 +917,9 @@ public class DocumentReference extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -1027,6 +1010,9 @@ public class DocumentReference extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getAuthor() {  
+		if (myAuthor == null) {
+			myAuthor = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myAuthor;
 	}
 
@@ -1143,6 +1129,9 @@ public class DocumentReference extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getAuthenticator() {  
+		if (myAuthenticator == null) {
+			myAuthenticator = new ResourceReferenceDt();
+		}
 		return myAuthenticator;
 	}
 
@@ -1198,8 +1187,8 @@ public class DocumentReference extends BaseResource implements IResource {
      * When the document was created
      * </p> 
 	 */
-	public DocumentReference setCreated( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myCreated = new DateTimeDt(theDate, thePrecision); 
+	public DocumentReference setCreatedWithSecondsPrecision( Date theDate) {
+		myCreated = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1211,8 +1200,8 @@ public class DocumentReference extends BaseResource implements IResource {
      * When the document was created
      * </p> 
 	 */
-	public DocumentReference setCreatedWithSecondsPrecision( Date theDate) {
-		myCreated = new DateTimeDt(theDate); 
+	public DocumentReference setCreated( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myCreated = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1255,8 +1244,8 @@ public class DocumentReference extends BaseResource implements IResource {
      * When the document reference was created
      * </p> 
 	 */
-	public DocumentReference setIndexedWithMillisPrecision( Date theDate) {
-		myIndexed = new InstantDt(theDate); 
+	public DocumentReference setIndexed( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myIndexed = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1268,8 +1257,8 @@ public class DocumentReference extends BaseResource implements IResource {
      * When the document reference was created
      * </p> 
 	 */
-	public DocumentReference setIndexed( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myIndexed = new InstantDt(theDate, thePrecision); 
+	public DocumentReference setIndexedWithMillisPrecision( Date theDate) {
+		myIndexed = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -1882,7 +1871,7 @@ public class DocumentReference extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RelatesTo extends BaseElement implements IResourceBlock {
+	public static class RelatesTo extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1998,7 +1987,7 @@ public class DocumentReference extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Service extends BaseElement implements IResourceBlock {
+	public static class Service extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2179,7 +2168,7 @@ public class DocumentReference extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ServiceParameter extends BaseElement implements IResourceBlock {
+	public static class ServiceParameter extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2308,7 +2297,7 @@ public class DocumentReference extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Context extends BaseElement implements IResourceBlock {
+	public static class Context extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="event", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -2470,4 +2459,4 @@ public class DocumentReference extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -19,7 +19,7 @@ package ca.uhn.fhir.model.dstu.resource;
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -451,11 +451,11 @@ public class Encounter extends BaseResource implements IResource {
      *
      * @return Returns a reference to this object, to allow for simple chaining.
 	 */
-	public Encounter addIdentifier( String theSystem,  String theValue) {
+	public Encounter addIdentifier( IdentifierUseEnum theUse,  String theSystem,  String theValue,  String theLabel) {
 		if (myIdentifier == null) {
 			myIdentifier = new java.util.ArrayList<IdentifierDt>();
 		}
-		myIdentifier.add(new IdentifierDt(theSystem, theValue));
+		myIdentifier.add(new IdentifierDt(theUse, theSystem, theValue, theLabel));
 		return this; 
 	}
 
@@ -469,11 +469,11 @@ public class Encounter extends BaseResource implements IResource {
      *
      * @return Returns a reference to this object, to allow for simple chaining.
 	 */
-	public Encounter addIdentifier( IdentifierUseEnum theUse,  String theSystem,  String theValue,  String theLabel) {
+	public Encounter addIdentifier( String theSystem,  String theValue) {
 		if (myIdentifier == null) {
 			myIdentifier = new java.util.ArrayList<IdentifierDt>();
 		}
-		myIdentifier.add(new IdentifierDt(theUse, theSystem, theValue, theLabel));
+		myIdentifier.add(new IdentifierDt(theSystem, theValue));
 		return this; 
 	}
 
@@ -614,7 +614,10 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
 	/**
-	 * Add a value for <b>type</b> (Specific type of encounter)
+	 * Add a value for <b>type</b> (Specific type of encounter) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
 	 *
      * <p>
      * <b>Definition:</b>
@@ -1077,7 +1080,7 @@ public class Encounter extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Participant extends BaseElement implements IResourceBlock {
+	public static class Participant extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1136,7 +1139,10 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
 	/**
-	 * Add a value for <b>type</b> (Role of participant in encounter)
+	 * Add a value for <b>type</b> (Role of participant in encounter) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
 	 *
      * <p>
      * <b>Definition:</b>
@@ -1222,7 +1228,7 @@ public class Encounter extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Hospitalization extends BaseElement implements IResourceBlock {
+	public static class Hospitalization extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="preAdmissionIdentifier", type=IdentifierDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1360,8 +1366,8 @@ public class Encounter extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Hospitalization setPreAdmissionIdentifier( String theSystem,  String theValue) {
-		myPreAdmissionIdentifier = new IdentifierDt(theSystem, theValue); 
+	public Hospitalization setPreAdmissionIdentifier( IdentifierUseEnum theUse,  String theSystem,  String theValue,  String theLabel) {
+		myPreAdmissionIdentifier = new IdentifierDt(theUse, theSystem, theValue, theLabel); 
 		return this; 
 	}
 
@@ -1373,8 +1379,8 @@ public class Encounter extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Hospitalization setPreAdmissionIdentifier( IdentifierUseEnum theUse,  String theSystem,  String theValue,  String theLabel) {
-		myPreAdmissionIdentifier = new IdentifierDt(theUse, theSystem, theValue, theLabel); 
+	public Hospitalization setPreAdmissionIdentifier( String theSystem,  String theValue) {
+		myPreAdmissionIdentifier = new IdentifierDt(theSystem, theValue); 
 		return this; 
 	}
 
@@ -1845,7 +1851,7 @@ public class Encounter extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class HospitalizationAccomodation extends BaseElement implements IResourceBlock {
+	public static class HospitalizationAccomodation extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="bed", order=0, min=0, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Location.class	})
@@ -1949,7 +1955,7 @@ public class Encounter extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Location extends BaseElement implements IResourceBlock {
+	public static class Location extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="location", order=0, min=1, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Location.class	})

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -395,7 +375,7 @@ public class FamilyHistory extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Relation extends BaseElement implements IResourceBlock {
+	public static class Relation extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -699,7 +679,7 @@ public class FamilyHistory extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RelationCondition extends BaseElement implements IResourceBlock {
+	public static class RelationCondition extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -882,4 +862,4 @@ public class FamilyHistory extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -519,8 +499,8 @@ public class GVFMeta extends BaseResource implements IResource {
      * Date when the file is updated
      * </p> 
 	 */
-	public GVFMeta setFileDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myFileDate = new DateDt(theDate, thePrecision); 
+	public GVFMeta setFileDateWithDayPrecision( Date theDate) {
+		myFileDate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -532,8 +512,8 @@ public class GVFMeta extends BaseResource implements IResource {
      * Date when the file is updated
      * </p> 
 	 */
-	public GVFMeta setFileDateWithDayPrecision( Date theDate) {
-		myFileDate = new DateDt(theDate); 
+	public GVFMeta setFileDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myFileDate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1008,7 +988,7 @@ public class GVFMeta extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Subject extends BaseElement implements IResourceBlock {
+	public static class Subject extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="patient", order=0, min=0, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Patient.class	})
@@ -1124,7 +1104,7 @@ public class GVFMeta extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Platform extends BaseElement implements IResourceBlock {
+	public static class Platform extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="class", type=CodeDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1551,4 +1531,4 @@ public class GVFMeta extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -1698,7 +1678,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Subject extends BaseElement implements IResourceBlock {
+	public static class Subject extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="patient", order=0, min=1, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Patient.class	})
@@ -1814,7 +1794,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Dbxref extends BaseElement implements IResourceBlock {
+	public static class Dbxref extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="database", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1942,7 +1922,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class VariantEffect extends BaseElement implements IResourceBlock {
+	public static class VariantEffect extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="sequenceVariant", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2206,7 +2186,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class StartRange extends BaseElement implements IResourceBlock {
+	public static class StartRange extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="start", type=IntegerDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2334,7 +2314,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class EndRange extends BaseElement implements IResourceBlock {
+	public static class EndRange extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="start", type=IntegerDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2462,7 +2442,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class BreakpointDetail extends BaseElement implements IResourceBlock {
+	public static class BreakpointDetail extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="seqid", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2692,7 +2672,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class SequenceContext extends BaseElement implements IResourceBlock {
+	public static class SequenceContext extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="fivePrime", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2820,7 +2800,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Sample extends BaseElement implements IResourceBlock {
+	public static class Sample extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="phased", type=StringDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -3196,4 +3176,4 @@ public class GVFVariant extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -367,7 +347,7 @@ public class GeneExpression extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Gene extends BaseElement implements IResourceBlock {
+	public static class Gene extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -481,7 +461,7 @@ public class GeneExpression extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class GeneCoordinate extends BaseElement implements IResourceBlock {
+	public static class GeneCoordinate extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="chromosome", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -661,7 +641,7 @@ public class GeneExpression extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RnaSeq extends BaseElement implements IResourceBlock {
+	public static class RnaSeq extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="inputLab", order=0, min=0, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.SequencingLab.class	})
@@ -908,7 +888,7 @@ public class GeneExpression extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RnaSeqIsoform extends BaseElement implements IResourceBlock {
+	public static class RnaSeqIsoform extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identity", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1056,4 +1036,4 @@ public class GeneExpression extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -315,8 +295,8 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * Date when result of the analysis is updated
      * </p> 
 	 */
-	public GeneticAnalysis setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateDt(theDate, thePrecision); 
+	public GeneticAnalysis setDateWithDayPrecision( Date theDate) {
+		myDate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -328,8 +308,8 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * Date when result of the analysis is updated
      * </p> 
 	 */
-	public GeneticAnalysis setDateWithDayPrecision( Date theDate) {
-		myDate = new DateDt(theDate); 
+	public GeneticAnalysis setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -436,7 +416,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class GeneticAnalysisSummary extends BaseElement implements IResourceBlock {
+	public static class GeneticAnalysisSummary extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="geneticDiseaseAssessed", type=CodingDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -792,7 +772,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class DnaRegionAnalysisTestCoverage extends BaseElement implements IResourceBlock {
+	public static class DnaRegionAnalysisTestCoverage extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="dnaRegionOfInterest", order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -884,7 +864,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class DnaRegionAnalysisTestCoverageDnaRegionOfInterest extends BaseElement implements IResourceBlock {
+	public static class DnaRegionAnalysisTestCoverageDnaRegionOfInterest extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="genomicReferenceSequenceIdentifier", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1319,7 +1299,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class GeneticAnalysisDiscreteResult extends BaseElement implements IResourceBlock {
+	public static class GeneticAnalysisDiscreteResult extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="dnaAnalysisDiscreteSequenceVariation", type=StringDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1423,4 +1403,4 @@ public class GeneticAnalysis extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -690,6 +670,9 @@ public class Group extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getMember() {  
+		if (myMember == null) {
+			myMember = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myMember;
 	}
 
@@ -729,7 +712,7 @@ public class Group extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Characteristic extends BaseElement implements IResourceBlock {
+	public static class Characteristic extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -873,4 +856,4 @@ public class Group extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -484,8 +464,8 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Date and Time the study took place
      * </p> 
 	 */
-	public ImagingStudy setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDateTime = new DateTimeDt(theDate, thePrecision); 
+	public ImagingStudy setDateTimeWithSecondsPrecision( Date theDate) {
+		myDateTime = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -497,8 +477,8 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Date and Time the study took place
      * </p> 
 	 */
-	public ImagingStudy setDateTimeWithSecondsPrecision( Date theDate) {
-		myDateTime = new DateTimeDt(theDate); 
+	public ImagingStudy setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDateTime = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -792,6 +772,23 @@ public class ImagingStudy extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>modality</b> (All series.modality if actual acquisition modalities) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A list of all the Series.ImageModality values that are actual acquisition modalities, i.e. those in the DICOM Context Group 29 (value set OID 1.2.840.10008.6.1.19)
+     * </p> 
+	 */
+	public BoundCodeDt<ImagingModalityEnum> addModality(ImagingModalityEnum theValue) {
+		BoundCodeDt<ImagingModalityEnum> retVal = new BoundCodeDt<ImagingModalityEnum>(ImagingModalityEnum.VALUESET_BINDER, theValue);
+		getModality().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>modality</b> (All series.modality if actual acquisition modalities)
 	 *
@@ -800,8 +797,10 @@ public class ImagingStudy extends BaseResource implements IResource {
      * A list of all the Series.ImageModality values that are actual acquisition modalities, i.e. those in the DICOM Context Group 29 (value set OID 1.2.840.10008.6.1.19)
      * </p> 
 	 */
-	public void addModality(ImagingModalityEnum theValue) {
-		getModality().add(new BoundCodeDt<ImagingModalityEnum>(ImagingModalityEnum.VALUESET_BINDER, theValue));
+	public BoundCodeDt<ImagingModalityEnum> addModality() {
+		BoundCodeDt<ImagingModalityEnum> retVal = new BoundCodeDt<ImagingModalityEnum>(ImagingModalityEnum.VALUESET_BINDER);
+		getModality().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -1274,7 +1273,7 @@ public class ImagingStudy extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Series extends BaseElement implements IResourceBlock {
+	public static class Series extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="number", type=IntegerDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1721,8 +1720,8 @@ public class ImagingStudy extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Series setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDateTime = new DateTimeDt(theDate, thePrecision); 
+	public Series setDateTimeWithSecondsPrecision( Date theDate) {
+		myDateTime = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1734,8 +1733,8 @@ public class ImagingStudy extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Series setDateTimeWithSecondsPrecision( Date theDate) {
-		myDateTime = new DateTimeDt(theDate); 
+	public Series setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDateTime = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1812,7 +1811,7 @@ public class ImagingStudy extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class SeriesInstance extends BaseElement implements IResourceBlock {
+	public static class SeriesInstance extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="number", type=IntegerDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -2151,4 +2150,4 @@ public class ImagingStudy extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -724,8 +704,8 @@ public class Immunization extends BaseResource implements IResource {
      * Date vaccine administered or was to be administered
      * </p> 
 	 */
-	public Immunization setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public Immunization setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -737,8 +717,8 @@ public class Immunization extends BaseResource implements IResource {
      * Date vaccine administered or was to be administered
      * </p> 
 	 */
-	public Immunization setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public Immunization setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1099,8 +1079,8 @@ public class Immunization extends BaseResource implements IResource {
      * Date vaccine batch expires
      * </p> 
 	 */
-	public Immunization setExpirationDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myExpirationDate = new DateDt(theDate, thePrecision); 
+	public Immunization setExpirationDateWithDayPrecision( Date theDate) {
+		myExpirationDate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -1112,8 +1092,8 @@ public class Immunization extends BaseResource implements IResource {
      * Date vaccine batch expires
      * </p> 
 	 */
-	public Immunization setExpirationDateWithDayPrecision( Date theDate) {
-		myExpirationDate = new DateDt(theDate); 
+	public Immunization setExpirationDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myExpirationDate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1231,8 +1211,21 @@ public class Immunization extends BaseResource implements IResource {
      * The quantity of vaccine product that was administered
      * </p> 
 	 */
-	public Immunization setDoseQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myDoseQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Immunization setDoseQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>doseQuantity</b> (Amount of vaccine administered)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The quantity of vaccine product that was administered
+     * </p> 
+	 */
+	public Immunization setDoseQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1257,8 +1250,8 @@ public class Immunization extends BaseResource implements IResource {
      * The quantity of vaccine product that was administered
      * </p> 
 	 */
-	public Immunization setDoseQuantity( long theValue) {
-		myDoseQuantity = new QuantityDt(theValue); 
+	public Immunization setDoseQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myDoseQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1275,6 +1268,19 @@ public class Immunization extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>doseQuantity</b> (Amount of vaccine administered)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The quantity of vaccine product that was administered
+     * </p> 
+	 */
+	public Immunization setDoseQuantity( long theValue) {
+		myDoseQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>explanation</b> (Administration / refusal reasons).
@@ -1436,7 +1442,7 @@ public class Immunization extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Explanation extends BaseElement implements IResourceBlock {
+	public static class Explanation extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="reason", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1493,6 +1499,23 @@ public class Immunization extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>reason</b> (Why immunization occurred) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Reasons why a vaccine was administered
+     * </p> 
+	 */
+	public BoundCodeableConceptDt<ImmunizationReasonCodesEnum> addReason(ImmunizationReasonCodesEnum theValue) {
+		BoundCodeableConceptDt<ImmunizationReasonCodesEnum> retVal = new BoundCodeableConceptDt<ImmunizationReasonCodesEnum>(ImmunizationReasonCodesEnum.VALUESET_BINDER, theValue);
+		getReason().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>reason</b> (Why immunization occurred)
 	 *
@@ -1501,8 +1524,10 @@ public class Immunization extends BaseResource implements IResource {
      * Reasons why a vaccine was administered
      * </p> 
 	 */
-	public void addReason(ImmunizationReasonCodesEnum theValue) {
-		getReason().add(new BoundCodeableConceptDt<ImmunizationReasonCodesEnum>(ImmunizationReasonCodesEnum.VALUESET_BINDER, theValue));
+	public BoundCodeableConceptDt<ImmunizationReasonCodesEnum> addReason() {
+		BoundCodeableConceptDt<ImmunizationReasonCodesEnum> retVal = new BoundCodeableConceptDt<ImmunizationReasonCodesEnum>(ImmunizationReasonCodesEnum.VALUESET_BINDER);
+		getReason().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -1593,7 +1618,7 @@ public class Immunization extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Reaction extends BaseElement implements IResourceBlock {
+	public static class Reaction extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="date", type=DateTimeDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1666,8 +1691,8 @@ public class Immunization extends BaseResource implements IResource {
      * Date of reaction to the immunization
      * </p> 
 	 */
-	public Reaction setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public Reaction setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1679,8 +1704,8 @@ public class Immunization extends BaseResource implements IResource {
      * Date of reaction to the immunization
      * </p> 
 	 */
-	public Reaction setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public Reaction setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1696,6 +1721,9 @@ public class Immunization extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getDetail() {  
+		if (myDetail == null) {
+			myDetail = new ResourceReferenceDt();
+		}
 		return myDetail;
 	}
 
@@ -1770,7 +1798,7 @@ public class Immunization extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class VaccinationProtocol extends BaseElement implements IResourceBlock {
+	public static class VaccinationProtocol extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="doseSequence", type=IntegerDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2146,4 +2174,4 @@ public class Immunization extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -528,7 +508,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * </p> 
 	 */
 	@Block()	
-	public static class Recommendation extends BaseElement implements IResourceBlock {
+	public static class Recommendation extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="date", type=DateTimeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -637,8 +617,8 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * The date the immunization recommendation was created.
      * </p> 
 	 */
-	public Recommendation setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public Recommendation setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -650,8 +630,8 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * The date the immunization recommendation was created.
      * </p> 
 	 */
-	public Recommendation setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public Recommendation setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -921,6 +901,9 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getSupportingPatientInformation() {  
+		if (mySupportingPatientInformation == null) {
+			mySupportingPatientInformation = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return mySupportingPatientInformation;
 	}
 
@@ -963,7 +946,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * </p> 
 	 */
 	@Block()	
-	public static class RecommendationDateCriterion extends BaseElement implements IResourceBlock {
+	public static class RecommendationDateCriterion extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1072,8 +1055,8 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * Date recommendation
      * </p> 
 	 */
-	public RecommendationDateCriterion setValue( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myValue = new DateTimeDt(theDate, thePrecision); 
+	public RecommendationDateCriterion setValueWithSecondsPrecision( Date theDate) {
+		myValue = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1085,8 +1068,8 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * Date recommendation
      * </p> 
 	 */
-	public RecommendationDateCriterion setValueWithSecondsPrecision( Date theDate) {
-		myValue = new DateTimeDt(theDate); 
+	public RecommendationDateCriterion setValue( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myValue = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1104,7 +1087,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * </p> 
 	 */
 	@Block()	
-	public static class RecommendationProtocol extends BaseElement implements IResourceBlock {
+	public static class RecommendationProtocol extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="doseSequence", type=IntegerDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1316,4 +1299,4 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -67,7 +47,7 @@ import ca.uhn.fhir.rest.gclient.TokenParam;
 
 
 /**
- * HAPI/FHIR <b>ListResource</b> Resource
+ * HAPI/FHIR <b>List</b> Resource
  * (Information summarized from a list of other resources)
  *
  * <p>
@@ -86,7 +66,7 @@ import ca.uhn.fhir.rest.gclient.TokenParam;
  * </p>
  *
  */
-@ResourceDef(name="ListResource", profile="http://hl7.org/fhir/profiles/List", id="list")
+@ResourceDef(name="List", profile="http://hl7.org/fhir/profiles/List", id="list")
 public class ListResource extends BaseResource implements IResource {
 
 	/**
@@ -448,6 +428,9 @@ public class ListResource extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -476,6 +459,9 @@ public class ListResource extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSource() {  
+		if (mySource == null) {
+			mySource = new ResourceReferenceDt();
+		}
 		return mySource;
 	}
 
@@ -531,8 +517,8 @@ public class ListResource extends BaseResource implements IResource {
      * The date that the list was prepared
      * </p> 
 	 */
-	public ListResource setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public ListResource setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -544,8 +530,8 @@ public class ListResource extends BaseResource implements IResource {
      * The date that the list was prepared
      * </p> 
 	 */
-	public ListResource setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public ListResource setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -738,7 +724,7 @@ public class ListResource extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Entry extends BaseElement implements IResourceBlock {
+	public static class Entry extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="flag", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -922,8 +908,8 @@ public class ListResource extends BaseResource implements IResource {
      * When this item was added to the list
      * </p> 
 	 */
-	public Entry setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public Entry setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -935,8 +921,8 @@ public class ListResource extends BaseResource implements IResource {
      * When this item was added to the list
      * </p> 
 	 */
-	public Entry setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public Entry setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -978,4 +964,4 @@ public class ListResource extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -55,6 +35,7 @@ import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
 import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
@@ -612,7 +593,43 @@ public class Location extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (Contact details of the location)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The contact details of communication devices available at the location. This can include phone numbers, fax numbers, mobile numbers, email addresses and web sites
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Location addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (Contact details of the location)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The contact details of communication devices available at the location. This can include phone numbers, fax numbers, mobile numbers, email addresses and web sites
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Location addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>address</b> (Physical location).
 	 * creating it if it does
@@ -865,7 +882,7 @@ public class Location extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Position extends BaseElement implements IResourceBlock {
+	public static class Position extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="longitude", type=DecimalDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1115,4 +1132,4 @@ public class Location extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
@@ -561,8 +541,8 @@ public class Media extends BaseResource implements IResource {
      * When the media was originally recorded. For video and audio, if the length of the recording is not insignificant, this is the end of the recording
      * </p> 
 	 */
-	public Media setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDateTime = new DateTimeDt(theDate, thePrecision); 
+	public Media setDateTimeWithSecondsPrecision( Date theDate) {
+		myDateTime = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -574,8 +554,8 @@ public class Media extends BaseResource implements IResource {
      * When the media was originally recorded. For video and audio, if the length of the recording is not insignificant, this is the end of the recording
      * </p> 
 	 */
-	public Media setDateTimeWithSecondsPrecision( Date theDate) {
-		myDateTime = new DateTimeDt(theDate); 
+	public Media setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDateTime = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -591,6 +571,9 @@ public class Media extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -923,4 +906,4 @@ public class Media extends BaseResource implements IResource {
   
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -591,7 +571,7 @@ public class Medication extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Product extends BaseElement implements IResourceBlock {
+	public static class Product extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="form", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -721,7 +701,7 @@ public class Medication extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ProductIngredient extends BaseElement implements IResourceBlock {
+	public static class ProductIngredient extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="item", order=0, min=1, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Substance.class, 		ca.uhn.fhir.model.dstu.resource.Medication.class	})
@@ -760,6 +740,9 @@ public class Medication extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getItem() {  
+		if (myItem == null) {
+			myItem = new ResourceReferenceDt();
+		}
 		return myItem;
 	}
 
@@ -815,4 +798,4 @@ public class Medication extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -956,7 +936,7 @@ public class MedicationAdministration extends BaseResource implements IResource
      * </p> 
 	 */
 	@Block()	
-	public static class Dosage extends BaseElement implements IResourceBlock {
+	public static class Dosage extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="timing", order=0, min=0, max=1, type={
 		DateTimeDt.class, 		PeriodDt.class	})
@@ -1214,8 +1194,21 @@ public class MedicationAdministration extends BaseResource implements IResource
      * The amount of the medication given at one administration event.   Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
      * </p> 
 	 */
-	public Dosage setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Dosage setQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>quantity</b> (Amount administered in one dose)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of the medication given at one administration event.   Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
+     * </p> 
+	 */
+	public Dosage setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1240,8 +1233,8 @@ public class MedicationAdministration extends BaseResource implements IResource
      * The amount of the medication given at one administration event.   Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
      * </p> 
 	 */
-	public Dosage setQuantity( long theValue) {
-		myQuantity = new QuantityDt(theValue); 
+	public Dosage setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1258,6 +1251,19 @@ public class MedicationAdministration extends BaseResource implements IResource
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>quantity</b> (Amount administered in one dose)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of the medication given at one administration event.   Use this value when the administration is essentially an instantaneous event such as a swallowing a tablet or giving an injection.
+     * </p> 
+	 */
+	public Dosage setQuantity( long theValue) {
+		myQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>rate</b> (Dose quantity per unit of time).
@@ -1327,4 +1333,4 @@ public class MedicationAdministration extends BaseResource implements IResource
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -733,7 +713,7 @@ public class MedicationDispense extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Dispense extends BaseElement implements IResourceBlock {
+	public static class Dispense extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -989,8 +969,21 @@ public class MedicationDispense extends BaseResource implements IResource {
      * The amount of medication that has been dispensed. Includes unit of measure.
      * </p> 
 	 */
-	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>quantity</b> (Amount dispensed)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of medication that has been dispensed. Includes unit of measure.
+     * </p> 
+	 */
+	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1015,8 +1008,8 @@ public class MedicationDispense extends BaseResource implements IResource {
      * The amount of medication that has been dispensed. Includes unit of measure.
      * </p> 
 	 */
-	public Dispense setQuantity( long theValue) {
-		myQuantity = new QuantityDt(theValue); 
+	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1033,6 +1026,19 @@ public class MedicationDispense extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>quantity</b> (Amount dispensed)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of medication that has been dispensed. Includes unit of measure.
+     * </p> 
+	 */
+	public Dispense setQuantity( long theValue) {
+		myQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>medication</b> (What medication was supplied).
@@ -1103,8 +1109,8 @@ public class MedicationDispense extends BaseResource implements IResource {
      * The time when the dispensed product was packaged and reviewed.
      * </p> 
 	 */
-	public Dispense setWhenPrepared( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myWhenPrepared = new DateTimeDt(theDate, thePrecision); 
+	public Dispense setWhenPreparedWithSecondsPrecision( Date theDate) {
+		myWhenPrepared = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1116,8 +1122,8 @@ public class MedicationDispense extends BaseResource implements IResource {
      * The time when the dispensed product was packaged and reviewed.
      * </p> 
 	 */
-	public Dispense setWhenPreparedWithSecondsPrecision( Date theDate) {
-		myWhenPrepared = new DateTimeDt(theDate); 
+	public Dispense setWhenPrepared( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myWhenPrepared = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1160,8 +1166,8 @@ public class MedicationDispense extends BaseResource implements IResource {
      * The time the dispensed product was provided to the patient or their representative.
      * </p> 
 	 */
-	public Dispense setWhenHandedOver( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myWhenHandedOver = new DateTimeDt(theDate, thePrecision); 
+	public Dispense setWhenHandedOverWithSecondsPrecision( Date theDate) {
+		myWhenHandedOver = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -1173,8 +1179,8 @@ public class MedicationDispense extends BaseResource implements IResource {
      * The time the dispensed product was provided to the patient or their representative.
      * </p> 
 	 */
-	public Dispense setWhenHandedOverWithSecondsPrecision( Date theDate) {
-		myWhenHandedOver = new DateTimeDt(theDate); 
+	public Dispense setWhenHandedOver( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myWhenHandedOver = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1221,6 +1227,9 @@ public class MedicationDispense extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getReceiver() {  
+		if (myReceiver == null) {
+			myReceiver = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myReceiver;
 	}
 
@@ -1323,7 +1332,7 @@ public class MedicationDispense extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class DispenseDosage extends BaseElement implements IResourceBlock {
+	public static class DispenseDosage extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="additionalInstructions", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1619,8 +1628,21 @@ public class MedicationDispense extends BaseResource implements IResource {
      * The amount of therapeutic or other substance given at one administration event.
      * </p> 
 	 */
-	public DispenseDosage setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public DispenseDosage setQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>quantity</b> (Amount of medication per dose)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of therapeutic or other substance given at one administration event.
+     * </p> 
+	 */
+	public DispenseDosage setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1645,8 +1667,8 @@ public class MedicationDispense extends BaseResource implements IResource {
      * The amount of therapeutic or other substance given at one administration event.
      * </p> 
 	 */
-	public DispenseDosage setQuantity( long theValue) {
-		myQuantity = new QuantityDt(theValue); 
+	public DispenseDosage setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1663,6 +1685,19 @@ public class MedicationDispense extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>quantity</b> (Amount of medication per dose)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of therapeutic or other substance given at one administration event.
+     * </p> 
+	 */
+	public DispenseDosage setQuantity( long theValue) {
+		myQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>rate</b> (Amount of medication per unit of time).
@@ -1740,7 +1775,7 @@ public class MedicationDispense extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Substitution extends BaseElement implements IResourceBlock {
+	public static class Substitution extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1916,4 +1951,4 @@ public class MedicationDispense extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -470,8 +450,8 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * The date (and perhaps time) when the prescription was written
      * </p> 
 	 */
-	public MedicationPrescription setDateWritten( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDateWritten = new DateTimeDt(theDate, thePrecision); 
+	public MedicationPrescription setDateWrittenWithSecondsPrecision( Date theDate) {
+		myDateWritten = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -483,8 +463,8 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * The date (and perhaps time) when the prescription was written
      * </p> 
 	 */
-	public MedicationPrescription setDateWrittenWithSecondsPrecision( Date theDate) {
-		myDateWritten = new DateTimeDt(theDate); 
+	public MedicationPrescription setDateWritten( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDateWritten = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -816,7 +796,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class DosageInstruction extends BaseElement implements IResourceBlock {
+	public static class DosageInstruction extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="text", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1163,8 +1143,21 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * The amount of therapeutic or other substance given at one administration event.
      * </p> 
 	 */
-	public DosageInstruction setDoseQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myDoseQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public DosageInstruction setDoseQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>doseQuantity</b> (Amount of medication per dose)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of therapeutic or other substance given at one administration event.
+     * </p> 
+	 */
+	public DosageInstruction setDoseQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myDoseQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1189,8 +1182,8 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * The amount of therapeutic or other substance given at one administration event.
      * </p> 
 	 */
-	public DosageInstruction setDoseQuantity( long theValue) {
-		myDoseQuantity = new QuantityDt(theValue); 
+	public DosageInstruction setDoseQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myDoseQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1207,6 +1200,19 @@ public class MedicationPrescription extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>doseQuantity</b> (Amount of medication per dose)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of therapeutic or other substance given at one administration event.
+     * </p> 
+	 */
+	public DosageInstruction setDoseQuantity( long theValue) {
+		myDoseQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>rate</b> (Amount of medication per unit of time).
@@ -1283,7 +1289,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Dispense extends BaseElement implements IResourceBlock {
+	public static class Dispense extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="medication", order=0, min=0, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Medication.class	})
@@ -1476,8 +1482,21 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * The amount that is to be dispensed.
      * </p> 
 	 */
-	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>quantity</b> (Amount of medication to supply per dispense)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount that is to be dispensed.
+     * </p> 
+	 */
+	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1502,8 +1521,8 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * The amount that is to be dispensed.
      * </p> 
 	 */
-	public Dispense setQuantity( long theValue) {
-		myQuantity = new QuantityDt(theValue); 
+	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1520,6 +1539,19 @@ public class MedicationPrescription extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>quantity</b> (Amount of medication to supply per dispense)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount that is to be dispensed.
+     * </p> 
+	 */
+	public Dispense setQuantity( long theValue) {
+		myQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>expectedSupplyDuration</b> (Days supply per dispense).
@@ -1565,7 +1597,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Substitution extends BaseElement implements IResourceBlock {
+	public static class Substitution extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1660,4 +1692,4 @@ public class MedicationPrescription extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -689,7 +669,7 @@ public class MedicationStatement extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Dosage extends BaseElement implements IResourceBlock {
+	public static class Dosage extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="timing", type=ScheduleDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -949,8 +929,21 @@ public class MedicationStatement extends BaseResource implements IResource {
      * The amount of therapeutic or other substance given at one administration event.
      * </p> 
 	 */
-	public Dosage setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Dosage setQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>quantity</b> (Amount administered in one dose)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of therapeutic or other substance given at one administration event.
+     * </p> 
+	 */
+	public Dosage setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -975,8 +968,8 @@ public class MedicationStatement extends BaseResource implements IResource {
      * The amount of therapeutic or other substance given at one administration event.
      * </p> 
 	 */
-	public Dosage setQuantity( long theValue) {
-		myQuantity = new QuantityDt(theValue); 
+	public Dosage setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -993,6 +986,19 @@ public class MedicationStatement extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>quantity</b> (Amount administered in one dose)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of therapeutic or other substance given at one administration event.
+     * </p> 
+	 */
+	public Dosage setQuantity( long theValue) {
+		myQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>rate</b> (Dose quantity per unit of time).
@@ -1062,4 +1068,4 @@ public class MedicationStatement extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -54,6 +34,7 @@ import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
@@ -269,8 +250,8 @@ public class MessageHeader extends BaseResource implements IResource {
      * The time that the message was sent
      * </p> 
 	 */
-	public MessageHeader setTimestampWithMillisPrecision( Date theDate) {
-		myTimestamp = new InstantDt(theDate); 
+	public MessageHeader setTimestamp( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myTimestamp = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -282,8 +263,8 @@ public class MessageHeader extends BaseResource implements IResource {
      * The time that the message was sent
      * </p> 
 	 */
-	public MessageHeader setTimestamp( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myTimestamp = new InstantDt(theDate, thePrecision); 
+	public MessageHeader setTimestampWithMillisPrecision( Date theDate) {
+		myTimestamp = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -514,6 +495,9 @@ public class MessageHeader extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getReceiver() {  
+		if (myReceiver == null) {
+			myReceiver = new ResourceReferenceDt();
+		}
 		return myReceiver;
 	}
 
@@ -542,6 +526,9 @@ public class MessageHeader extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getResponsible() {  
+		if (myResponsible == null) {
+			myResponsible = new ResourceReferenceDt();
+		}
 		return myResponsible;
 	}
 
@@ -643,7 +630,7 @@ public class MessageHeader extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Response extends BaseElement implements IResourceBlock {
+	public static class Response extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -810,7 +797,7 @@ public class MessageHeader extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Source extends BaseElement implements IResourceBlock {
+	public static class Source extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1020,7 +1007,33 @@ public class MessageHeader extends BaseResource implements IResource {
 		return this;
 	}
 
-  
+ 	/**
+	 * Sets the value for <b>contact</b> (Human contact for problems)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * An e-mail, phone, website or other contact point to use to resolve issues with message communications.
+     * </p> 
+	 */
+	public Source setContact( ContactUseEnum theContactUse,  String theValue) {
+		myContact = new ContactDt(theContactUse, theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>contact</b> (Human contact for problems)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * An e-mail, phone, website or other contact point to use to resolve issues with message communications.
+     * </p> 
+	 */
+	public Source setContact( String theValue) {
+		myContact = new ContactDt(theValue); 
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>endpoint</b> (Actual message source address or id).
 	 * creating it if it does
@@ -1078,7 +1091,7 @@ public class MessageHeader extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Destination extends BaseElement implements IResourceBlock {
+	public static class Destination extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1238,4 +1251,4 @@ public class MessageHeader extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -332,8 +312,8 @@ public class Microarray extends BaseResource implements IResource {
      * Date when result of the microarray is updated
      * </p> 
 	 */
-	public Microarray setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateDt(theDate, thePrecision); 
+	public Microarray setDateWithDayPrecision( Date theDate) {
+		myDate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -345,8 +325,8 @@ public class Microarray extends BaseResource implements IResource {
      * Date when result of the microarray is updated
      * </p> 
 	 */
-	public Microarray setDateWithDayPrecision( Date theDate) {
-		myDate = new DateDt(theDate); 
+	public Microarray setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -451,7 +431,7 @@ public class Microarray extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Subject extends BaseElement implements IResourceBlock {
+	public static class Subject extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="patient", order=0, min=0, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Patient.class	})
@@ -601,7 +581,7 @@ public class Microarray extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Scanner extends BaseElement implements IResourceBlock {
+	public static class Scanner extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="manufacturer", order=0, min=0, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
@@ -768,7 +748,7 @@ public class Microarray extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Sample extends BaseElement implements IResourceBlock {
+	public static class Sample extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identity", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1086,7 +1066,7 @@ public class Microarray extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class SampleSpecimen extends BaseElement implements IResourceBlock {
+	public static class SampleSpecimen extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1201,7 +1181,7 @@ public class Microarray extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class SampleGene extends BaseElement implements IResourceBlock {
+	public static class SampleGene extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identity", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1315,7 +1295,7 @@ public class Microarray extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class SampleGeneCoordinate extends BaseElement implements IResourceBlock {
+	public static class SampleGeneCoordinate extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="chromosome", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1489,4 +1469,4 @@ public class Microarray extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -786,8 +766,8 @@ public class Observation extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Observation setIssuedWithMillisPrecision( Date theDate) {
-		myIssued = new InstantDt(theDate); 
+	public Observation setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myIssued = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -799,8 +779,8 @@ public class Observation extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Observation setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myIssued = new InstantDt(theDate, thePrecision); 
+	public Observation setIssuedWithMillisPrecision( Date theDate) {
+		myIssued = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -1023,6 +1003,9 @@ public class Observation extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -1244,7 +1227,7 @@ public class Observation extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ReferenceRange extends BaseElement implements IResourceBlock {
+	public static class ReferenceRange extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="low", type=QuantityDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1323,8 +1306,21 @@ public class Observation extends BaseResource implements IResource {
      * The value of the low bound of the reference range. If this is omitted, the low bound of the reference range is assumed to be meaningless. E.g. <2.3
      * </p> 
 	 */
-	public ReferenceRange setLow( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myLow = new QuantityDt(theComparator, theValue, theUnits); 
+	public ReferenceRange setLow( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>low</b> (Low Range, if relevant)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the low bound of the reference range. If this is omitted, the low bound of the reference range is assumed to be meaningless. E.g. <2.3
+     * </p> 
+	 */
+	public ReferenceRange setLow( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myLow = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1349,8 +1345,8 @@ public class Observation extends BaseResource implements IResource {
      * The value of the low bound of the reference range. If this is omitted, the low bound of the reference range is assumed to be meaningless. E.g. <2.3
      * </p> 
 	 */
-	public ReferenceRange setLow( long theValue) {
-		myLow = new QuantityDt(theValue); 
+	public ReferenceRange setLow( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myLow = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1367,6 +1363,19 @@ public class Observation extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>low</b> (Low Range, if relevant)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the low bound of the reference range. If this is omitted, the low bound of the reference range is assumed to be meaningless. E.g. <2.3
+     * </p> 
+	 */
+	public ReferenceRange setLow( long theValue) {
+		myLow = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>high</b> (High Range, if relevant).
@@ -1406,8 +1415,21 @@ public class Observation extends BaseResource implements IResource {
      * The value of the high bound of the reference range. If this is omitted, the high bound of the reference range is assumed to be meaningless. E.g. >5
      * </p> 
 	 */
-	public ReferenceRange setHigh( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myHigh = new QuantityDt(theComparator, theValue, theUnits); 
+	public ReferenceRange setHigh( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>high</b> (High Range, if relevant)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the high bound of the reference range. If this is omitted, the high bound of the reference range is assumed to be meaningless. E.g. >5
+     * </p> 
+	 */
+	public ReferenceRange setHigh( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myHigh = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1432,8 +1454,8 @@ public class Observation extends BaseResource implements IResource {
      * The value of the high bound of the reference range. If this is omitted, the high bound of the reference range is assumed to be meaningless. E.g. >5
      * </p> 
 	 */
-	public ReferenceRange setHigh( long theValue) {
-		myHigh = new QuantityDt(theValue); 
+	public ReferenceRange setHigh( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myHigh = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1450,6 +1472,19 @@ public class Observation extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>high</b> (High Range, if relevant)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the high bound of the reference range. If this is omitted, the high bound of the reference range is assumed to be meaningless. E.g. >5
+     * </p> 
+	 */
+	public ReferenceRange setHigh( long theValue) {
+		myHigh = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>meaning</b> (Indicates the meaning/use of this range of this range).
@@ -1526,7 +1561,7 @@ public class Observation extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Related extends BaseElement implements IResourceBlock {
+	public static class Related extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1635,4 +1670,4 @@ public class Observation extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -166,7 +146,7 @@ public class OperationOutcome extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Issue extends BaseElement implements IResourceBlock {
+	public static class Issue extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="severity", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -410,4 +390,4 @@ public class OperationOutcome extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -500,8 +480,8 @@ public class Order extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Order setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public Order setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -513,8 +493,8 @@ public class Order extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Order setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public Order setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -592,6 +572,9 @@ public class Order extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getTarget() {  
+		if (myTarget == null) {
+			myTarget = new ResourceReferenceDt();
+		}
 		return myTarget;
 	}
 
@@ -752,7 +735,7 @@ public class Order extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class When extends BaseElement implements IResourceBlock {
+	public static class When extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -847,4 +830,4 @@ public class Order extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
@@ -447,8 +427,8 @@ public class OrderResponse extends BaseResource implements IResource {
      * The date and time at which this order response was made (created/posted)
      * </p> 
 	 */
-	public OrderResponse setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public OrderResponse setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -460,8 +440,8 @@ public class OrderResponse extends BaseResource implements IResource {
      * The date and time at which this order response was made (created/posted)
      * </p> 
 	 */
-	public OrderResponse setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public OrderResponse setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -477,6 +457,9 @@ public class OrderResponse extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getWho() {  
+		if (myWho == null) {
+			myWho = new ResourceReferenceDt();
+		}
 		return myWho;
 	}
 
@@ -656,4 +639,4 @@ public class OrderResponse extends BaseResource implements IResource {
   
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -57,6 +37,7 @@ import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
 import ca.uhn.fhir.model.primitive.BooleanDt;
@@ -542,7 +523,43 @@ public class Organization extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (A contact detail for the organization)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail for the organization
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Organization addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (A contact detail for the organization)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail for the organization
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Organization addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>address</b> (An address for the organization).
 	 * creating it if it does
@@ -791,7 +808,7 @@ public class Organization extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Contact extends BaseElement implements IResourceBlock {
+	public static class Contact extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="purpose", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -960,7 +977,43 @@ public class Organization extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (Contact details (telephone, email, etc)  for a contact)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail (e.g. a telephone number or an email address) by which the party may be contacted.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Contact addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (Contact details (telephone, email, etc)  for a contact)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail (e.g. a telephone number or an email address) by which the party may be contacted.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Contact addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>address</b> (Visiting or postal addresses for the contact).
 	 * creating it if it does
@@ -1042,4 +1095,4 @@ public class Organization extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
@@ -369,6 +349,9 @@ public class Other extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getAuthor() {  
+		if (myAuthor == null) {
+			myAuthor = new ResourceReferenceDt();
+		}
 		return myAuthor;
 	}
 
@@ -424,8 +407,8 @@ public class Other extends BaseResource implements IResource {
      * Identifies when the resource was first created
      * </p> 
 	 */
-	public Other setCreated( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myCreated = new DateDt(theDate, thePrecision); 
+	public Other setCreatedWithDayPrecision( Date theDate) {
+		myCreated = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -437,12 +420,12 @@ public class Other extends BaseResource implements IResource {
      * Identifies when the resource was first created
      * </p> 
 	 */
-	public Other setCreatedWithDayPrecision( Date theDate) {
-		myCreated = new DateDt(theDate); 
+	public Other setCreated( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myCreated = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
  
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -62,6 +42,7 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
 import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
 import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
@@ -777,7 +758,43 @@ public class Patient extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (A contact detail for the individual)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail (e.g. a telephone number or an email address) by which the individual may be contacted.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Patient addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (A contact detail for the individual)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail (e.g. a telephone number or an email address) by which the individual may be contacted.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Patient addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>gender</b> (Gender for administrative purposes).
 	 * creating it if it does
@@ -860,8 +877,8 @@ public class Patient extends BaseResource implements IResource {
      * The date and time of birth for the individual
      * </p> 
 	 */
-	public Patient setBirthDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myBirthDate = new DateTimeDt(theDate, thePrecision); 
+	public Patient setBirthDateWithSecondsPrecision( Date theDate) {
+		myBirthDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -873,8 +890,8 @@ public class Patient extends BaseResource implements IResource {
      * The date and time of birth for the individual
      * </p> 
 	 */
-	public Patient setBirthDateWithSecondsPrecision( Date theDate) {
-		myBirthDate = new DateTimeDt(theDate); 
+	public Patient setBirthDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myBirthDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1261,6 +1278,9 @@ public class Patient extends BaseResource implements IResource {
      * </p> 
 	 */
 	public java.util.List<ResourceReferenceDt> getCareProvider() {  
+		if (myCareProvider == null) {
+			myCareProvider = new java.util.ArrayList<ResourceReferenceDt>();
+		}
 		return myCareProvider;
 	}
 
@@ -1435,7 +1455,7 @@ public class Patient extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Contact extends BaseElement implements IResourceBlock {
+	public static class Contact extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="relationship", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1641,7 +1661,43 @@ public class Patient extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (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> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Contact addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (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> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Contact addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>address</b> (Address for the contact person).
 	 * creating it if it does
@@ -1761,7 +1817,7 @@ public class Patient extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Animal extends BaseElement implements IResourceBlock {
+	public static class Animal extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="species", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1914,7 +1970,7 @@ public class Patient extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Link extends BaseElement implements IResourceBlock {
+	public static class Link extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="other", order=0, min=1, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Patient.class	})
@@ -2023,4 +2079,4 @@ public class Patient extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -61,6 +41,7 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
 import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
@@ -587,7 +568,43 @@ public class Practitioner extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (A contact detail for the practitioner)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail for the practitioner, e.g. a telephone number or an email address.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Practitioner addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (A contact detail for the practitioner)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail for the practitioner, e.g. a telephone number or an email address.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Practitioner addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>address</b> (Where practitioner can be found/visited).
 	 * creating it if it does
@@ -701,8 +718,8 @@ public class Practitioner extends BaseResource implements IResource {
      * The date and time of birth for the practitioner
      * </p> 
 	 */
-	public Practitioner setBirthDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myBirthDate = new DateTimeDt(theDate, thePrecision); 
+	public Practitioner setBirthDateWithSecondsPrecision( Date theDate) {
+		myBirthDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -714,8 +731,8 @@ public class Practitioner extends BaseResource implements IResource {
      * The date and time of birth for the practitioner
      * </p> 
 	 */
-	public Practitioner setBirthDateWithSecondsPrecision( Date theDate) {
-		myBirthDate = new DateTimeDt(theDate); 
+	public Practitioner setBirthDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myBirthDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -841,6 +858,23 @@ public class Practitioner extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>role</b> (Roles which this practitioner may perform) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Roles which this practitioner is authorized to perform for the organization
+     * </p> 
+	 */
+	public BoundCodeableConceptDt<PractitionerRoleEnum> addRole(PractitionerRoleEnum theValue) {
+		BoundCodeableConceptDt<PractitionerRoleEnum> retVal = new BoundCodeableConceptDt<PractitionerRoleEnum>(PractitionerRoleEnum.VALUESET_BINDER, theValue);
+		getRole().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>role</b> (Roles which this practitioner may perform)
 	 *
@@ -849,8 +883,10 @@ public class Practitioner extends BaseResource implements IResource {
      * Roles which this practitioner is authorized to perform for the organization
      * </p> 
 	 */
-	public void addRole(PractitionerRoleEnum theValue) {
-		getRole().add(new BoundCodeableConceptDt<PractitionerRoleEnum>(PractitionerRoleEnum.VALUESET_BINDER, theValue));
+	public BoundCodeableConceptDt<PractitionerRoleEnum> addRole() {
+		BoundCodeableConceptDt<PractitionerRoleEnum> retVal = new BoundCodeableConceptDt<PractitionerRoleEnum>(PractitionerRoleEnum.VALUESET_BINDER);
+		getRole().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -898,6 +934,23 @@ public class Practitioner extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>specialty</b> (Specific specialty of the practitioner) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Specific specialty of the practitioner
+     * </p> 
+	 */
+	public BoundCodeableConceptDt<PractitionerSpecialtyEnum> addSpecialty(PractitionerSpecialtyEnum theValue) {
+		BoundCodeableConceptDt<PractitionerSpecialtyEnum> retVal = new BoundCodeableConceptDt<PractitionerSpecialtyEnum>(PractitionerSpecialtyEnum.VALUESET_BINDER, theValue);
+		getSpecialty().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>specialty</b> (Specific specialty of the practitioner)
 	 *
@@ -906,8 +959,10 @@ public class Practitioner extends BaseResource implements IResource {
      * Specific specialty of the practitioner
      * </p> 
 	 */
-	public void addSpecialty(PractitionerSpecialtyEnum theValue) {
-		getSpecialty().add(new BoundCodeableConceptDt<PractitionerSpecialtyEnum>(PractitionerSpecialtyEnum.VALUESET_BINDER, theValue));
+	public BoundCodeableConceptDt<PractitionerSpecialtyEnum> addSpecialty() {
+		BoundCodeableConceptDt<PractitionerSpecialtyEnum> retVal = new BoundCodeableConceptDt<PractitionerSpecialtyEnum>(PractitionerSpecialtyEnum.VALUESET_BINDER);
+		getSpecialty().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -1129,7 +1184,7 @@ public class Practitioner extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Qualification extends BaseElement implements IResourceBlock {
+	public static class Qualification extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1263,4 +1318,4 @@ public class Practitioner extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -974,7 +954,7 @@ public class Procedure extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Performer extends BaseElement implements IResourceBlock {
+	public static class Performer extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="person", order=0, min=0, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
@@ -1077,7 +1057,7 @@ public class Procedure extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class RelatedItem extends BaseElement implements IResourceBlock {
+	public static class RelatedItem extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1160,6 +1140,9 @@ public class Procedure extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getTarget() {  
+		if (myTarget == null) {
+			myTarget = new ResourceReferenceDt();
+		}
 		return myTarget;
 	}
 
@@ -1183,4 +1166,4 @@ public class Procedure extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -58,6 +38,7 @@ import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
 import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
 import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
 import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
 import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
@@ -699,7 +680,43 @@ public class Profile extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (Contact information of the publisher)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contact details to assist a user in finding and communicating with the publisher
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Profile addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (Contact information of the publisher)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contact details to assist a user in finding and communicating with the publisher
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Profile addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>description</b> (Natural language description of the profile).
 	 * creating it if it does
@@ -930,8 +947,8 @@ public class Profile extends BaseResource implements IResource {
      * The date that this version of the profile was published
      * </p> 
 	 */
-	public Profile setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateTimeDt(theDate, thePrecision); 
+	public Profile setDateWithSecondsPrecision( Date theDate) {
+		myDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -943,8 +960,8 @@ public class Profile extends BaseResource implements IResource {
      * The date that this version of the profile was published
      * </p> 
 	 */
-	public Profile setDateWithSecondsPrecision( Date theDate) {
-		myDate = new DateTimeDt(theDate); 
+	public Profile setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -1286,7 +1303,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Mapping extends BaseElement implements IResourceBlock {
+	public static class Mapping extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identity", type=IdDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1516,7 +1533,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Structure extends BaseElement implements IResourceBlock {
+	public static class Structure extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1879,7 +1896,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class StructureElement extends BaseElement implements IResourceBlock {
+	public static class StructureElement extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="path", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2001,6 +2018,23 @@ public class Profile extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>representation</b> (How this element is represented in instances) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Codes that define how this element is represented in instances, when the deviation varies from the normal case
+     * </p> 
+	 */
+	public BoundCodeDt<PropertyRepresentationEnum> addRepresentation(PropertyRepresentationEnum theValue) {
+		BoundCodeDt<PropertyRepresentationEnum> retVal = new BoundCodeDt<PropertyRepresentationEnum>(PropertyRepresentationEnum.VALUESET_BINDER, theValue);
+		getRepresentation().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>representation</b> (How this element is represented in instances)
 	 *
@@ -2009,8 +2043,10 @@ public class Profile extends BaseResource implements IResource {
      * Codes that define how this element is represented in instances, when the deviation varies from the normal case
      * </p> 
 	 */
-	public void addRepresentation(PropertyRepresentationEnum theValue) {
-		getRepresentation().add(new BoundCodeDt<PropertyRepresentationEnum>(PropertyRepresentationEnum.VALUESET_BINDER, theValue));
+	public BoundCodeDt<PropertyRepresentationEnum> addRepresentation() {
+		BoundCodeDt<PropertyRepresentationEnum> retVal = new BoundCodeDt<PropertyRepresentationEnum>(PropertyRepresentationEnum.VALUESET_BINDER);
+		getRepresentation().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -2146,7 +2182,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class StructureElementSlicing extends BaseElement implements IResourceBlock {
+	public static class StructureElementSlicing extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="discriminator", type=IdDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2325,7 +2361,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class StructureElementDefinition extends BaseElement implements IResourceBlock {
+	public static class StructureElementDefinition extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="short", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -3339,7 +3375,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class StructureElementDefinitionType extends BaseElement implements IResourceBlock {
+	public static class StructureElementDefinitionType extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -3491,6 +3527,23 @@ public class Profile extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>aggregation</b> (contained | referenced | bundled - how aggregated) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * If the type is a reference to another resource, how the resource is or can be aggreated - is it a contained resource, or a reference, and if the context is a bundle, is it included in the bundle
+     * </p> 
+	 */
+	public BoundCodeDt<AggregationModeEnum> addAggregation(AggregationModeEnum theValue) {
+		BoundCodeDt<AggregationModeEnum> retVal = new BoundCodeDt<AggregationModeEnum>(AggregationModeEnum.VALUESET_BINDER, theValue);
+		getAggregation().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>aggregation</b> (contained | referenced | bundled - how aggregated)
 	 *
@@ -3499,8 +3552,10 @@ public class Profile extends BaseResource implements IResource {
      * If the type is a reference to another resource, how the resource is or can be aggreated - is it a contained resource, or a reference, and if the context is a bundle, is it included in the bundle
      * </p> 
 	 */
-	public void addAggregation(AggregationModeEnum theValue) {
-		getAggregation().add(new BoundCodeDt<AggregationModeEnum>(AggregationModeEnum.VALUESET_BINDER, theValue));
+	public BoundCodeDt<AggregationModeEnum> addAggregation() {
+		BoundCodeDt<AggregationModeEnum> retVal = new BoundCodeDt<AggregationModeEnum>(AggregationModeEnum.VALUESET_BINDER);
+		getAggregation().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -3531,7 +3586,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class StructureElementDefinitionConstraint extends BaseElement implements IResourceBlock {
+	public static class StructureElementDefinitionConstraint extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="key", type=IdDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -3812,7 +3867,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class StructureElementDefinitionBinding extends BaseElement implements IResourceBlock {
+	public static class StructureElementDefinitionBinding extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -4078,7 +4133,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class StructureElementDefinitionMapping extends BaseElement implements IResourceBlock {
+	public static class StructureElementDefinitionMapping extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identity", type=IdDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -4208,7 +4263,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class StructureSearchParam extends BaseElement implements IResourceBlock {
+	public static class StructureSearchParam extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -4462,6 +4517,23 @@ public class Profile extends BaseResource implements IResource {
 		return this;
 	}
 
+	/**
+	 * Add a value for <b>target</b> (Types of resource (if a resource reference)) using an enumerated type. This
+	 * is intended as a convenience method for situations where the FHIR defined ValueSets are mandatory
+	 * or contain the desirable codes. If you wish to use codes other than those which are built-in, 
+	 * you may also use the {@link #addType()} method.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Types of resource (if a resource is referenced)
+     * </p> 
+	 */
+	public BoundCodeDt<ResourceTypeEnum> addTarget(ResourceTypeEnum theValue) {
+		BoundCodeDt<ResourceTypeEnum> retVal = new BoundCodeDt<ResourceTypeEnum>(ResourceTypeEnum.VALUESET_BINDER, theValue);
+		getTarget().add(retVal);
+		return retVal;
+	}
+
 	/**
 	 * Add a value for <b>target</b> (Types of resource (if a resource reference))
 	 *
@@ -4470,8 +4542,10 @@ public class Profile extends BaseResource implements IResource {
      * Types of resource (if a resource is referenced)
      * </p> 
 	 */
-	public void addTarget(ResourceTypeEnum theValue) {
-		getTarget().add(new BoundCodeDt<ResourceTypeEnum>(ResourceTypeEnum.VALUESET_BINDER, theValue));
+	public BoundCodeDt<ResourceTypeEnum> addTarget() {
+		BoundCodeDt<ResourceTypeEnum> retVal = new BoundCodeDt<ResourceTypeEnum>(ResourceTypeEnum.VALUESET_BINDER);
+		getTarget().add(retVal);
+		return retVal;
 	}
 
 	/**
@@ -4503,7 +4577,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ExtensionDefn extends BaseElement implements IResourceBlock {
+	public static class ExtensionDefn extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -4805,7 +4879,7 @@ public class Profile extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Query extends BaseElement implements IResourceBlock {
+	public static class Query extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -4993,4 +5067,4 @@ public class Profile extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -418,8 +398,8 @@ public class Provenance extends BaseResource implements IResource {
      * The instant of time at which the activity was recorded
      * </p> 
 	 */
-	public Provenance setRecordedWithMillisPrecision( Date theDate) {
-		myRecorded = new InstantDt(theDate); 
+	public Provenance setRecorded( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myRecorded = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -431,8 +411,8 @@ public class Provenance extends BaseResource implements IResource {
      * The instant of time at which the activity was recorded
      * </p> 
 	 */
-	public Provenance setRecorded( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myRecorded = new InstantDt(theDate, thePrecision); 
+	public Provenance setRecordedWithMillisPrecision( Date theDate) {
+		myRecorded = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -750,7 +730,7 @@ public class Provenance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Agent extends BaseElement implements IResourceBlock {
+	public static class Agent extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="role", type=CodingDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -954,7 +934,7 @@ public class Provenance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Entity extends BaseElement implements IResourceBlock {
+	public static class Entity extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="role", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -1202,4 +1182,4 @@ public class Provenance extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.ExtensionDt;
 import ca.uhn.fhir.model.api.IElement;
@@ -301,7 +281,7 @@ public class Query extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Response extends BaseElement implements IResourceBlock {
+	public static class Response extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=UriDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -860,4 +840,4 @@ public class Query extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -425,8 +405,8 @@ public class Questionnaire extends BaseResource implements IResource {
      * The date and/or time that this version of the questionnaire was authored
      * </p> 
 	 */
-	public Questionnaire setAuthored( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myAuthored = new DateTimeDt(theDate, thePrecision); 
+	public Questionnaire setAuthoredWithSecondsPrecision( Date theDate) {
+		myAuthored = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -438,8 +418,8 @@ public class Questionnaire extends BaseResource implements IResource {
      * The date and/or time that this version of the questionnaire was authored
      * </p> 
 	 */
-	public Questionnaire setAuthoredWithSecondsPrecision( Date theDate) {
-		myAuthored = new DateTimeDt(theDate); 
+	public Questionnaire setAuthored( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myAuthored = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -454,8 +434,8 @@ public class Questionnaire extends BaseResource implements IResource {
      * The subject of the questionnaires: this is the patient that the answers apply to, but this person is not necessarily the source of information
      * </p> 
 	 */
-	public ResourceReferenceDt getSubject() {
-		if (mySubject==null) {
+	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
 			mySubject = new ResourceReferenceDt();
 		}
 		return mySubject;
@@ -486,6 +466,9 @@ public class Questionnaire extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getAuthor() {  
+		if (myAuthor == null) {
+			myAuthor = new ResourceReferenceDt();
+		}
 		return myAuthor;
 	}
 
@@ -514,6 +497,9 @@ public class Questionnaire extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSource() {  
+		if (mySource == null) {
+			mySource = new ResourceReferenceDt();
+		}
 		return mySource;
 	}
 
@@ -742,7 +728,7 @@ public class Questionnaire extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Group extends BaseElement implements IResourceBlock {
+	public static class Group extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1093,7 +1079,7 @@ public class Questionnaire extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class GroupQuestion extends BaseElement implements IResourceBlock {
+	public static class GroupQuestion extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=CodeableConceptDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1497,4 +1483,4 @@ public class Questionnaire extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
@@ -55,6 +35,7 @@ import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
@@ -569,7 +550,43 @@ public class RelatedPerson extends BaseResource implements IResource {
 		}
 		return getTelecom().get(0); 
 	}
-  
+ 	/**
+	 * Adds a new value for <b>telecom</b> (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> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public RelatedPerson addTelecom( ContactUseEnum theContactUse,  String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theContactUse, theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>telecom</b> (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> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public RelatedPerson addTelecom( String theValue) {
+		if (myTelecom == null) {
+			myTelecom = new java.util.ArrayList<ContactDt>();
+		}
+		myTelecom.add(new ContactDt(theValue));
+		return this; 
+	}
+
+ 
 	/**
 	 * Gets the value(s) for <b>gender</b> (Gender for administrative purposes).
 	 * creating it if it does
@@ -707,4 +724,4 @@ public class RelatedPerson extends BaseResource implements IResource {
   
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -274,7 +254,7 @@ public class Remittance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Service extends BaseElement implements IResourceBlock {
+	public static class Service extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="instance", type=IntegerDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -536,4 +516,4 @@ public class Remittance extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -652,7 +632,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Event extends BaseElement implements IResourceBlock {
+	public static class Event extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -880,8 +860,8 @@ public class SecurityEvent extends BaseResource implements IResource {
      * The time when the event occurred on the source
      * </p> 
 	 */
-	public Event setDateTimeWithMillisPrecision( Date theDate) {
-		myDateTime = new InstantDt(theDate); 
+	public Event setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDateTime = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -893,8 +873,8 @@ public class SecurityEvent extends BaseResource implements IResource {
      * The time when the event occurred on the source
      * </p> 
 	 */
-	public Event setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDateTime = new InstantDt(theDate, thePrecision); 
+	public Event setDateTimeWithMillisPrecision( Date theDate) {
+		myDateTime = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -1000,7 +980,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Participant extends BaseElement implements IResourceBlock {
+	public static class Participant extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="role", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1141,6 +1121,9 @@ public class SecurityEvent extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getReference() {  
+		if (myReference == null) {
+			myReference = new ResourceReferenceDt();
+		}
 		return myReference;
 	}
 
@@ -1408,7 +1391,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ParticipantNetwork extends BaseElement implements IResourceBlock {
+	public static class ParticipantNetwork extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1537,7 +1520,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Source extends BaseElement implements IResourceBlock {
+	public static class Source extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="site", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1732,7 +1715,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Object extends BaseElement implements IResourceBlock {
+	public static class Object extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -2284,7 +2267,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class ObjectDetail extends BaseElement implements IResourceBlock {
+	public static class ObjectDetail extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=StringDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -2406,4 +2389,4 @@ public class SecurityEvent extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -287,8 +267,8 @@ public class SequencingAnalysis extends BaseResource implements IResource {
      * Date when result of the analysis is updated
      * </p> 
 	 */
-	public SequencingAnalysis setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateDt(theDate, thePrecision); 
+	public SequencingAnalysis setDateWithDayPrecision( Date theDate) {
+		myDate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -300,8 +280,8 @@ public class SequencingAnalysis extends BaseResource implements IResource {
      * Date when result of the analysis is updated
      * </p> 
 	 */
-	public SequencingAnalysis setDateWithDayPrecision( Date theDate) {
-		myDate = new DateDt(theDate); 
+	public SequencingAnalysis setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -538,7 +518,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Genome extends BaseElement implements IResourceBlock {
+	public static class Genome extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="name", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -659,4 +639,4 @@ public class SequencingAnalysis extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -444,8 +424,8 @@ public class SequencingLab extends BaseResource implements IResource {
      * Date when the result of the lab is uploaded
      * </p> 
 	 */
-	public SequencingLab setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDate = new DateDt(theDate, thePrecision); 
+	public SequencingLab setDateWithDayPrecision( Date theDate) {
+		myDate = new DateDt(theDate); 
 		return this; 
 	}
 
@@ -457,8 +437,8 @@ public class SequencingLab extends BaseResource implements IResource {
      * Date when the result of the lab is uploaded
      * </p> 
 	 */
-	public SequencingLab setDateWithDayPrecision( Date theDate) {
-		myDate = new DateDt(theDate); 
+	public SequencingLab setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myDate = new DateDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -638,7 +618,7 @@ public class SequencingLab extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class System extends BaseElement implements IResourceBlock {
+	public static class System extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="class", type=CodeDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -868,7 +848,7 @@ public class SequencingLab extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Specimen extends BaseElement implements IResourceBlock {
+	public static class Specimen extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -976,4 +956,4 @@ public class SequencingLab extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,26 +16,6 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
@@ -492,8 +472,8 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setStartWithMillisPrecision( Date theDate) {
-		myStart = new InstantDt(theDate); 
+	public Slot setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myStart = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -505,8 +485,8 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myStart = new InstantDt(theDate, thePrecision); 
+	public Slot setStartWithMillisPrecision( Date theDate) {
+		myStart = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -549,8 +529,8 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setEndWithMillisPrecision( Date theDate) {
-		myEnd = new InstantDt(theDate); 
+	public Slot setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myEnd = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -562,8 +542,8 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myEnd = new InstantDt(theDate, thePrecision); 
+	public Slot setEndWithMillisPrecision( Date theDate) {
+		myEnd = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -623,6 +603,9 @@ public class Slot extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getAuthor() {  
+		if (myAuthor == null) {
+			myAuthor = new ResourceReferenceDt();
+		}
 		return myAuthor;
 	}
 
@@ -678,8 +661,8 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setAuthorDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myAuthorDate = new DateTimeDt(theDate, thePrecision); 
+	public Slot setAuthorDateWithSecondsPrecision( Date theDate) {
+		myAuthorDate = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -691,12 +674,12 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setAuthorDateWithSecondsPrecision( Date theDate) {
-		myAuthorDate = new DateTimeDt(theDate); 
+	public Slot setAuthorDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myAuthorDate = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
  
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IElement;
@@ -395,6 +375,9 @@ public class Specimen extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSubject() {  
+		if (mySubject == null) {
+			mySubject = new ResourceReferenceDt();
+		}
 		return mySubject;
 	}
 
@@ -507,8 +490,8 @@ public class Specimen extends BaseResource implements IResource {
      * Time when specimen was received for processing or testing
      * </p> 
 	 */
-	public Specimen setReceivedTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myReceivedTime = new DateTimeDt(theDate, thePrecision); 
+	public Specimen setReceivedTimeWithSecondsPrecision( Date theDate) {
+		myReceivedTime = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -520,8 +503,8 @@ public class Specimen extends BaseResource implements IResource {
      * Time when specimen was received for processing or testing
      * </p> 
 	 */
-	public Specimen setReceivedTimeWithSecondsPrecision( Date theDate) {
-		myReceivedTime = new DateTimeDt(theDate); 
+	public Specimen setReceivedTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myReceivedTime = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -686,7 +669,7 @@ public class Specimen extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Source extends BaseElement implements IResourceBlock {
+	public static class Source extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="relationship", type=CodeDt.class, order=0, min=1, max=1)	
 	@Description(
@@ -815,7 +798,7 @@ public class Specimen extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Collection extends BaseElement implements IResourceBlock {
+	public static class Collection extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="collector", order=0, min=0, max=1, type={
 		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
@@ -1047,8 +1030,21 @@ public class Specimen extends BaseResource implements IResource {
      * The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
      * </p> 
 	 */
-	public Collection setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Collection setQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>quantity</b> (The quantity of specimen collected)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
+     * </p> 
+	 */
+	public Collection setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1073,8 +1069,8 @@ public class Specimen extends BaseResource implements IResource {
      * The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
      * </p> 
 	 */
-	public Collection setQuantity( long theValue) {
-		myQuantity = new QuantityDt(theValue); 
+	public Collection setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1091,6 +1087,19 @@ public class Specimen extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>quantity</b> (The quantity of specimen collected)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The quantity of specimen collected; for instance the volume of a blood sample, or the physical measurement of an anatomic pathology sample
+     * </p> 
+	 */
+	public Collection setQuantity( long theValue) {
+		myQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>method</b> (Technique used to perform collection).
@@ -1180,7 +1189,7 @@ public class Specimen extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Treatment extends BaseElement implements IResourceBlock {
+	public static class Treatment extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="description", type=StringDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -1360,7 +1369,7 @@ public class Specimen extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Container extends BaseElement implements IResourceBlock {
+	public static class Container extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
 	@Description(
@@ -1625,8 +1634,21 @@ public class Specimen extends BaseResource implements IResource {
      * The capacity (volume or other measure) the container may contain.
      * </p> 
 	 */
-	public Container setCapacity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myCapacity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Container setCapacity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myCapacity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>capacity</b> (Container volume or size)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The capacity (volume or other measure) the container may contain.
+     * </p> 
+	 */
+	public Container setCapacity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myCapacity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1651,8 +1673,8 @@ public class Specimen extends BaseResource implements IResource {
      * The capacity (volume or other measure) the container may contain.
      * </p> 
 	 */
-	public Container setCapacity( long theValue) {
-		myCapacity = new QuantityDt(theValue); 
+	public Container setCapacity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myCapacity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1669,6 +1691,19 @@ public class Specimen extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>capacity</b> (Container volume or size)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The capacity (volume or other measure) the container may contain.
+     * </p> 
+	 */
+	public Container setCapacity( long theValue) {
+		myCapacity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>specimenQuantity</b> (Quantity of specimen within container).
@@ -1708,8 +1743,21 @@ public class Specimen extends BaseResource implements IResource {
      * The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
      * </p> 
 	 */
-	public Container setSpecimenQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		mySpecimenQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Container setSpecimenQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		mySpecimenQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>specimenQuantity</b> (Quantity of specimen within container)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
+     * </p> 
+	 */
+	public Container setSpecimenQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		mySpecimenQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -1734,8 +1782,8 @@ public class Specimen extends BaseResource implements IResource {
      * The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
      * </p> 
 	 */
-	public Container setSpecimenQuantity( long theValue) {
-		mySpecimenQuantity = new QuantityDt(theValue); 
+	public Container setSpecimenQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		mySpecimenQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -1752,6 +1800,19 @@ public class Specimen extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>specimenQuantity</b> (Quantity of specimen within container)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The quantity of specimen in the container; may be volume, dimensions, or other appropriate measurements, depending on the specimen type
+     * </p> 
+	 */
+	public Container setSpecimenQuantity( long theValue) {
+		mySpecimenQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>additive</b> (Additive associated with container).
@@ -1790,4 +1851,4 @@ public class Specimen extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,31 +16,11 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.Date;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -431,7 +411,7 @@ public class Substance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Instance extends BaseElement implements IResourceBlock {
+	public static class Instance extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -560,8 +540,8 @@ public class Substance extends BaseResource implements IResource {
      * When the substance is no longer valid to use. For some substances, a single arbitrary date is used for expiry.
      * </p> 
 	 */
-	public Instance setExpiry( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myExpiry = new DateTimeDt(theDate, thePrecision); 
+	public Instance setExpiryWithSecondsPrecision( Date theDate) {
+		myExpiry = new DateTimeDt(theDate); 
 		return this; 
 	}
 
@@ -573,8 +553,8 @@ public class Substance extends BaseResource implements IResource {
      * When the substance is no longer valid to use. For some substances, a single arbitrary date is used for expiry.
      * </p> 
 	 */
-	public Instance setExpiryWithSecondsPrecision( Date theDate) {
-		myExpiry = new DateTimeDt(theDate); 
+	public Instance setExpiry( Date theDate,  TemporalPrecisionEnum thePrecision) {
+		myExpiry = new DateTimeDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -617,8 +597,21 @@ public class Substance extends BaseResource implements IResource {
      * The amount of the substance
      * </p> 
 	 */
-	public Instance setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Instance setQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>quantity</b> (Amount of substance in the package)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of the substance
+     * </p> 
+	 */
+	public Instance setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -643,8 +636,8 @@ public class Substance extends BaseResource implements IResource {
      * The amount of the substance
      * </p> 
 	 */
-	public Instance setQuantity( long theValue) {
-		myQuantity = new QuantityDt(theValue); 
+	public Instance setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -661,6 +654,19 @@ public class Substance extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>quantity</b> (Amount of substance in the package)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of the substance
+     * </p> 
+	 */
+	public Instance setQuantity( long theValue) {
+		myQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 
 	}
@@ -675,7 +681,7 @@ public class Substance extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Ingredient extends BaseElement implements IResourceBlock {
+	public static class Ingredient extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="quantity", type=RatioDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -771,4 +777,4 @@ public class Substance extends BaseResource implements IResource {
 
 
 
-}
+}

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

@@ -16,30 +16,10 @@
 
 package ca.uhn.fhir.model.dstu.resource;
 
-/*
- * #%L
- * HAPI FHIR Library
- * %%
- * Copyright (C) 2014 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
@@ -462,6 +442,9 @@ public class Supply extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getOrderedItem() {  
+		if (myOrderedItem == null) {
+			myOrderedItem = new ResourceReferenceDt();
+		}
 		return myOrderedItem;
 	}
 
@@ -579,7 +562,7 @@ public class Supply extends BaseResource implements IResource {
      * </p> 
 	 */
 	@Block()	
-	public static class Dispense extends BaseElement implements IResourceBlock {
+	public static class Dispense extends BaseIdentifiableElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)	
 	@Description(
@@ -849,8 +832,21 @@ public class Supply extends BaseResource implements IResource {
      * The amount of supply that has been dispensed. Includes unit of measure.
      * </p> 
 	 */
-	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
-		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
+	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  double theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>quantity</b> (Amount dispensed)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of supply that has been dispensed. Includes unit of measure.
+     * </p> 
+	 */
+	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theSystem,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theSystem, theUnits); 
 		return this; 
 	}
 
@@ -875,8 +871,8 @@ public class Supply extends BaseResource implements IResource {
      * The amount of supply that has been dispensed. Includes unit of measure.
      * </p> 
 	 */
-	public Dispense setQuantity( long theValue) {
-		myQuantity = new QuantityDt(theValue); 
+	public Dispense setQuantity( QuantityCompararatorEnum theComparator,  long theValue,  String theUnits) {
+		myQuantity = new QuantityDt(theComparator, theValue, theUnits); 
 		return this; 
 	}
 
@@ -893,6 +889,19 @@ public class Supply extends BaseResource implements IResource {
 		return this; 
 	}
 
+	/**
+	 * Sets the value for <b>quantity</b> (Amount dispensed)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount of supply that has been dispensed. Includes unit of measure.
+     * </p> 
+	 */
+	public Dispense setQuantity( long theValue) {
+		myQuantity = new QuantityDt(theValue); 
+		return this; 
+	}
+
  
 	/**
 	 * Gets the value(s) for <b>suppliedItem</b> (Medication, Substance, or Device supplied).
@@ -905,6 +914,9 @@ public class Supply extends BaseResource implements IResource {
      * </p> 
 	 */
 	public ResourceReferenceDt getSuppliedItem() {  
+		if (mySuppliedItem == null) {
+			mySuppliedItem = new ResourceReferenceDt();
+		}
 		return mySuppliedItem;
 	}
 
@@ -1096,4 +1108,4 @@ public class Supply extends BaseResource implements IResource {
 
 
 
-}
+}